From 8b6a3c63095ec99faebce31c5d909982e28876f0 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] chore: update helm upgrade tests, after Kong bump to 3.9 DataPlanes are expected to be patched --- test/e2e/test_helm_install_upgrade.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/e2e/test_helm_install_upgrade.go b/test/e2e/test_helm_install_upgrade.go index 99cec50d..9cafc299 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: fmt.Sprintf("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" }