Merge branch 'main' into lint-add-actionlint

Kong · Dec 24, 2024 · 5566505 · 5566505
2 parents 2584029 + dd397cf
commit 5566505
Show file tree

Hide file tree

Showing 16 changed files with 21 additions and 21 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.

diff --git 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 {