From 16527374aa5b60b7f237111f414d64ac41360487 Mon Sep 17 00:00:00 2001
From: Daneyon Hansen <daneyon.hansen@solo.io>
Date: Mon, 18 Nov 2024 15:40:46 -0800
Subject: [PATCH 01/19] CI: Updates Makefile and conformance GH action for
 multiple Gateway API versions

Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>
---
 .../action.yaml                               |  8 ++-
 .github/workflows/conformance-tests.yaml      |  8 +++
 Makefile                                      | 50 +++++++++++++------
 changelog/v1.18.0-rc2/issue_10359.yaml        |  6 +++
 4 files changed, 57 insertions(+), 15 deletions(-)
 create mode 100644 changelog/v1.18.0-rc2/issue_10359.yaml

diff --git a/.github/workflows/composite-actions/kube-gateway-api-conformance-tests/action.yaml b/.github/workflows/composite-actions/kube-gateway-api-conformance-tests/action.yaml
index e508db830d5..aacf2aa3172 100644
--- a/.github/workflows/composite-actions/kube-gateway-api-conformance-tests/action.yaml
+++ b/.github/workflows/composite-actions/kube-gateway-api-conformance-tests/action.yaml
@@ -1,5 +1,9 @@
 name: Conformance Tests
-description: run kubernetes gateway api conformance tests
+description: Run Kubernetes Gateway API conformance tests for multiple versions
+inputs:
+  gateway-api-version:
+    description: "The version of Gateway API to test."
+    required: true
 runs:
   using: "composite"
   steps:
@@ -53,6 +57,8 @@ runs:
       fi
   - name: Run the kubernetes gateway API conformance tests
     shell: bash
+    env:
+      GATEWAY_API_VERSION: ${{ inputs.gateway-api-version }}
     run: make conformance
   - name: Capture debug information when tests fail
     if: ${{ failure() }}
diff --git a/.github/workflows/conformance-tests.yaml b/.github/workflows/conformance-tests.yaml
index 2cd34c51d20..dfa3fdc979e 100644
--- a/.github/workflows/conformance-tests.yaml
+++ b/.github/workflows/conformance-tests.yaml
@@ -18,9 +18,11 @@ on:
 
 jobs:
   run-conformance-tests:
+    name: Conformance Tests for ${{ matrix.gateway-api-version }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
+        gateway-api-version: [v1.1.0, v1.2.0]
         # TODO(tim): Avoid hardcoding versions here. It's a bit tricky based on
         # how this was setup and there's a limited # of dispatch inputs that GH
         # supports. We can revisit this later.
@@ -37,8 +39,14 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
 
+      - name: Export GATEWAY_API_VERSION
+        shell: bash
+        run: echo "GATEWAY_API_VERSION=${{ matrix.gateway-api-version }}" >> $GITHUB_ENV
+
       - name: Run Conformance Tests
         uses: ./.github/workflows/composite-actions/kube-gateway-api-conformance-tests
+        with:
+          gateway-api-version: ${{ matrix.gateway-api-version }}
 
       # TODO(tim): Add support for downloading the test results and creating
       # a pull request whenever a new release > 1.17+ is cut.
diff --git a/Makefile b/Makefile
index 9505d133a08..67b61f0c901 100644
--- a/Makefile
+++ b/Makefile
@@ -92,6 +92,13 @@ GOLANG_ALPINE_IMAGE_NAME = golang:$(shell go version | egrep -o '([0-9]+\.[0-9]+
 
 TEST_ASSET_DIR ?= $(ROOTDIR)/_test
 
+# Directory to store downloaded conformance tests for different versions
+CONFORMANCE_DIR ?= $(TEST_ASSET_DIR)/conformance
+# Gateway API version used for conformance testing
+GATEWAY_API_VERSION ?= v1.2.0
+# Fetch the module directory for the specified version of the Gateway API
+GATEWAY_API_MODULE_DIR := $(shell go list -m -json sigs.k8s.io/gateway-api@$(GATEWAY_API_VERSION) | jq -r '.Dir')
+
 # This is the location where assets are placed after a test failure
 # This is used by our e2e tests to emit information about the running instance of Gloo Gateway
 BUG_REPORT_DIR := $(TEST_ASSET_DIR)/bug_report
@@ -349,6 +356,7 @@ clean:
 	rm -rf docs/site*
 	rm -rf docs/themes
 	rm -rf docs/resources
+	rm -rf $(CONFORMANCE_DIR)
 	git clean -f -X install
 
 .PHONY: clean-tests
@@ -1235,26 +1243,40 @@ build-test-chart: ## Build the Helm chart and place it in the _test directory
 # Targets for running Kubernetes Gateway API conformance tests
 #----------------------------------------------------------------------------------
 
-# Pull the conformance test suite from the k8s gateway api repo and copy it into the test dir.
-$(TEST_ASSET_DIR)/conformance/conformance_test.go:
-	mkdir -p $(TEST_ASSET_DIR)/conformance
-	echo "//go:build conformance" > $@
-	cat $(shell go list -json -m sigs.k8s.io/gateway-api | jq -r '.Dir')/conformance/conformance_test.go >> $@
-	go fmt $@
+# Download and prepare the conformance test suite for a specific Gateway API version
+$(CONFORMANCE_DIR)/$(GATEWAY_API_VERSION)/conformance_test.go:
+	mkdir -p $(CONFORMANCE_DIR)/$(GATEWAY_API_VERSION)
+	go mod download sigs.k8s.io/gateway-api@$(GATEWAY_API_VERSION)
+	cp $(GATEWAY_API_MODULE_DIR)/conformance/conformance_test.go $@
+
+# Install the correct version of Gateway API CRDs in the Kubernetes cluster
+install-crds:
+	kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/$(GATEWAY_API_VERSION)/experimental-install.yaml
+
+# Update go.mod to replace Gateway API module with the version used for conformance testing
+update-mod:
+	go mod edit -replace=sigs.k8s.io/gateway-api=$(GATEWAY_API_MODULE_DIR)
+
+# Reset go.mod to remove the replace directive for Gateway API conformance testing
+reset-mod:
+	go mod edit -dropreplace=sigs.k8s.io/gateway-api
+	go mod tidy
 
+# Common arguments for conformance testing
 CONFORMANCE_SUPPORTED_FEATURES ?= -supported-features=Gateway,ReferenceGrant,HTTPRoute,HTTPRouteQueryParamMatching,HTTPRouteMethodMatching,HTTPRouteResponseHeaderModification,HTTPRoutePortRedirect,HTTPRouteHostRewrite,HTTPRouteSchemeRedirect,HTTPRoutePathRedirect,HTTPRouteHostRewrite,HTTPRoutePathRewrite,HTTPRouteRequestMirror
 CONFORMANCE_SUPPORTED_PROFILES ?= -conformance-profiles=GATEWAY-HTTP
-CONFORMANCE_REPORT_ARGS ?= -report-output=$(TEST_ASSET_DIR)/conformance/$(VERSION)-report.yaml -organization=solo.io -project=gloo-gateway -version=$(VERSION) -url=github.com/solo-io/gloo -contact=github.com/solo-io/gloo/issues/new/choose
+CONFORMANCE_REPORT_ARGS ?= -report-output=$(CONFORMANCE_DIR)/$(GATEWAY_API_VERSION)/$(VERSION)-report.yaml -organization=solo.io -project=gloo-gateway -version=$(VERSION) -url=github.com/solo-io/gloo -contact=github.com/solo-io/gloo/issues/new/choose
 CONFORMANCE_ARGS := -gateway-class=gloo-gateway $(CONFORMANCE_SUPPORTED_FEATURES) $(CONFORMANCE_SUPPORTED_PROFILES) $(CONFORMANCE_REPORT_ARGS)
 
-.PHONY: conformance ## Run the conformance test suite
-conformance: $(TEST_ASSET_DIR)/conformance/conformance_test.go
-	go test -mod=mod -ldflags=$(LDFLAGS) -tags conformance -test.v $(TEST_ASSET_DIR)/conformance/... -args $(CONFORMANCE_ARGS)
+# Run conformance tests for the specified Gateway API version
+.PHONY: conformance
+conformance: $(CONFORMANCE_DIR)/$(GATEWAY_API_VERSION)/conformance_test.go install-crds update-mod
+	@trap "make reset-mod" EXIT; \
+	go test -mod=mod -ldflags=$(LDFLAGS) -tags conformance -test.v $(CONFORMANCE_DIR)/$(GATEWAY_API_VERSION)/... -args $(CONFORMANCE_ARGS)
 
-# Run only the specified conformance test. The name must correspond to the ShortName of one of the k8s gateway api
-# conformance tests.
-conformance-%: $(TEST_ASSET_DIR)/conformance/conformance_test.go
-	go test -mod=mod -ldflags=$(LDFLAGS) -tags conformance -test.v $(TEST_ASSET_DIR)/conformance/... -args $(CONFORMANCE_ARGS) \
+.PHONY: conformance-% ## Run the conformance test suite
+conformance-%: $(CONFORMANCE_DIR)/$(GATEWAY_API_VERSION)/conformance_test.go
+	go test -mod=mod -ldflags=$(LDFLAGS) -tags conformance -test.v $(CONFORMANCE_DIR)/$(GATEWAY_API_VERSION)/... -args $(CONFORMANCE_ARGS) \
 	-run-test=$*
 
 #----------------------------------------------------------------------------------
diff --git a/changelog/v1.18.0-rc2/issue_10359.yaml b/changelog/v1.18.0-rc2/issue_10359.yaml
new file mode 100644
index 00000000000..70e6f376759
--- /dev/null
+++ b/changelog/v1.18.0-rc2/issue_10359.yaml
@@ -0,0 +1,6 @@
+changelog:
+  - type: FIX
+    issueLink: https://github.com/k8sgateway/k8sgateway/issues/10359
+    resolvesIssue: true
+    description: >-
+      Updates the Makefile and conformance GitHub action to support multiple Gateway API versions.

From 9dae4d19cd4b6c9ceb72124c2c2b0988de48d535 Mon Sep 17 00:00:00 2001
From: Daneyon Hansen <daneyon.hansen@solo.io>
Date: Thu, 5 Dec 2024 11:39:04 -0800
Subject: [PATCH 02/19] Refactors to use dotenv-action envs for min/max GW API
 versions

Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>
---
 .../workflows/.env/pr-tests/max_versions.env  |  1 +
 .../workflows/.env/pr-tests/min_versions.env  |  1 +
 .../action.yaml                               |  6 ++---
 .github/workflows/conformance-tests.yaml      | 25 ++++++++++++-------
 .../issue_10359.yaml                          |  0
 5 files changed, 21 insertions(+), 12 deletions(-)
 create mode 100644 .github/workflows/.env/pr-tests/max_versions.env
 create mode 100644 .github/workflows/.env/pr-tests/min_versions.env
 rename changelog/{v1.18.0-rc2 => v1.19.0-beta1}/issue_10359.yaml (100%)

diff --git a/.github/workflows/.env/pr-tests/max_versions.env b/.github/workflows/.env/pr-tests/max_versions.env
new file mode 100644
index 00000000000..542bab5c3a6
--- /dev/null
+++ b/.github/workflows/.env/pr-tests/max_versions.env
@@ -0,0 +1 @@
+k8sgateway_api_version='v1.2.0'
diff --git a/.github/workflows/.env/pr-tests/min_versions.env b/.github/workflows/.env/pr-tests/min_versions.env
new file mode 100644
index 00000000000..5171f5a7d38
--- /dev/null
+++ b/.github/workflows/.env/pr-tests/min_versions.env
@@ -0,0 +1 @@
+k8sgateway_api_version='v1.1.0'
diff --git a/.github/workflows/composite-actions/kube-gateway-api-conformance-tests/action.yaml b/.github/workflows/composite-actions/kube-gateway-api-conformance-tests/action.yaml
index aacf2aa3172..a892803886c 100644
--- a/.github/workflows/composite-actions/kube-gateway-api-conformance-tests/action.yaml
+++ b/.github/workflows/composite-actions/kube-gateway-api-conformance-tests/action.yaml
@@ -1,8 +1,8 @@
 name: Conformance Tests
 description: Run Kubernetes Gateway API conformance tests for multiple versions
 inputs:
-  gateway-api-version:
-    description: "The version of Gateway API to test."
+  k8sgateway-api-version:
+    description: The version of the Kubernetes Gateway API CRDs to use for testing
     required: true
 runs:
   using: "composite"
@@ -58,7 +58,7 @@ runs:
   - name: Run the kubernetes gateway API conformance tests
     shell: bash
     env:
-      GATEWAY_API_VERSION: ${{ inputs.gateway-api-version }}
+      GATEWAY_API_VERSION: ${{ inputs.k8sgateway-api-version }}
     run: make conformance
   - name: Capture debug information when tests fail
     if: ${{ failure() }}
diff --git a/.github/workflows/conformance-tests.yaml b/.github/workflows/conformance-tests.yaml
index dfa3fdc979e..3d2bacea1d7 100644
--- a/.github/workflows/conformance-tests.yaml
+++ b/.github/workflows/conformance-tests.yaml
@@ -18,11 +18,9 @@ on:
 
 jobs:
   run-conformance-tests:
-    name: Conformance Tests for ${{ matrix.gateway-api-version }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        gateway-api-version: [v1.1.0, v1.2.0]
         # TODO(tim): Avoid hardcoding versions here. It's a bit tricky based on
         # how this was setup and there's a limited # of dispatch inputs that GH
         # supports. We can revisit this later.
@@ -35,18 +33,27 @@ jobs:
           - ${{ inputs.image-variant }}
         version:
           - ${{ inputs.version }}
+        version-files:
+          - label: 'min'
+            file: './.github/workflows/.env/pr-tests/min_versions.env'
+          - label: 'max'
+            file: './.github/workflows/.env/pr-tests/max_versions.env'
     steps:
+      # Checkout the branch that initiated the action
       - name: Checkout Repository
         uses: actions/checkout@v4
-
-      - name: Export GATEWAY_API_VERSION
-        shell: bash
-        run: echo "GATEWAY_API_VERSION=${{ matrix.gateway-api-version }}" >> $GITHUB_ENV
-
+      # 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/dotenv-action@v1.1.4
+        id: dotenv
+        with:
+          path: ${{ matrix.version-files.file }}
+          log-variables: true
+      # Run the k8s gateway api conformance tests
       - name: Run Conformance Tests
         uses: ./.github/workflows/composite-actions/kube-gateway-api-conformance-tests
         with:
-          gateway-api-version: ${{ matrix.gateway-api-version }}
-
+          k8sgateway-api-version: ${{ steps.dotenv.outputs.k8sgateway_api_version }}
       # TODO(tim): Add support for downloading the test results and creating
       # a pull request whenever a new release > 1.17+ is cut.
diff --git a/changelog/v1.18.0-rc2/issue_10359.yaml b/changelog/v1.19.0-beta1/issue_10359.yaml
similarity index 100%
rename from changelog/v1.18.0-rc2/issue_10359.yaml
rename to changelog/v1.19.0-beta1/issue_10359.yaml

From 411c3d8bc48f445f5e7384a7ab6757833812b99b Mon Sep 17 00:00:00 2001
From: Daneyon Hansen <daneyon.hansen@solo.io>
Date: Mon, 9 Dec 2024 14:44:40 -0800
Subject: [PATCH 03/19] Moves gw api env var to Setup test env step

Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>
---
 .../workflows/.env/pr-tests/max_versions.env  |  2 +-
 .../action.yaml                               |  5 +++--
 .github/workflows/nightly-tests.yaml          | 17 +++++++++++++-
 .github/workflows/regression-tests.yaml       | 17 ++++++++++++++
 Makefile                                      | 22 +++++++++----------
 .../issue_10359.yaml                          |  0
 6 files changed, 48 insertions(+), 15 deletions(-)
 rename changelog/{v1.19.0-beta1 => v1.19.0-beta3}/issue_10359.yaml (100%)

diff --git a/.github/workflows/.env/pr-tests/max_versions.env b/.github/workflows/.env/pr-tests/max_versions.env
index 542bab5c3a6..0a6f724778a 100644
--- a/.github/workflows/.env/pr-tests/max_versions.env
+++ b/.github/workflows/.env/pr-tests/max_versions.env
@@ -1 +1 @@
-k8sgateway_api_version='v1.2.0'
+k8sgateway_api_version='v1.2.1'
diff --git a/.github/workflows/composite-actions/kube-gateway-api-conformance-tests/action.yaml b/.github/workflows/composite-actions/kube-gateway-api-conformance-tests/action.yaml
index a892803886c..f48d64bb5da 100644
--- a/.github/workflows/composite-actions/kube-gateway-api-conformance-tests/action.yaml
+++ b/.github/workflows/composite-actions/kube-gateway-api-conformance-tests/action.yaml
@@ -40,6 +40,7 @@ runs:
       CLUSTER_NODE_VERSION: ${{ matrix.kube-version.node }}
       IMAGE_VARIANT: ${{ matrix.image-variant }}
       CONFORMANCE: "true"
+      CONFORMANCE_VERSION: ${{ inputs.k8sgateway-api-version }}
     run: ./ci/kind/setup-kind.sh
   - name: Install Gloo Gateway with the k8s gateway integration enabled
     shell: bash
@@ -57,9 +58,9 @@ runs:
       fi
   - name: Run the kubernetes gateway API conformance tests
     shell: bash
-    env:
-      GATEWAY_API_VERSION: ${{ inputs.k8sgateway-api-version }}
     run: make conformance
+    env:
+      CONFORMANCE_VERSION: ${{ inputs.k8sgateway-api-version }}
   - name: Capture debug information when tests fail
     if: ${{ failure() }}
     shell: bash
diff --git a/.github/workflows/nightly-tests.yaml b/.github/workflows/nightly-tests.yaml
index a929eea07ce..4ca48612101 100644
--- a/.github/workflows/nightly-tests.yaml
+++ b/.github/workflows/nightly-tests.yaml
@@ -489,7 +489,15 @@ jobs:
     - uses: actions/checkout@v4
       with:
         ref: main
+    - name: Dotenv Action
+      uses: falti/dotenv-action@v1.1.4
+      id: dotenv
+      with:
+        path: ${{ matrix.version-files.file }}
+        log-variables: true
     - uses: ./.github/workflows/composite-actions/kube-gateway-api-conformance-tests
+      with:
+        k8sgateway-api-version: ${{ steps.dotenv.outputs.k8sgateway_api_version }}
 
   kube_gateway_api_conformance_tests_18:
     name: Conformance (branch=v1.18.x, type=Kubernetes Gateway API, version=${{matrix.kube-version.node}} )
@@ -507,8 +515,15 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: v1.18.x
+      - name: Dotenv Action
+        uses: falti/dotenv-action@v1.1.4
+        id: dotenv
+        with:
+          path: ${{ matrix.version-files.file }}
+          log-variables: true
       - uses: ./.github/workflows/composite-actions/kube-gateway-api-conformance-tests
-
+        with:
+          k8sgateway-api-version: ${{ steps.dotenv.outputs.k8sgateway_api_version }}
 
   kube_gateway_api_conformance_tests_17:
     name: Conformance (branch=v1.17.x, type=Kubernetes Gateway API, version=${{matrix.kube-version.node}} )
diff --git a/.github/workflows/regression-tests.yaml b/.github/workflows/regression-tests.yaml
index 070ec0c6a6c..b765f82cb56 100644
--- a/.github/workflows/regression-tests.yaml
+++ b/.github/workflows/regression-tests.yaml
@@ -82,12 +82,29 @@ jobs:
         # (see https://github.com/solo-io/solo-projects/issues/6094)
         image-variant:
           - standard
+        version-files:
+          - label: 'min'
+            file: './.github/workflows/.env/pr-tests/min_versions.env'
+          - label: 'max'
+            file: './.github/workflows/.env/pr-tests/max_versions.env'
     steps:
+    # Checkout the branch that initiated the action
     - 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"
+    # 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/dotenv-action@v1.1.4
+      id: dotenv
+      with:
+        path: ${{ matrix.version-files.file }}
+        log-variables: true
+    # Run the k8s gateway api conformance tests
     - id: run-tests
       if: needs.prepare_env.outputs.should-auto-succeed-regression-tests != 'true'
       uses: ./.github/workflows/composite-actions/kube-gateway-api-conformance-tests
+      with:
+        k8sgateway-api-version: ${{ steps.dotenv.outputs.k8sgateway_api_version }}
diff --git a/Makefile b/Makefile
index 67b61f0c901..d08c8460e5b 100644
--- a/Makefile
+++ b/Makefile
@@ -95,9 +95,9 @@ TEST_ASSET_DIR ?= $(ROOTDIR)/_test
 # Directory to store downloaded conformance tests for different versions
 CONFORMANCE_DIR ?= $(TEST_ASSET_DIR)/conformance
 # Gateway API version used for conformance testing
-GATEWAY_API_VERSION ?= v1.2.0
+CONFORMANCE_VERSION ?= v1.2.0
 # Fetch the module directory for the specified version of the Gateway API
-GATEWAY_API_MODULE_DIR := $(shell go list -m -json sigs.k8s.io/gateway-api@$(GATEWAY_API_VERSION) | jq -r '.Dir')
+GATEWAY_API_MODULE_DIR := $(shell go mod download -json sigs.k8s.io/gateway-api@$(CONFORMANCE_VERSION) | jq -r '.Dir')
 
 # This is the location where assets are placed after a test failure
 # This is used by our e2e tests to emit information about the running instance of Gloo Gateway
@@ -1244,14 +1244,14 @@ build-test-chart: ## Build the Helm chart and place it in the _test directory
 #----------------------------------------------------------------------------------
 
 # Download and prepare the conformance test suite for a specific Gateway API version
-$(CONFORMANCE_DIR)/$(GATEWAY_API_VERSION)/conformance_test.go:
-	mkdir -p $(CONFORMANCE_DIR)/$(GATEWAY_API_VERSION)
-	go mod download sigs.k8s.io/gateway-api@$(GATEWAY_API_VERSION)
+$(CONFORMANCE_DIR)/$(CONFORMANCE_VERSION)/conformance_test.go:
+	mkdir -p $(CONFORMANCE_DIR)/$(CONFORMANCE_VERSION)
+	go mod download sigs.k8s.io/gateway-api@$(CONFORMANCE_VERSION)
 	cp $(GATEWAY_API_MODULE_DIR)/conformance/conformance_test.go $@
 
 # Install the correct version of Gateway API CRDs in the Kubernetes cluster
 install-crds:
-	kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/$(GATEWAY_API_VERSION)/experimental-install.yaml
+	kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/$(CONFORMANCE_VERSION)/experimental-install.yaml
 
 # Update go.mod to replace Gateway API module with the version used for conformance testing
 update-mod:
@@ -1265,18 +1265,18 @@ reset-mod:
 # Common arguments for conformance testing
 CONFORMANCE_SUPPORTED_FEATURES ?= -supported-features=Gateway,ReferenceGrant,HTTPRoute,HTTPRouteQueryParamMatching,HTTPRouteMethodMatching,HTTPRouteResponseHeaderModification,HTTPRoutePortRedirect,HTTPRouteHostRewrite,HTTPRouteSchemeRedirect,HTTPRoutePathRedirect,HTTPRouteHostRewrite,HTTPRoutePathRewrite,HTTPRouteRequestMirror
 CONFORMANCE_SUPPORTED_PROFILES ?= -conformance-profiles=GATEWAY-HTTP
-CONFORMANCE_REPORT_ARGS ?= -report-output=$(CONFORMANCE_DIR)/$(GATEWAY_API_VERSION)/$(VERSION)-report.yaml -organization=solo.io -project=gloo-gateway -version=$(VERSION) -url=github.com/solo-io/gloo -contact=github.com/solo-io/gloo/issues/new/choose
+CONFORMANCE_REPORT_ARGS ?= -report-output=$(CONFORMANCE_DIR)/$(CONFORMANCE_VERSION)/$(VERSION)-report.yaml -organization=solo.io -project=gloo-gateway -version=$(VERSION) -url=github.com/solo-io/gloo -contact=github.com/solo-io/gloo/issues/new/choose
 CONFORMANCE_ARGS := -gateway-class=gloo-gateway $(CONFORMANCE_SUPPORTED_FEATURES) $(CONFORMANCE_SUPPORTED_PROFILES) $(CONFORMANCE_REPORT_ARGS)
 
 # Run conformance tests for the specified Gateway API version
 .PHONY: conformance
-conformance: $(CONFORMANCE_DIR)/$(GATEWAY_API_VERSION)/conformance_test.go install-crds update-mod
+conformance: $(CONFORMANCE_DIR)/$(CONFORMANCE_VERSION)/conformance_test.go install-crds update-mod
 	@trap "make reset-mod" EXIT; \
-	go test -mod=mod -ldflags=$(LDFLAGS) -tags conformance -test.v $(CONFORMANCE_DIR)/$(GATEWAY_API_VERSION)/... -args $(CONFORMANCE_ARGS)
+	go test -mod=mod -ldflags=$(LDFLAGS) -tags conformance -test.v $(CONFORMANCE_DIR)/$(CONFORMANCE_VERSION)/... -args $(CONFORMANCE_ARGS)
 
 .PHONY: conformance-% ## Run the conformance test suite
-conformance-%: $(CONFORMANCE_DIR)/$(GATEWAY_API_VERSION)/conformance_test.go
-	go test -mod=mod -ldflags=$(LDFLAGS) -tags conformance -test.v $(CONFORMANCE_DIR)/$(GATEWAY_API_VERSION)/... -args $(CONFORMANCE_ARGS) \
+conformance-%: $(CONFORMANCE_DIR)/$(CONFORMANCE_VERSION)/conformance_test.go
+	go test -mod=mod -ldflags=$(LDFLAGS) -tags conformance -test.v $(CONFORMANCE_DIR)/$(CONFORMANCE_VERSION)/... -args $(CONFORMANCE_ARGS) \
 	-run-test=$*
 
 #----------------------------------------------------------------------------------
diff --git a/changelog/v1.19.0-beta1/issue_10359.yaml b/changelog/v1.19.0-beta3/issue_10359.yaml
similarity index 100%
rename from changelog/v1.19.0-beta1/issue_10359.yaml
rename to changelog/v1.19.0-beta3/issue_10359.yaml

From f3ded4a1ddb30d440ccd410571d4d902af37efb5 Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Thu, 16 Jan 2025 16:12:58 +0000
Subject: [PATCH 04/19] Adding changelog file to new location

---
 changelog/v1.19.0-beta4/issue_10359.yaml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 changelog/v1.19.0-beta4/issue_10359.yaml

diff --git a/changelog/v1.19.0-beta4/issue_10359.yaml b/changelog/v1.19.0-beta4/issue_10359.yaml
new file mode 100644
index 00000000000..70e6f376759
--- /dev/null
+++ b/changelog/v1.19.0-beta4/issue_10359.yaml
@@ -0,0 +1,6 @@
+changelog:
+  - type: FIX
+    issueLink: https://github.com/k8sgateway/k8sgateway/issues/10359
+    resolvesIssue: true
+    description: >-
+      Updates the Makefile and conformance GitHub action to support multiple Gateway API versions.

From 240b7adf61d0c9f70b6405f1ca26364d830356b5 Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Thu, 16 Jan 2025 16:12:58 +0000
Subject: [PATCH 05/19] Deleting changelog file from old location

---
 changelog/v1.19.0-beta3/issue_10359.yaml | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 changelog/v1.19.0-beta3/issue_10359.yaml

diff --git a/changelog/v1.19.0-beta3/issue_10359.yaml b/changelog/v1.19.0-beta3/issue_10359.yaml
deleted file mode 100644
index 70e6f376759..00000000000
--- a/changelog/v1.19.0-beta3/issue_10359.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-changelog:
-  - type: FIX
-    issueLink: https://github.com/k8sgateway/k8sgateway/issues/10359
-    resolvesIssue: true
-    description: >-
-      Updates the Makefile and conformance GitHub action to support multiple Gateway API versions.

From 30b0ff0bfd413f6e88b137d41bab6dc222f43acc Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Thu, 23 Jan 2025 14:53:16 +0000
Subject: [PATCH 06/19] Adding changelog file to new location

---
 changelog/v1.19.0-beta5/issue_10359.yaml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 changelog/v1.19.0-beta5/issue_10359.yaml

diff --git a/changelog/v1.19.0-beta5/issue_10359.yaml b/changelog/v1.19.0-beta5/issue_10359.yaml
new file mode 100644
index 00000000000..70e6f376759
--- /dev/null
+++ b/changelog/v1.19.0-beta5/issue_10359.yaml
@@ -0,0 +1,6 @@
+changelog:
+  - type: FIX
+    issueLink: https://github.com/k8sgateway/k8sgateway/issues/10359
+    resolvesIssue: true
+    description: >-
+      Updates the Makefile and conformance GitHub action to support multiple Gateway API versions.

From 9328a019925abcea6fa7bf91502c75249f44a479 Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Thu, 23 Jan 2025 14:53:16 +0000
Subject: [PATCH 07/19] Deleting changelog file from old location

---
 changelog/v1.19.0-beta4/issue_10359.yaml | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 changelog/v1.19.0-beta4/issue_10359.yaml

diff --git a/changelog/v1.19.0-beta4/issue_10359.yaml b/changelog/v1.19.0-beta4/issue_10359.yaml
deleted file mode 100644
index 70e6f376759..00000000000
--- a/changelog/v1.19.0-beta4/issue_10359.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-changelog:
-  - type: FIX
-    issueLink: https://github.com/k8sgateway/k8sgateway/issues/10359
-    resolvesIssue: true
-    description: >-
-      Updates the Makefile and conformance GitHub action to support multiple Gateway API versions.

From 6e89be9caed0b28cd272a6dc3019da1c671ff35c Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Thu, 30 Jan 2025 18:52:31 +0000
Subject: [PATCH 08/19] Adding changelog file to new location

---
 changelog/v1.19.0-beta6/issue_10359.yaml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 changelog/v1.19.0-beta6/issue_10359.yaml

diff --git a/changelog/v1.19.0-beta6/issue_10359.yaml b/changelog/v1.19.0-beta6/issue_10359.yaml
new file mode 100644
index 00000000000..70e6f376759
--- /dev/null
+++ b/changelog/v1.19.0-beta6/issue_10359.yaml
@@ -0,0 +1,6 @@
+changelog:
+  - type: FIX
+    issueLink: https://github.com/k8sgateway/k8sgateway/issues/10359
+    resolvesIssue: true
+    description: >-
+      Updates the Makefile and conformance GitHub action to support multiple Gateway API versions.

From 6dc48778d0826bf38fd8831b6e3172c46419cd14 Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Thu, 30 Jan 2025 18:52:32 +0000
Subject: [PATCH 09/19] Deleting changelog file from old location

---
 changelog/v1.19.0-beta5/issue_10359.yaml | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 changelog/v1.19.0-beta5/issue_10359.yaml

diff --git a/changelog/v1.19.0-beta5/issue_10359.yaml b/changelog/v1.19.0-beta5/issue_10359.yaml
deleted file mode 100644
index 70e6f376759..00000000000
--- a/changelog/v1.19.0-beta5/issue_10359.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-changelog:
-  - type: FIX
-    issueLink: https://github.com/k8sgateway/k8sgateway/issues/10359
-    resolvesIssue: true
-    description: >-
-      Updates the Makefile and conformance GitHub action to support multiple Gateway API versions.

From 729f0215929dc689e32834b469afc3b8c71ac4fd Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Mon, 10 Feb 2025 15:42:53 +0000
Subject: [PATCH 10/19] Adding changelog file to new location

---
 changelog/v1.19.0-beta7/issue_10359.yaml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 changelog/v1.19.0-beta7/issue_10359.yaml

diff --git a/changelog/v1.19.0-beta7/issue_10359.yaml b/changelog/v1.19.0-beta7/issue_10359.yaml
new file mode 100644
index 00000000000..70e6f376759
--- /dev/null
+++ b/changelog/v1.19.0-beta7/issue_10359.yaml
@@ -0,0 +1,6 @@
+changelog:
+  - type: FIX
+    issueLink: https://github.com/k8sgateway/k8sgateway/issues/10359
+    resolvesIssue: true
+    description: >-
+      Updates the Makefile and conformance GitHub action to support multiple Gateway API versions.

From 80eebbee90c0a037f3996e5d5eb514639ab8c0e3 Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Mon, 10 Feb 2025 15:42:54 +0000
Subject: [PATCH 11/19] Deleting changelog file from old location

---
 changelog/v1.19.0-beta6/issue_10359.yaml | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 changelog/v1.19.0-beta6/issue_10359.yaml

diff --git a/changelog/v1.19.0-beta6/issue_10359.yaml b/changelog/v1.19.0-beta6/issue_10359.yaml
deleted file mode 100644
index 70e6f376759..00000000000
--- a/changelog/v1.19.0-beta6/issue_10359.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-changelog:
-  - type: FIX
-    issueLink: https://github.com/k8sgateway/k8sgateway/issues/10359
-    resolvesIssue: true
-    description: >-
-      Updates the Makefile and conformance GitHub action to support multiple Gateway API versions.

From aa6d5e0a7e901cb24fa23775d78feb27448ac4c4 Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Wed, 12 Feb 2025 17:31:50 +0000
Subject: [PATCH 12/19] Adding changelog file to new location

---
 changelog/v1.19.0-beta8/issue_10359.yaml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 changelog/v1.19.0-beta8/issue_10359.yaml

diff --git a/changelog/v1.19.0-beta8/issue_10359.yaml b/changelog/v1.19.0-beta8/issue_10359.yaml
new file mode 100644
index 00000000000..70e6f376759
--- /dev/null
+++ b/changelog/v1.19.0-beta8/issue_10359.yaml
@@ -0,0 +1,6 @@
+changelog:
+  - type: FIX
+    issueLink: https://github.com/k8sgateway/k8sgateway/issues/10359
+    resolvesIssue: true
+    description: >-
+      Updates the Makefile and conformance GitHub action to support multiple Gateway API versions.

From 33a7e86baa06ddefbeea00ee53bf1ec73fd919c4 Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Wed, 12 Feb 2025 17:31:51 +0000
Subject: [PATCH 13/19] Deleting changelog file from old location

---
 changelog/v1.19.0-beta7/issue_10359.yaml | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 changelog/v1.19.0-beta7/issue_10359.yaml

diff --git a/changelog/v1.19.0-beta7/issue_10359.yaml b/changelog/v1.19.0-beta7/issue_10359.yaml
deleted file mode 100644
index 70e6f376759..00000000000
--- a/changelog/v1.19.0-beta7/issue_10359.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-changelog:
-  - type: FIX
-    issueLink: https://github.com/k8sgateway/k8sgateway/issues/10359
-    resolvesIssue: true
-    description: >-
-      Updates the Makefile and conformance GitHub action to support multiple Gateway API versions.

From a7208a2c32c8cb0e20bf3c1e1b45cf4e3df436c9 Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Fri, 14 Feb 2025 23:07:15 +0000
Subject: [PATCH 14/19] Adding changelog file to new location

---
 changelog/v1.19.0-beta9/issue_10359.yaml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 changelog/v1.19.0-beta9/issue_10359.yaml

diff --git a/changelog/v1.19.0-beta9/issue_10359.yaml b/changelog/v1.19.0-beta9/issue_10359.yaml
new file mode 100644
index 00000000000..70e6f376759
--- /dev/null
+++ b/changelog/v1.19.0-beta9/issue_10359.yaml
@@ -0,0 +1,6 @@
+changelog:
+  - type: FIX
+    issueLink: https://github.com/k8sgateway/k8sgateway/issues/10359
+    resolvesIssue: true
+    description: >-
+      Updates the Makefile and conformance GitHub action to support multiple Gateway API versions.

From eea5c1cb52ad303e8e75dd48f86c422c8edfdc9a Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Fri, 14 Feb 2025 23:07:16 +0000
Subject: [PATCH 15/19] Deleting changelog file from old location

---
 changelog/v1.19.0-beta8/issue_10359.yaml | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 changelog/v1.19.0-beta8/issue_10359.yaml

diff --git a/changelog/v1.19.0-beta8/issue_10359.yaml b/changelog/v1.19.0-beta8/issue_10359.yaml
deleted file mode 100644
index 70e6f376759..00000000000
--- a/changelog/v1.19.0-beta8/issue_10359.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-changelog:
-  - type: FIX
-    issueLink: https://github.com/k8sgateway/k8sgateway/issues/10359
-    resolvesIssue: true
-    description: >-
-      Updates the Makefile and conformance GitHub action to support multiple Gateway API versions.

From 90c3d558f4b7b34b020d31568fabbd98cb21e5b2 Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Mon, 17 Feb 2025 22:14:52 +0000
Subject: [PATCH 16/19] Adding changelog file to new location

---
 changelog/v1.19.0-beta10/issue_10359.yaml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 changelog/v1.19.0-beta10/issue_10359.yaml

diff --git a/changelog/v1.19.0-beta10/issue_10359.yaml b/changelog/v1.19.0-beta10/issue_10359.yaml
new file mode 100644
index 00000000000..70e6f376759
--- /dev/null
+++ b/changelog/v1.19.0-beta10/issue_10359.yaml
@@ -0,0 +1,6 @@
+changelog:
+  - type: FIX
+    issueLink: https://github.com/k8sgateway/k8sgateway/issues/10359
+    resolvesIssue: true
+    description: >-
+      Updates the Makefile and conformance GitHub action to support multiple Gateway API versions.

From dc8e405fe353d02c4033a99f0658e1b4f2070fc4 Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Mon, 17 Feb 2025 22:14:52 +0000
Subject: [PATCH 17/19] Deleting changelog file from old location

---
 changelog/v1.19.0-beta9/issue_10359.yaml | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 changelog/v1.19.0-beta9/issue_10359.yaml

diff --git a/changelog/v1.19.0-beta9/issue_10359.yaml b/changelog/v1.19.0-beta9/issue_10359.yaml
deleted file mode 100644
index 70e6f376759..00000000000
--- a/changelog/v1.19.0-beta9/issue_10359.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-changelog:
-  - type: FIX
-    issueLink: https://github.com/k8sgateway/k8sgateway/issues/10359
-    resolvesIssue: true
-    description: >-
-      Updates the Makefile and conformance GitHub action to support multiple Gateway API versions.

From bf861ee542a8ea9da84251a0f660b9f817640520 Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Tue, 18 Feb 2025 22:52:30 +0000
Subject: [PATCH 18/19] Adding changelog file to new location

---
 changelog/v1.19.0-beta11/issue_10359.yaml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 changelog/v1.19.0-beta11/issue_10359.yaml

diff --git a/changelog/v1.19.0-beta11/issue_10359.yaml b/changelog/v1.19.0-beta11/issue_10359.yaml
new file mode 100644
index 00000000000..70e6f376759
--- /dev/null
+++ b/changelog/v1.19.0-beta11/issue_10359.yaml
@@ -0,0 +1,6 @@
+changelog:
+  - type: FIX
+    issueLink: https://github.com/k8sgateway/k8sgateway/issues/10359
+    resolvesIssue: true
+    description: >-
+      Updates the Makefile and conformance GitHub action to support multiple Gateway API versions.

From 1dcf9396f6231670829617d48248bfa81bac937b Mon Sep 17 00:00:00 2001
From: changelog-bot <changelog-bot>
Date: Tue, 18 Feb 2025 22:52:31 +0000
Subject: [PATCH 19/19] Deleting changelog file from old location

---
 changelog/v1.19.0-beta10/issue_10359.yaml | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 changelog/v1.19.0-beta10/issue_10359.yaml

diff --git a/changelog/v1.19.0-beta10/issue_10359.yaml b/changelog/v1.19.0-beta10/issue_10359.yaml
deleted file mode 100644
index 70e6f376759..00000000000
--- a/changelog/v1.19.0-beta10/issue_10359.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-changelog:
-  - type: FIX
-    issueLink: https://github.com/k8sgateway/k8sgateway/issues/10359
-    resolvesIssue: true
-    description: >-
-      Updates the Makefile and conformance GitHub action to support multiple Gateway API versions.