From ac61cd1b9ce313ccf5da45cfba55fd67daf155dc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2024 15:07:18 +0000 Subject: [PATCH 1/2] chore(deps): update kong/kong-gateway docker tag to v3.9 --- config/samples/dataplane-bluegreen-rollout.yaml | 2 +- config/samples/dataplane-horizontal-autoscaling.yaml | 2 +- config/samples/dataplane-konnect-extension.yaml | 2 +- config/samples/dataplane-konnect.yaml | 2 +- config/samples/dataplane-pdb.yaml | 2 +- config/samples/dataplane-sidecar.yaml | 2 +- config/samples/dataplane-with-custom-ports.yaml | 2 +- config/samples/dataplane.yaml | 2 +- config/samples/gateway-httproute-allowedroutes.yaml | 2 +- config/samples/gateway-httproute.yaml | 2 +- config/samples/gateway-kongplugininstallation-httproute.yaml | 2 +- .../gateway-with-disabled-controlplane-admission-webhook.yaml | 2 +- config/samples/gateway-with-gatewayconfiguration.yaml | 2 +- config/samples/gatewayconfiguration.yaml | 2 +- pkg/consts/dataplane.go | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/config/samples/dataplane-bluegreen-rollout.yaml b/config/samples/dataplane-bluegreen-rollout.yaml index 1169ce4f1..33a4b1538 100644 --- a/config/samples/dataplane-bluegreen-rollout.yaml +++ b/config/samples/dataplane-bluegreen-rollout.yaml @@ -14,7 +14,7 @@ spec: containers: - name: proxy # renovate: datasource=docker versioning=docker - image: kong/kong-gateway:3.8 + image: kong/kong-gateway:3.9 env: - name: KONG_LOG_LEVEL value: debug diff --git a/config/samples/dataplane-horizontal-autoscaling.yaml b/config/samples/dataplane-horizontal-autoscaling.yaml index 715799737..2764e0bdf 100644 --- a/config/samples/dataplane-horizontal-autoscaling.yaml +++ b/config/samples/dataplane-horizontal-autoscaling.yaml @@ -42,7 +42,7 @@ spec: containers: - name: proxy # renovate: datasource=docker versioning=docker - image: kong/kong-gateway:3.8 + image: kong/kong-gateway:3.9 env: - name: KONG_LOG_LEVEL value: debug diff --git a/config/samples/dataplane-konnect-extension.yaml b/config/samples/dataplane-konnect-extension.yaml index e798bd393..f42c1e8ef 100644 --- a/config/samples/dataplane-konnect-extension.yaml +++ b/config/samples/dataplane-konnect-extension.yaml @@ -52,7 +52,7 @@ spec: containers: - name: proxy # renovate: datasource=docker versioning=docker - image: kong/kong-gateway:3.8 + image: kong/kong-gateway:3.9 readinessProbe: initialDelaySeconds: 1 periodSeconds: 1 diff --git a/config/samples/dataplane-konnect.yaml b/config/samples/dataplane-konnect.yaml index 99c0b34b7..979e312ef 100644 --- a/config/samples/dataplane-konnect.yaml +++ b/config/samples/dataplane-konnect.yaml @@ -35,7 +35,7 @@ spec: containers: - name: proxy # renovate: datasource=docker versioning=docker - image: kong/kong-gateway:3.8 + image: kong/kong-gateway:3.9 env: - name: KONG_ROLE value: data_plane diff --git a/config/samples/dataplane-pdb.yaml b/config/samples/dataplane-pdb.yaml index ca35bc4ae..93fce066d 100644 --- a/config/samples/dataplane-pdb.yaml +++ b/config/samples/dataplane-pdb.yaml @@ -14,7 +14,7 @@ spec: containers: - name: proxy # renovate: datasource=docker versioning=docker - image: kong/kong-gateway:3.8 + image: kong/kong-gateway:3.9 env: - name: KONG_LOG_LEVEL value: debug diff --git a/config/samples/dataplane-sidecar.yaml b/config/samples/dataplane-sidecar.yaml index 89076c5bd..53c39b6fc 100644 --- a/config/samples/dataplane-sidecar.yaml +++ b/config/samples/dataplane-sidecar.yaml @@ -46,7 +46,7 @@ spec: periodSeconds: 1 - name: proxy # renovate: datasource=docker versioning=docker - image: kong/kong-gateway:3.8 + image: kong/kong-gateway:3.9 volumeMounts: - name: proxy-logs mountPath: /etc/kong/log/ diff --git a/config/samples/dataplane-with-custom-ports.yaml b/config/samples/dataplane-with-custom-ports.yaml index d6e23a9ff..4a813d645 100644 --- a/config/samples/dataplane-with-custom-ports.yaml +++ b/config/samples/dataplane-with-custom-ports.yaml @@ -14,7 +14,7 @@ spec: containers: - name: proxy # renovate: datasource=docker versioning=docker - image: kong/kong-gateway:3.8 + image: kong/kong-gateway:3.9 env: - name: KONG_LOG_LEVEL value: debug diff --git a/config/samples/dataplane.yaml b/config/samples/dataplane.yaml index 4b4871295..4705e7ca6 100644 --- a/config/samples/dataplane.yaml +++ b/config/samples/dataplane.yaml @@ -14,7 +14,7 @@ spec: containers: - name: proxy # renovate: datasource=docker versioning=docker - image: kong/kong-gateway:3.8 + image: kong/kong-gateway:3.9 env: - name: KONG_LOG_LEVEL value: debug diff --git a/config/samples/gateway-httproute-allowedroutes.yaml b/config/samples/gateway-httproute-allowedroutes.yaml index ad074938c..966effd32 100644 --- a/config/samples/gateway-httproute-allowedroutes.yaml +++ b/config/samples/gateway-httproute-allowedroutes.yaml @@ -71,7 +71,7 @@ spec: containers: - name: proxy # renovate: datasource=docker versioning=docker - image: kong/kong-gateway:3.8 + image: kong/kong-gateway:3.9 readinessProbe: initialDelaySeconds: 1 periodSeconds: 1 diff --git a/config/samples/gateway-httproute.yaml b/config/samples/gateway-httproute.yaml index a9bee7c18..978a3ede9 100644 --- a/config/samples/gateway-httproute.yaml +++ b/config/samples/gateway-httproute.yaml @@ -133,7 +133,7 @@ spec: containers: - name: proxy # renovate: datasource=docker versioning=docker - image: kong/kong-gateway:3.8 + image: kong/kong-gateway:3.9 readinessProbe: initialDelaySeconds: 1 periodSeconds: 1 diff --git a/config/samples/gateway-kongplugininstallation-httproute.yaml b/config/samples/gateway-kongplugininstallation-httproute.yaml index 68a6fd390..8b6d61f0a 100644 --- a/config/samples/gateway-kongplugininstallation-httproute.yaml +++ b/config/samples/gateway-kongplugininstallation-httproute.yaml @@ -59,7 +59,7 @@ spec: containers: - name: proxy # renovate: datasource=docker versioning=docker - image: kong/kong-gateway:3.8 + image: kong/kong-gateway:3.9 readinessProbe: initialDelaySeconds: 1 periodSeconds: 1 diff --git a/config/samples/gateway-with-disabled-controlplane-admission-webhook.yaml b/config/samples/gateway-with-disabled-controlplane-admission-webhook.yaml index ab8cdca6e..7adc4915e 100644 --- a/config/samples/gateway-with-disabled-controlplane-admission-webhook.yaml +++ b/config/samples/gateway-with-disabled-controlplane-admission-webhook.yaml @@ -67,7 +67,7 @@ spec: containers: - name: proxy # renovate: datasource=docker versioning=docker - image: kong/kong-gateway:3.8 + image: kong/kong-gateway:3.9 readinessProbe: initialDelaySeconds: 1 periodSeconds: 1 diff --git a/config/samples/gateway-with-gatewayconfiguration.yaml b/config/samples/gateway-with-gatewayconfiguration.yaml index 71a268906..4c624a59c 100644 --- a/config/samples/gateway-with-gatewayconfiguration.yaml +++ b/config/samples/gateway-with-gatewayconfiguration.yaml @@ -17,7 +17,7 @@ spec: containers: - name: proxy # renovate: datasource=docker versioning=docker - image: kong/kong-gateway:3.8 + image: kong/kong-gateway:3.9 readinessProbe: initialDelaySeconds: 1 periodSeconds: 1 diff --git a/config/samples/gatewayconfiguration.yaml b/config/samples/gatewayconfiguration.yaml index 804c43c79..458c0a140 100644 --- a/config/samples/gatewayconfiguration.yaml +++ b/config/samples/gatewayconfiguration.yaml @@ -17,7 +17,7 @@ spec: containers: - name: proxy # renovate: datasource=docker versioning=docker - image: kong/kong-gateway:3.8 + image: kong/kong-gateway:3.9 readinessProbe: initialDelaySeconds: 1 periodSeconds: 1 diff --git a/pkg/consts/dataplane.go b/pkg/consts/dataplane.go index 0e6e1bf77..2867f07ce 100644 --- a/pkg/consts/dataplane.go +++ b/pkg/consts/dataplane.go @@ -87,7 +87,7 @@ const ( // DefaultDataPlaneTag is the base container image tag that can be used // by default for a DataPlane resource if all other attempts to dynamically // decide an image tag fail. - DefaultDataPlaneTag = "3.8" // renovate: datasource=docker depName=kong/kong-gateway + DefaultDataPlaneTag = "3.9" // renovate: datasource=docker depName=kong/kong-gateway // DefaultDataPlaneImage is the default container image that can be used if // all other attempts to dynamically decide the default image fail. From 5aaadec7170b4cd225889108f99c846e79a945bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20Ma=C5=82ek?= Date: Mon, 23 Dec 2024 17:30:56 +0100 Subject: [PATCH 2/2] chore: update helm upgrade tests, after Kong bump to 3.9 DataPlanes are expected to be patched --- test/e2e/test_helm_install_upgrade.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/e2e/test_helm_install_upgrade.go b/test/e2e/test_helm_install_upgrade.go index 99cec50df..67cfab9d3 100644 --- a/test/e2e/test_helm_install_upgrade.go +++ b/test/e2e/test_helm_install_upgrade.go @@ -120,10 +120,10 @@ func TestHelmUpgrade(t *testing.T) { }, }, { - Name: fmt.Sprintf("DataPlane deployment is patched after operator upgrade (due to change in default Kong image version to %q)", helpers.GetDefaultDataPlaneImage()), + Name: "DataPlane deployment is patched after operator upgrade (due to change in default Kong image version to kong:3.8)", Func: func(c *assert.CollectT, cl *testutils.K8sClients) { gatewayDataPlaneDeploymentIsPatched("gw-upgrade-onebeforelatestminor-latestminor=true")(ctx, c, cl.MgrClient) - gatewayDataPlaneDeploymentHasImageSetTo("gw-upgrade-onebeforelatestminor-latestminor=true", helpers.GetDefaultDataPlaneImage())(ctx, c, cl.MgrClient) + gatewayDataPlaneDeploymentHasImageSetTo("gw-upgrade-onebeforelatestminor-latestminor=true", "kong:3.8")(ctx, c, cl.MgrClient) }, }, { @@ -194,7 +194,7 @@ func TestHelmUpgrade(t *testing.T) { { Name: "DataPlane deployment is not patched after operator upgrade", Func: func(c *assert.CollectT, cl *testutils.K8sClients) { - gatewayDataPlaneDeploymentIsNotPatched("gw-upgrade-latestminor-current=true")(ctx, c, cl.MgrClient) + gatewayDataPlaneDeploymentIsPatched("gw-upgrade-latestminor-current=true")(ctx, c, cl.MgrClient) }, }, { @@ -265,7 +265,7 @@ func TestHelmUpgrade(t *testing.T) { { Name: "DataPlane deployment is not patched after operator upgrade", Func: func(c *assert.CollectT, cl *testutils.K8sClients) { - gatewayDataPlaneDeploymentIsNotPatched("gw-upgrade-nightly-to-current=true")(ctx, c, cl.MgrClient) + gatewayDataPlaneDeploymentIsPatched("gw-upgrade-nightly-to-current=true")(ctx, c, cl.MgrClient) }, }, { @@ -293,7 +293,7 @@ func TestHelmUpgrade(t *testing.T) { for _, tc := range testCases { t.Run(tc.name, func(t *testing.T) { // Repository is different for OSS and Enterprise images and it should be set accordingly. - var kgoImageRepository = "docker.io/kong/gateway-operator-oss" + kgoImageRepository := "docker.io/kong/gateway-operator-oss" if helpers.GetDefaultDataPlaneBaseImage() == consts.DefaultDataPlaneBaseEnterpriseImage { kgoImageRepository = "docker.io/kong/gateway-operator" } @@ -518,7 +518,7 @@ func gatewayDataPlaneDeploymentHasImageSetTo( }) } -func gatewayDataPlaneDeploymentIsNotPatched( +func gatewayDataPlaneDeploymentIsNotPatched( //nolint:unused gatewayLabelSelector string, ) func(context.Context, *assert.CollectT, client.Client) { return gatewayDataPlaneDeploymentCheck(gatewayLabelSelector, func(d *appsv1.Deployment) error {