Skip to content

Commit

Permalink
Set k8sgateway api version when setting up e2e test cluster (#10386)
Browse files Browse the repository at this point in the history
  • Loading branch information
sheidkamp authored and yuval-k committed Nov 22, 2024
1 parent 50da791 commit 8cc3de9
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 0 deletions.
1 change: 1 addition & 0 deletions .github/workflows/.env/nightly-tests/max_versions.env
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ kind_version='v0.24.0'
helm_version='v3.14.4'
argocd_version='v2.8.4'
istio_version='1.22.0'
k8sgateway_api_version='v1.2.0'
1 change: 1 addition & 0 deletions .github/workflows/.env/nightly-tests/min_versions.env
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ kind_version='v0.20.0'
helm_version='v3.12.2'
argocd_version='v2.8.4'
istio_version='1.16.7'
k8sgateway_api_version='v1.0.0'
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ inputs:
istio-version:
required: true
description: The version of Istio
k8sgateway-api-version:
required: false
default: "" # If this is undefined the setup-kind script has its own default value
description: The version of the gateway-api to use

runs:
using: "composite"
Expand All @@ -43,4 +47,5 @@ runs:
CLUSTER_NAME: ${{ inputs.cluster-name }}
CLUSTER_NODE_VERSION: ${{ inputs.kind-node-version }}
ISTIO_VERSION: ${{ inputs.istio-version }}
CONFORMANCE_VERSION: ${{ inputs.k8sgateway-api-version }}
run: ./ci/kind/setup-kind.sh
2 changes: 2 additions & 0 deletions .github/workflows/nightly-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ jobs:
kubectl-version: ${{ steps.dotenv.outputs.kubectl_version }}
helm-version: ${{ steps.dotenv.outputs.helm_version }}
istio-version: ${{ steps.dotenv.outputs.istio_version }}
k8sgateway-api-version: ${{ steps.dotenv.outputs.k8sgateway_api_version }}
# Run the tests
- id: run-tests
name: Run Kubernetes e2e Tests
Expand Down Expand Up @@ -163,6 +164,7 @@ jobs:
kubectl-version: ${{ steps.dotenv.outputs.kubectl_version }}
helm-version: ${{ steps.dotenv.outputs.helm_version }}
istio-version: ${{ steps.dotenv.outputs.istio_version }}
k8sgateway-api-version: ${{ steps.dotenv.outputs.k8sgateway_api_version }}
# Run the tests
- id: run-tests
name: Run Kubernetes e2e Tests
Expand Down
9 changes: 9 additions & 0 deletions changelog/v1.18.0-rc2/conformance-version-in-env.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
changelog:
- type: NON_USER_FACING
issueLink: https://github.com/solo-io/gloo/issues/10364
resolvesIssue: false
description: >-
When setting up our kind cluster for tests, we need to ensure that the correct version of the k8sgateway APIs are loaded, as
we support multiple versions of Istio that use different versions of the rapidly changing k8sgateway APIs.
To support this, `k8sgateway_api_version` has been added to the the min/max environment variables for the test matrix
and the value are set as the `CONFORMANCE_VERSION` environment variable when running the setup-kind script.

0 comments on commit 8cc3de9

Please sign in to comment.