test(e2e): squash helm tests (#11901)

Speed up CI

test/e2e/helm/kuma_helm_deploy_multi_apps.go was testing
1) HELM standalone deployment with CNI
2) Autoscaling of the CP (by checking minimum replicas)

1) Is tested in multiple places including
test/e2e/bootstrap/corefile_template.go
I just added 2) to existing test to save time

---------

Signed-off-by: Jakub Dyszkiewicz <[email protected]>

test/e2e/bootstrap/corefile_template.go

@@ -2,6 +2,7 @@ package bootstrap
 
 import (
 	"fmt"
+	"strconv"
 	"strings"
 
 	"github.com/gruntwork-io/terratest/modules/random"
@@ -35,6 +36,7 @@ data:
 	}
 
 	dnsConfigDir := "/tmp/kuma-dp-config/coredns"
+	minReplicas := 3
 	BeforeAll(func() {
 		k8sCluster = NewK8sCluster(NewTestingT(), Kuma1, Silent)
 
@@ -49,6 +51,8 @@ data:
 				WithHelmOpt("controlPlane.extraConfigMaps[0].name", configMapName),
 				WithHelmOpt("controlPlane.extraConfigMaps[0].mountPath", dnsConfigDir),
 				WithHelmOpt("controlPlane.extraConfigMaps[0].readonly", "false"),
+				WithHelmOpt("controlPlane.autoscaling.enabled", "true"),
+				WithHelmOpt("controlPlane.autoscaling.minReplicas", strconv.Itoa(minReplicas)),
 			)).
 			Install(MeshKubernetes("default")).
 			Install(NamespaceWithSidecarInjection(appNamespace)).
@@ -69,6 +73,10 @@ data:
 		Expect(k8sCluster.DismissCluster()).To(Succeed())
 	})
 
+	It("should deploy 3 CP replicas", func() {
+		Expect(k8sCluster.WaitApp(Config.KumaServiceName, Config.KumaNamespace, minReplicas)).To(Succeed())
+	})
+
 	It("should use Corefile template from control plane at data plane", func() {
 		dpPod, err := PodNameOfApp(k8sCluster, appName, appNamespace)
 		Expect(err).ToNot(HaveOccurred())

test/e2e/helm/e2e_suite_test.go

@@ -1,4 +1,4 @@
 package helm_test
 
 import (
 	"testing"
@@ -18,8 +18,14 @@
 	_ = Describe("Test Zone and Global universal mode with Helm chart", Label("job-0"), helm.ZoneAndGlobalInUniversalModeWithHelmChart, Ordered)
 	// Skipped as it fails with: error while running command: exit status 1; Error: INSTALLATION FAILED: rendered manifests contain a resource that already exists. Unable to continue with install: ServiceAccount "kuma-control-plane" in namespace "kuma-system" exists and cannot be imported into the current release: invalid ownership metadata; annotation validation error: key "meta.helm.sh/release-name" must equal "kuma-c0vo8o": current value is "kuma-8yy3uv"
 	// Likely something needs to be improved to be able to run this test
+<<<<<<< HEAD
 	_ = PDescribe("Test Global and Zone universal mode with Helm chart", Label("job-0"), helm.GlobalAndZoneInUniversalModeWithHelmChart, Ordered)
 	_ = Describe("Test App deployment with Helm chart", Label("job-2"), helm.AppDeploymentWithHelmChart)
 	_ = Describe("Test upgrading Standalone with Helm chart", Label("job-2"), helm.UpgradingWithHelmChartStandalone, Ordered)
 	_ = Describe("Test upgrading Multizone with Helm chart", Label("job-2"), helm.UpgradingWithHelmChartMultizone, Ordered)
+=======
+	_ = PDescribe("Global and Zone universal mode with Helm chart", Label("job-0"), helm.GlobalAndZoneInUniversalModeWithHelmChart, Ordered)
+	_ = Describe("Upgrade Standalone with Helm", Label("job-0"), helm.UpgradingWithHelmChartStandalone, Ordered)
+	_ = Describe("Upgrade Multizone with Helm", Label("job-2"), helm.UpgradingWithHelmChartMultizone, Ordered)
+>>>>>>> a649d8ebd (test(e2e): squash helm tests (#11901))
 )