Consolidate the ci/ and hack/ directories

.github/actions/kube-gateway-api-conformance-tests/action.yaml

@@ -36,7 +36,7 @@ runs:
       CLUSTER_NODE_VERSION: ${{ matrix.kube-version.node }}
       IMAGE_VARIANT: ${{ matrix.image-variant }}
       CONFORMANCE: "true"
-    run: ./ci/kind/setup-kind.sh
+    run: ./hack/kind/setup-kind.sh
   - name: Install kgateway via helm
     shell: bash
     run: |

.github/actions/kubernetes-e2e-tests/action.yaml

@@ -36,20 +36,9 @@ runs:
       ISTIO_VERSION: ${{ inputs.istio-version }}
     shell: bash
     run: make go-test
-  - name: Summarize tests
-    # Print out a summary of ALL tests run under this action. In the future we can use this tool
-    # with the --json flag to export the results for centralized processing.
-    shell: bash
-    run: go run ./ci/github-actions/go-test-summary
   - name: Archive bug report directory on failure
     if: ${{ failure() }}
     uses: actions/upload-artifact@v4
     with:
       name: bug-report-${{ inputs.cluster-name }}-${{ inputs.matrix-label }}-attempt-${{ github.run_attempt }}
       path: ./_test/bug_report/${{ inputs.cluster-name }}
-  - name: Archive test results
-    if: ${{ always() }}
-    uses: actions/upload-artifact@v4
-    with:
-      name: go-test-summary-${{ inputs.cluster-name }}-${{ inputs.matrix-label }}-attempt-${{ github.run_attempt }}
-      path: ./_test/test_log/go-test-summary

.github/actions/regression-tests/action.yaml

@@ -25,7 +25,7 @@ runs:
       CLUSTER_NAME: 'kind'
       CLUSTER_NODE_VERSION: ${{ matrix.kube-version.node }}
       IMAGE_VARIANT: ${{ matrix.image-variant }}
-    run: ./ci/kind/setup-kind.sh
+    run: ./hack/kind/setup-kind.sh
   - name: Testing - kube e2e regression tests
     env:
       KUBE2E_TESTS: ${{ matrix.kube-e2e-test-type }}

.github/actions/setup-kind-cluster/action.yaml

@@ -48,4 +48,4 @@ runs:
         CLUSTER_NODE_VERSION: ${{ inputs.kind-node-version }}
         ISTIO_VERSION: ${{ inputs.istio-version }}
         CONFORMANCE_VERSION: ${{ inputs.kgateway-api-version }}
-      run: ./ci/kind/setup-kind.sh
+      run: ./hack/kind/setup-kind.sh

.github/workflows/pr-kubernetes-tests.yaml_noop

@@ -12,8 +12,6 @@
 #     name: Prepare Environment
 #     runs-on: ubuntu-22.04
 #     timeout-minutes: 5
-#     outputs:
-#       should-auto-succeed-kube-tests: ${{ steps.run-strategy.outputs.auto_succeed }}
 #     steps:
 #     - name: Cancel Previous Actions
 #       uses: styfle/[email protected]
@@ -25,17 +23,6 @@
 #         # We require gathering the branch and tag history since we rely on a `git diff`
 #         # which compares the state of two branches
 #         fetch-depth: 0
-#     - id: process-skip-directives
-#       uses: ./.github/actions/process-skip-directives
-#       with:
-#         base-ref: ${{ github.base_ref }}
-#     - id: run-strategy
-#       name: Determine Test Run Strategy
-#       run: |
-#         skip_kube_tests=${{ steps.process-skip-directives.outputs.skip-kube-tests }}
-#         if [[ ! -z $skip_kube_tests && $skip_kube_tests = true ]] ; then
-#           echo "auto_succeed=true" >> $GITHUB_OUTPUT
-#         fi
 
 #   end_to_end_tests:
 #     name: End-to-End (${{ matrix.test.cluster-name }})
@@ -95,26 +82,19 @@
 #         version-files:
 #           - file: './.github/workflows/.env/pr-tests/versions.env'
 #     steps:
-#     - id: auto-succeed-tests
-#       if: needs.prepare_env.outputs.should-auto-succeed-kube-tests == 'true'
-#       run: |
-#         echo "Regression tests auto-succeeded"
 #     - uses: actions/checkout@v4
 #     - name: Prep Go Runner
 #       uses: ./.github/actions/prep-go-runner
-#       if: needs.prepare_env.outputs.should-auto-succeed-kube-tests != 'true'
 #     # The dotenv action is used to load key-value pairs from files.
 #     # In this case, the file is specified in the matrix and will contain the versions of the tools to use
 #     - name: Dotenv Action
 #       uses: falti/[email protected]
-#       if: needs.prepare_env.outputs.should-auto-succeed-kube-tests != 'true'
 #       id: dotenv
 #       with:
 #         path: ${{ matrix.version-files.file }}
 #         log-variables: true
 #     - id: setup-kind-cluster
 #       name: Setup KinD Cluster
-#       if: needs.prepare_env.outputs.should-auto-succeed-kube-tests != 'true'
 #       uses: ./.github/actions/setup-kind-cluster
 #       with:
 #         cluster-name: ${{ matrix.test.cluster-name }}
@@ -124,7 +104,6 @@
 #         helm-version: ${{ steps.dotenv.outputs.helm_version }}
 #         istio-version: ${{ steps.dotenv.outputs.istio_version }}
 #     - id: run-tests
-#       if: needs.prepare_env.outputs.should-auto-succeed-kube-tests != 'true'
 #       uses: ./.github/actions/kubernetes-e2e-tests
 #       with:
 #         cluster-name: ${{ matrix.test.cluster-name }}

.github/workflows/regression-tests.yaml

@@ -14,8 +14,6 @@ jobs:
     name: Prepare Environment
     runs-on: ubuntu-22.04
     timeout-minutes: 5
-    outputs:
-      should-auto-succeed-regression-tests: ${{ steps.run-strategy.outputs.auto_succeed }}
     steps:
     - name: Cancel Previous Actions
       uses: styfle/[email protected]
@@ -27,17 +25,6 @@ jobs:
         # We require gathering the branch and tag history since we rely on a `git diff`
         # which compares the state of two branches
         fetch-depth: 0
-    - id: process-skip-directives
-      uses: ./.github/actions/process-skip-directives
-      with:
-        base-ref: ${{ github.base_ref }}
-    - id: run-strategy
-      name: Determine Test Run Strategy
-      run: |
-        skip_kube_tests=${{ steps.process-skip-directives.outputs.skip-kube-tests }}
-        if [[ ! -z $skip_kube_tests && $skip_kube_tests = true ]] ; then
-          echo "auto_succeed=true" >> $GITHUB_OUTPUT
-        fi
 
   # regression_tests:
   #   name: k8s regression tests (${{matrix.kube-e2e-test-type}})
@@ -63,12 +50,7 @@ jobs:
   #   steps:
   #   - uses: actions/checkout@v4
   #   - id: run-tests
-  #     if: needs.prepare_env.outputs.should-auto-succeed-regression-tests != 'true'
   #     uses: ./.github/actions/regression-tests
-  #   - id: auto-succeed-tests
-  #     if: needs.prepare_env.outputs.should-auto-succeed-regression-tests == 'true'
-  #     run: |
-  #       echo "Regression tests auto-succeeded"
 
   kube_gateway_api_conformance_tests:
     name: kubernetes gateway api conformance tests (${{matrix.image-variant}})
@@ -86,10 +68,5 @@ jobs:
           - standard
     steps:
     - uses: actions/checkout@v4
-    - id: auto-succeed-tests
-      if: needs.prepare_env.outputs.should-auto-succeed-regression-tests == 'true'
-      run: |
-        echo "Kubernetes Gateway API conformance tests auto-succeeded"
     - id: run-tests
-      if: needs.prepare_env.outputs.should-auto-succeed-regression-tests != 'true'
       uses: ./.github/actions/kube-gateway-api-conformance-tests

.github/workflows/release.yaml

@@ -150,7 +150,7 @@ jobs:
         run: make mod-download
 
       - name: Setup kind cluster
-        run: ./ci/kind/setup-kind.sh
+        run: ./hack/kind/setup-kind.sh
         env:
           VERSION: ${{ needs.setup.outputs.version }}
           SKIP_DOCKER: "true"

.github/workflows/static-analysis.yaml

@@ -20,8 +20,7 @@ jobs:
     - name: Prep Go Runner
       uses: ./.github/actions/prep-go-runner
     - name: Generate Code
-      run: |
-        ./ci/check-generated-code.sh
+      run: make verify
 
   static-analysis:
     name: Lint Checks

Makefile

@@ -132,7 +132,7 @@ fmt-changed:
 
 # must be a separate target so that make waits for it to complete before moving on
 .PHONY: mod-download
-mod-download: check-go-version
+mod-download:
 	go mod download all
 
 .PHONY: check-format
@@ -280,6 +280,10 @@ clean-test-logs:
 # Generated Code and Docs
 #----------------------------------------------------------------------------------
 
+.PHONY: verify
+verify: generate-all  ## Verify that generated code is up to date
+	git diff -U3 --exit-code
+
 .PHONY: generate-all
 generate-all: generated-code
 
@@ -293,7 +297,6 @@ generate-all-debug: generate-all
 
 # Generates all required code, cleaning and formatting as well; this target is executed in CI
 .PHONY: generated-code
-generated-code: check-go-version
 generated-code: go-generate-all getter-check mod-tidy
 generated-code: update-licenses
 # generated-code: generate-crd-reference-docs
@@ -317,11 +320,6 @@ getter-check:
 mod-tidy:
 	go mod tidy
 
-# Validates that local Go version matches go.mod
-.PHONY: check-go-version
-check-go-version:
-	./ci/check-go-version.sh
-
 #----------------------------------------------------------------------------------
 # Generate CRD Reference Documentation
 #
@@ -503,21 +501,19 @@ docker-push-%:
 	docker push $(IMAGE_REGISTRY)/$*:$(VERSION)
 
 .PHONY: docker-standard
-docker-standard: check-go-version ## Build docker images (standard only)
-docker-standard: kgateway-docker
+docker-standard: kgateway-docker ## Build docker images (standard only)
 docker-standard: envoy-wrapper-docker
 docker-standard: sds-docker
 
 .PHONY: docker-distroless
-docker-distroless: check-go-version ## Build docker images (distroless only)
-docker-distroless: kgateway-distroless-docker
+docker-distroless: kgateway-distroless-docker ## Build docker images (distroless only)
 docker-distroless: envoy-wrapper-distroless-docker
 docker-distroless: sds-distroless-docker
 
 IMAGE_VARIANT ?= all
 # Build docker images using the defined IMAGE_REGISTRY, VERSION
 .PHONY: docker
-docker: check-go-version ## Build all docker images (standard and distroless)
+docker: ## Build all docker images (standard and distroless)
 docker: # Standard images
 ifeq ($(IMAGE_VARIANT),$(filter $(IMAGE_VARIANT),all standard))
 docker: docker-standard
@@ -578,7 +574,7 @@ CLUSTER_NAME ?= kind
 INSTALL_NAMESPACE ?= kgateway-system
 
 kind-setup:
-	VERSION=${VERSION} CLUSTER_NAME=${CLUSTER_NAME} ./ci/kind/setup-kind.sh
+	VERSION=${VERSION} CLUSTER_NAME=${CLUSTER_NAME} ./hack/kind/setup-kind.sh
 
 kind-load-%-distroless:
 	kind load docker-image $(IMAGE_REGISTRY)/$*:$(VERSION)-distroless --name $(CLUSTER_NAME)

Tiltfile

@@ -227,7 +227,7 @@ def validate_registry() :
 def install_metallb():
     if not settings["metal_lb"]:
         return
-    local("./ci/kind/setup-metalllb-on-kind.sh")
+    local("./hack/kind/setup-metalllb-on-kind.sh")
 
 validate_registry()
 install_gloo()