backport effective version CI fixes to release/2.11.x (#4586)

* test: update helm chart version to the latest (#4511) * test: update helm chart version to 2.26.3 * set effective versions in github workflow files * update instructions of release issue to make sure effective version of kong updated * fix: define vars for effective semver in manifest of integration tests (#4549) * chore: bump ktf to v0.38.0 --------- Co-authored-by: Tao Yi <[email protected]>
Kong · Aug 29, 2023 · e9a60d0 · e9a60d0
1 parent 27b8343
commit e9a60d0
Show file tree

Hide file tree

Showing 9 changed files with 98 additions and 84 deletions.
diff --git a/.github/ISSUE_TEMPLATE/release.yaml b/.github/ISSUE_TEMPLATE/release.yaml
@@ -32,6 +32,7 @@ body:
       - label: Check the latest minor Kong Gateway release in [Kong releases](https://github.com/Kong/kong/releases).
       - label: Make sure the image tag in [config/image/enterprise/kustomization.yaml](/Kong/kubernetes-ingress-controller/blob/main/config/image/enterprise/kustomization.yaml) and [config/image/oss/kustomization.yaml](/Kong/kubernetes-ingress-controller/blob/main/config/image/oss/kustomization.yaml) is updated accordingly.
       - label: Run `make manifests` to regenerate manifests using the modified kustomizations and open a PR with the changes (similarly to [this PR](https://github.com/Kong/kubernetes-ingress-controller/pull/3288)).
+      - label: "Make sure that effective versions configured in manifests of github workflows updated, including these files:  .github.com/workflows/e2e_nightly.yaml, .github/workflows/test_nightly.yaml."
 - type: checkboxes
   id: release_branch
   attributes:

diff --git a/.github/workflows/_integration_tests.yaml b/.github/workflows/_integration_tests.yaml
@@ -13,6 +13,11 @@ on:
         # See https://github.com/Kong/kubernetes-testing-framework/issues/542
         default: "3.4"
         required: false
+      kong-oss-effective-version:
+        # specifies effective semver of Kong gateway OSS when tag is not a valid semver (like 'nightly').
+        type: string
+        default: ""
+        required: false
       kong-enterprise-container-repo:
         type: string
         default: "kong/kong-gateway"
@@ -23,6 +28,11 @@ on:
         # See https://github.com/Kong/kubernetes-testing-framework/issues/542
         default: "3.4"
         required: false
+      kong-enterprise-effective-version:
+        # specifies effective semver of Kong gateway enterprise when tag is not a valid semver (like 'nightly').
+        type: string
+        default: ""
+        required: false
 
 jobs:
   integration-tests:
@@ -81,9 +91,11 @@ jobs:
           if [ "${{ matrix.enterprise }}" == "true" ]; then
             echo "TEST_KONG_IMAGE=${{ inputs.kong-enterprise-container-repo }}" >> $GITHUB_ENV
             echo "TEST_KONG_TAG=${{ inputs.kong-enterprise-container-tag }}" >> $GITHUB_ENV
+            echo "TEST_KONG_EFFECTIVE_VERSION=${{ inputs.kong-enterprise-effective-version }}" >> $GITHUB_ENV
           else
             echo "TEST_KONG_IMAGE=${{ inputs.kong-container-repo }}" >> $GITHUB_ENV
             echo "TEST_KONG_TAG=${{ inputs.kong-container-tag }}" >> $GITHUB_ENV
+            echo "TEST_KONG_EFFECTIVE_VERSION=${{ inputs.kong-oss-effective-version }}" >> $GITHUB_ENV
           fi
 
       - name: checkout repository

diff --git a/.github/workflows/e2e_nightly.yaml b/.github/workflows/e2e_nightly.yaml
@@ -45,8 +45,10 @@ jobs:
     with:
       kong-container-repo: kong/kong
       kong-container-tag: nightly
+      kong-oss-effective-version: "3.4"
       kong-enterprise-container-repo: kong/kong-gateway-dev
       kong-enterprise-container-tag: nightly
+      kong-enterprise-effective-version: "3.4"
 
   test-reports:
     needs:

diff --git a/.github/workflows/test_nightly.yaml b/.github/workflows/test_nightly.yaml
@@ -18,8 +18,10 @@ on:
 env:
   kong-gateway-enterprise-registry: kong/kong-gateway-dev
   kong-gateway-enterprise-tag: latest
+  kong-gateway-enterprise-effective-version: "3.4"
   kong-gateway-oss-registry: kong/kong
   kong-gateway-oss-tag: latest-ubuntu
+  kong-gateway-oss-effective-version: "3.4"
 
 jobs:
   post-comment-in-pr:
@@ -67,9 +69,11 @@ jobs:
         KONG_LICENSE_DATA: ${{ steps.license.outputs.license }}
         TEST_KONG_IMAGE: ${{ env.kong-gateway-enterprise-registry }}
         TEST_KONG_TAG: ${{ env.kong-gateway-enterprise-tag }}
+        TEST_KONG_EFFECTIVE_VERSION: ${{ env.kong-gateway-enterprise-effective-version }}
         TEST_KONG_PULL_USERNAME: ${{ secrets.GHA_DOCKERHUB_PULL_USER }}
         TEST_KONG_PULL_PASSWORD: ${{ secrets.GHA_KONG_ORG_DOCKERHUB_PUBLIC_TOKEN }}
 
+
     - name: collect test coverage
       uses: actions/upload-artifact@v3
       with:
@@ -111,6 +115,7 @@ jobs:
         KONG_LICENSE_DATA: ${{ steps.license.outputs.license }}
         TEST_KONG_IMAGE: ${{ env.kong-gateway-enterprise-registry }}
         TEST_KONG_TAG: ${{ env.kong-gateway-enterprise-tag }}
+        TEST_KONG_EFFECTIVE_VERSION: ${{ env.kong-gateway-enterprise-effective-version }}
         TEST_KONG_PULL_USERNAME: ${{ secrets.GHA_DOCKERHUB_PULL_USER }}
         TEST_KONG_PULL_PASSWORD: ${{ secrets.GHA_KONG_ORG_DOCKERHUB_PUBLIC_TOKEN }}
 
@@ -148,6 +153,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         TEST_KONG_IMAGE: ${{ env.kong-gateway-oss-registry }}
         TEST_KONG_TAG: ${{ env.kong-gateway-oss-tag }}
+        TEST_KONG_EFFECTIVE_VERSION: ${{ env.kong-gateway-oss-effective-version }}
 
     - name: collect test coverage
       uses: actions/upload-artifact@v3
@@ -184,6 +190,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         TEST_KONG_IMAGE: ${{ env.kong-gateway-oss-registry }}
         TEST_KONG_TAG: ${{ env.kong-gateway-oss-tag }}
+        TEST_KONG_EFFECTIVE_VERSION: ${{ env.kong-gateway-oss-effective-version }}
 
     - name: collect test coverage
       uses: actions/upload-artifact@v3

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/kong/kubernetes-ingress-controller/v2
 go 1.20
 
 require (
-	cloud.google.com/go/container v1.24.0
+	cloud.google.com/go/container v1.25.0
 	github.com/Masterminds/sprig/v3 v3.2.3
 	github.com/avast/retry-go/v4 v4.5.0
 	github.com/blang/semver/v4 v4.0.0
@@ -12,12 +12,12 @@ require (
 	github.com/go-logr/logr v1.2.4
 	github.com/goccy/go-json v0.10.2
 	github.com/google/go-cmp v0.5.9
-	github.com/google/uuid v1.3.0
+	github.com/google/uuid v1.3.1
 	github.com/jpillora/backoff v1.0.0
 	github.com/kong/deck v1.26.0
 	github.com/kong/go-kong v0.46.0
 	github.com/kong/kubernetes-telemetry v0.1.0
-	github.com/kong/kubernetes-testing-framework v0.36.0
+	github.com/kong/kubernetes-testing-framework v0.38.0
 	github.com/lithammer/dedent v1.1.0
 	github.com/miekg/dns v1.1.55
 	github.com/mitchellh/mapstructure v1.5.0
@@ -32,18 +32,18 @@ require (
 	github.com/spf13/cobra v1.7.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.4
-	google.golang.org/api v0.136.0
-	k8s.io/api v0.27.4
-	k8s.io/apiextensions-apiserver v0.27.4
-	k8s.io/apimachinery v0.27.4
-	k8s.io/client-go v0.27.4
-	k8s.io/component-base v0.27.4
+	google.golang.org/api v0.138.0
+	k8s.io/api v0.28.0
+	k8s.io/apiextensions-apiserver v0.28.0
+	k8s.io/apimachinery v0.28.0
+	k8s.io/client-go v0.28.0
+	k8s.io/component-base v0.28.0
 	knative.dev/networking v0.0.0-20230718160410-75dcd54d9510
 	knative.dev/pkg v0.0.0-20230718152110-aef227e72ead
 	sigs.k8s.io/controller-runtime v0.15.1
 	sigs.k8s.io/gateway-api v0.7.1
-	sigs.k8s.io/kustomize/api v0.13.4
-	sigs.k8s.io/kustomize/kyaml v0.14.2
+	sigs.k8s.io/kustomize/api v0.14.0
+	sigs.k8s.io/kustomize/kyaml v0.14.3
 	sigs.k8s.io/yaml v1.3.0
 )
 
@@ -62,8 +62,9 @@ require (
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.14.1 // indirect
+	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-containerregistry v0.13.0 // indirect
-	github.com/google/s2a-go v0.1.4 // indirect
+	github.com/google/s2a-go v0.1.5 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
 	github.com/labstack/echo/v4 v4.11.1 // indirect
 	github.com/labstack/gommon v0.4.0 // indirect
@@ -112,17 +113,16 @@ require (
 	github.com/fatih/camelcase v1.0.0 // indirect
 	github.com/fatih/color v1.15.0 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/fvbommel/sortorder v1.0.1 // indirect
+	github.com/fvbommel/sortorder v1.1.0 // indirect
 	github.com/go-errors/errors v1.4.2 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-openapi/jsonpointer v0.20.0 // indirect
-	github.com/go-openapi/jsonreference v0.20.1 // indirect
+	github.com/go-openapi/jsonreference v0.20.2 // indirect
 	github.com/go-openapi/swag v0.22.4 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/btree v1.1.2 // indirect
-	github.com/google/gnostic v0.6.9 // indirect
 	github.com/google/go-github/v48 v48.2.0 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
@@ -180,11 +180,11 @@ require (
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
-	github.com/xlab/treeprint v1.1.0 // indirect
+	github.com/xlab/treeprint v1.2.0 // indirect
 	github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
 	github.com/yusufpapurcu/wmi v1.2.3 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
+	go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/crypto v0.12.0 // indirect
 	golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b
@@ -204,10 +204,10 @@ require (
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/cli-runtime v0.27.4
-	k8s.io/kube-openapi v0.0.0-20230515203736-54b630e78af5 // indirect
-	k8s.io/kubectl v0.27.4
-	k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect
+	k8s.io/cli-runtime v0.28.0
+	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
+	k8s.io/kubectl v0.28.0
+	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
 	knative.dev/serving v0.38.0
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/kind v0.20.0 // indirect