feat(bootstrap): use the kubernetes.Cluster for Corefile template sce…

…nario Signed-off-by: Jay Chen <[email protected]>
kumahq · Dec 22, 2023 · 70e7b3f · 70e7b3f
1 parent 84070af
commit 70e7b3f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 15 deletions.
diff --git a/test/e2e_env/kubernetes/bootstrap/corefile_template.go b/test/e2e_env/kubernetes/bootstrap/corefile_template.go
@@ -2,12 +2,11 @@ package bootstrap
 
 import (
 	"fmt"
-	"strings"
-	"time"
-
 	"github.com/gruntwork-io/terratest/modules/random"
+	"github.com/kumahq/kuma/test/framework/envs/kubernetes"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	"strings"
 
 	"github.com/kumahq/kuma/pkg/config/core"
 	k8s_util "github.com/kumahq/kuma/pkg/plugins/runtime/k8s/util"
@@ -16,7 +15,6 @@ import (
 )
 
 func CorefileTemplate() {
-	var zoneCluster Cluster
 	appNamespace := "dns-app"
 	appName := "demo-dp-app"
 	expectedTestText := "# this dummy corefile template is loaded from control plane"
@@ -37,12 +35,7 @@ data:
 
 	dnsConfigDir := "/tmp/kuma-dp-config/coredns"
 	BeforeAll(func() {
-		zoneCluster = NewK8sCluster(NewTestingT(), Kuma2, Silent).
-			WithTimeout(6 * time.Second).
-			WithRetries(60)
-
 		Expect(NewClusterSetup().
-			Install(Namespace(Config.KumaNamespace)).
 			Install(YamlK8s(configMap(Config.KumaNamespace))).
 			Install(Kuma(core.Zone,
 				WithInstallationMode(HelmInstallationMode),
@@ -62,20 +55,20 @@ data:
 					"kuma.io/sidecar-env-vars": fmt.Sprintf("KUMA_DNS_CONFIG_DIR=%s", dnsConfigDir),
 				}),
 			)).
-			Setup(zoneCluster),
+			Setup(kubernetes.Cluster),
 		).To(Succeed())
 	})
 
 	E2EAfterAll(func() {
-		Expect(zoneCluster.DeleteKuma()).To(Succeed())
-		Expect(zoneCluster.DismissCluster()).To(Succeed())
+		Expect(kubernetes.Cluster.DeleteKuma()).To(Succeed())
+		Expect(kubernetes.Cluster.DismissCluster()).To(Succeed())
 	})
 
 	It("should use Corefile template from control plane at data plane", func() {
-		dpPod, err := PodNameOfApp(zoneCluster, appName, appNamespace)
+		dpPod, err := PodNameOfApp(kubernetes.Cluster, appName, appNamespace)
 		Expect(err).ToNot(HaveOccurred())
 
-		stdout, stderr, err := zoneCluster.Exec(
+		stdout, stderr, err := kubernetes.Cluster.Exec(
 			appNamespace, dpPod, k8s_util.KumaSidecarContainerName, "cat", dnsConfigDir+"/Corefile")
 		Expect(err).ToNot(HaveOccurred())
 		Expect(stderr).To(BeEmpty())

diff --git a/test/e2e_env/kubernetes/kubernetes_suite_test.go b/test/e2e_env/kubernetes/kubernetes_suite_test.go
@@ -1,6 +1,7 @@
 package kubernetes_test
 
 import (
+	"github.com/kumahq/kuma/test/e2e_env/kubernetes/externalservices"
 	"testing"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -12,7 +13,6 @@ import (
 	"github.com/kumahq/kuma/test/e2e_env/kubernetes/container_patch"
 	"github.com/kumahq/kuma/test/e2e_env/kubernetes/defaults"
 	"github.com/kumahq/kuma/test/e2e_env/kubernetes/externalname-services"
-	"github.com/kumahq/kuma/test/e2e_env/kubernetes/externalservices"
 	"github.com/kumahq/kuma/test/e2e_env/kubernetes/gateway"
 	"github.com/kumahq/kuma/test/e2e_env/kubernetes/graceful"
 	"github.com/kumahq/kuma/test/e2e_env/kubernetes/healthcheck"