Skip to content

Commit e9a60d0

Browse files
pmalekrandmonkey
pmalek
and
randmonkey
authored
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]>
1 parent 27b8343 commit e9a60d0

File tree

9 files changed

+98
-84
lines changed

9 files changed

+98
-84
lines changed

‎.github/ISSUE_TEMPLATE/release.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ body:
3232
- label: Check the latest minor Kong Gateway release in [Kong releases](https://github.com/Kong/kong/releases).
3333
- 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.
3434
- 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)).
35+
- 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."
3536
- type: checkboxes
3637
id: release_branch
3738
attributes:

‎.github/workflows/_integration_tests.yaml

+12
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ on:
1313
# See https://github.com/Kong/kubernetes-testing-framework/issues/542
1414
default: "3.4"
1515
required: false
16+
kong-oss-effective-version:
17+
# specifies effective semver of Kong gateway OSS when tag is not a valid semver (like 'nightly').
18+
type: string
19+
default: ""
20+
required: false
1621
kong-enterprise-container-repo:
1722
type: string
1823
default: "kong/kong-gateway"
@@ -23,6 +28,11 @@ on:
2328
# See https://github.com/Kong/kubernetes-testing-framework/issues/542
2429
default: "3.4"
2530
required: false
31+
kong-enterprise-effective-version:
32+
# specifies effective semver of Kong gateway enterprise when tag is not a valid semver (like 'nightly').
33+
type: string
34+
default: ""
35+
required: false
2636

2737
jobs:
2838
integration-tests:
@@ -81,9 +91,11 @@ jobs:
8191
if [ "${{ matrix.enterprise }}" == "true" ]; then
8292
echo "TEST_KONG_IMAGE=${{ inputs.kong-enterprise-container-repo }}" >> $GITHUB_ENV
8393
echo "TEST_KONG_TAG=${{ inputs.kong-enterprise-container-tag }}" >> $GITHUB_ENV
94+
echo "TEST_KONG_EFFECTIVE_VERSION=${{ inputs.kong-enterprise-effective-version }}" >> $GITHUB_ENV
8495
else
8596
echo "TEST_KONG_IMAGE=${{ inputs.kong-container-repo }}" >> $GITHUB_ENV
8697
echo "TEST_KONG_TAG=${{ inputs.kong-container-tag }}" >> $GITHUB_ENV
98+
echo "TEST_KONG_EFFECTIVE_VERSION=${{ inputs.kong-oss-effective-version }}" >> $GITHUB_ENV
8799
fi
88100
89101
- name: checkout repository

‎.github/workflows/e2e_nightly.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,10 @@ jobs:
4545
with:
4646
kong-container-repo: kong/kong
4747
kong-container-tag: nightly
48+
kong-oss-effective-version: "3.4"
4849
kong-enterprise-container-repo: kong/kong-gateway-dev
4950
kong-enterprise-container-tag: nightly
51+
kong-enterprise-effective-version: "3.4"
5052

5153
test-reports:
5254
needs:

‎.github/workflows/test_nightly.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ on:
1818
env:
1919
kong-gateway-enterprise-registry: kong/kong-gateway-dev
2020
kong-gateway-enterprise-tag: latest
21+
kong-gateway-enterprise-effective-version: "3.4"
2122
kong-gateway-oss-registry: kong/kong
2223
kong-gateway-oss-tag: latest-ubuntu
24+
kong-gateway-oss-effective-version: "3.4"
2325

2426
jobs:
2527
post-comment-in-pr:
@@ -67,9 +69,11 @@ jobs:
6769
KONG_LICENSE_DATA: ${{ steps.license.outputs.license }}
6870
TEST_KONG_IMAGE: ${{ env.kong-gateway-enterprise-registry }}
6971
TEST_KONG_TAG: ${{ env.kong-gateway-enterprise-tag }}
72+
TEST_KONG_EFFECTIVE_VERSION: ${{ env.kong-gateway-enterprise-effective-version }}
7073
TEST_KONG_PULL_USERNAME: ${{ secrets.GHA_DOCKERHUB_PULL_USER }}
7174
TEST_KONG_PULL_PASSWORD: ${{ secrets.GHA_KONG_ORG_DOCKERHUB_PUBLIC_TOKEN }}
7275

76+
7377
- name: collect test coverage
7478
uses: actions/upload-artifact@v3
7579
with:
@@ -111,6 +115,7 @@ jobs:
111115
KONG_LICENSE_DATA: ${{ steps.license.outputs.license }}
112116
TEST_KONG_IMAGE: ${{ env.kong-gateway-enterprise-registry }}
113117
TEST_KONG_TAG: ${{ env.kong-gateway-enterprise-tag }}
118+
TEST_KONG_EFFECTIVE_VERSION: ${{ env.kong-gateway-enterprise-effective-version }}
114119
TEST_KONG_PULL_USERNAME: ${{ secrets.GHA_DOCKERHUB_PULL_USER }}
115120
TEST_KONG_PULL_PASSWORD: ${{ secrets.GHA_KONG_ORG_DOCKERHUB_PUBLIC_TOKEN }}
116121

@@ -148,6 +153,7 @@ jobs:
148153
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
149154
TEST_KONG_IMAGE: ${{ env.kong-gateway-oss-registry }}
150155
TEST_KONG_TAG: ${{ env.kong-gateway-oss-tag }}
156+
TEST_KONG_EFFECTIVE_VERSION: ${{ env.kong-gateway-oss-effective-version }}
151157

152158
- name: collect test coverage
153159
uses: actions/upload-artifact@v3
@@ -184,6 +190,7 @@ jobs:
184190
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
185191
TEST_KONG_IMAGE: ${{ env.kong-gateway-oss-registry }}
186192
TEST_KONG_TAG: ${{ env.kong-gateway-oss-tag }}
193+
TEST_KONG_EFFECTIVE_VERSION: ${{ env.kong-gateway-oss-effective-version }}
187194

188195
- name: collect test coverage
189196
uses: actions/upload-artifact@v3

‎go.mod

+21-21
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/kong/kubernetes-ingress-controller/v2
33
go 1.20
44

55
require (
6-
cloud.google.com/go/container v1.24.0
6+
cloud.google.com/go/container v1.25.0
77
github.com/Masterminds/sprig/v3 v3.2.3
88
github.com/avast/retry-go/v4 v4.5.0
99
github.com/blang/semver/v4 v4.0.0
@@ -12,12 +12,12 @@ require (
1212
github.com/go-logr/logr v1.2.4
1313
github.com/goccy/go-json v0.10.2
1414
github.com/google/go-cmp v0.5.9
15-
github.com/google/uuid v1.3.0
15+
github.com/google/uuid v1.3.1
1616
github.com/jpillora/backoff v1.0.0
1717
github.com/kong/deck v1.26.0
1818
github.com/kong/go-kong v0.46.0
1919
github.com/kong/kubernetes-telemetry v0.1.0
20-
github.com/kong/kubernetes-testing-framework v0.36.0
20+
github.com/kong/kubernetes-testing-framework v0.38.0
2121
github.com/lithammer/dedent v1.1.0
2222
github.com/miekg/dns v1.1.55
2323
github.com/mitchellh/mapstructure v1.5.0
@@ -32,18 +32,18 @@ require (
3232
github.com/spf13/cobra v1.7.0
3333
github.com/spf13/pflag v1.0.5
3434
github.com/stretchr/testify v1.8.4
35-
google.golang.org/api v0.136.0
36-
k8s.io/api v0.27.4
37-
k8s.io/apiextensions-apiserver v0.27.4
38-
k8s.io/apimachinery v0.27.4
39-
k8s.io/client-go v0.27.4
40-
k8s.io/component-base v0.27.4
35+
google.golang.org/api v0.138.0
36+
k8s.io/api v0.28.0
37+
k8s.io/apiextensions-apiserver v0.28.0
38+
k8s.io/apimachinery v0.28.0
39+
k8s.io/client-go v0.28.0
40+
k8s.io/component-base v0.28.0
4141
knative.dev/networking v0.0.0-20230718160410-75dcd54d9510
4242
knative.dev/pkg v0.0.0-20230718152110-aef227e72ead
4343
sigs.k8s.io/controller-runtime v0.15.1
4444
sigs.k8s.io/gateway-api v0.7.1
45-
sigs.k8s.io/kustomize/api v0.13.4
46-
sigs.k8s.io/kustomize/kyaml v0.14.2
45+
sigs.k8s.io/kustomize/api v0.14.0
46+
sigs.k8s.io/kustomize/kyaml v0.14.3
4747
sigs.k8s.io/yaml v1.3.0
4848
)
4949

@@ -62,8 +62,9 @@ require (
6262
github.com/go-playground/locales v0.14.1 // indirect
6363
github.com/go-playground/universal-translator v0.18.1 // indirect
6464
github.com/go-playground/validator/v10 v10.14.1 // indirect
65+
github.com/google/gnostic-models v0.6.8 // indirect
6566
github.com/google/go-containerregistry v0.13.0 // indirect
66-
github.com/google/s2a-go v0.1.4 // indirect
67+
github.com/google/s2a-go v0.1.5 // indirect
6768
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
6869
github.com/labstack/echo/v4 v4.11.1 // indirect
6970
github.com/labstack/gommon v0.4.0 // indirect
@@ -112,17 +113,16 @@ require (
112113
github.com/fatih/camelcase v1.0.0 // indirect
113114
github.com/fatih/color v1.15.0 // indirect
114115
github.com/fsnotify/fsnotify v1.6.0 // indirect
115-
github.com/fvbommel/sortorder v1.0.1 // indirect
116+
github.com/fvbommel/sortorder v1.1.0 // indirect
116117
github.com/go-errors/errors v1.4.2 // indirect
117118
github.com/go-ole/go-ole v1.2.6 // indirect
118119
github.com/go-openapi/jsonpointer v0.20.0 // indirect
119-
github.com/go-openapi/jsonreference v0.20.1 // indirect
120+
github.com/go-openapi/jsonreference v0.20.2 // indirect
120121
github.com/go-openapi/swag v0.22.4 // indirect
121122
github.com/gogo/protobuf v1.3.2 // indirect
122123
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
123124
github.com/golang/protobuf v1.5.3 // indirect
124125
github.com/google/btree v1.1.2 // indirect
125-
github.com/google/gnostic v0.6.9 // indirect
126126
github.com/google/go-github/v48 v48.2.0 // indirect
127127
github.com/google/go-querystring v1.1.0 // indirect
128128
github.com/google/gofuzz v1.2.0 // indirect
@@ -180,11 +180,11 @@ require (
180180
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
181181
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
182182
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
183-
github.com/xlab/treeprint v1.1.0 // indirect
183+
github.com/xlab/treeprint v1.2.0 // indirect
184184
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
185185
github.com/yusufpapurcu/wmi v1.2.3 // indirect
186186
go.opencensus.io v0.24.0 // indirect
187-
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
187+
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
188188
go.uber.org/multierr v1.11.0 // indirect
189189
golang.org/x/crypto v0.12.0 // indirect
190190
golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b
@@ -204,10 +204,10 @@ require (
204204
gopkg.in/inf.v0 v0.9.1 // indirect
205205
gopkg.in/yaml.v2 v2.4.0 // indirect
206206
gopkg.in/yaml.v3 v3.0.1 // indirect
207-
k8s.io/cli-runtime v0.27.4
208-
k8s.io/kube-openapi v0.0.0-20230515203736-54b630e78af5 // indirect
209-
k8s.io/kubectl v0.27.4
210-
k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect
207+
k8s.io/cli-runtime v0.28.0
208+
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
209+
k8s.io/kubectl v0.28.0
210+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
211211
knative.dev/serving v0.38.0
212212
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
213213
sigs.k8s.io/kind v0.20.0 // indirect

0 commit comments

Comments
 (0)