tkg system namespace fix

Author: rajguptavm

tests/e2e/constants/env_constants.go

@@ -213,4 +213,5 @@ const (
 	EnvVmknic4Vsan                             = "VMKNIC_FOR_VSAN"
 	EnvAccessMode                              = "ACCESS_MODE"
 	EnvVpToCsi                                 = "VCPTOCSI"
+	EnvVsphereTKGSystemNamespace               = "VSPHERE_TKG_SYSTEM_NAMESPACE"
 )

tests/e2e/constants/kubernetes.go

@@ -99,7 +99,6 @@ const (
 	VsphereCloudProviderConfiguration         = "vsphere-cloud-provider.conf"
 	VsphereControllerManager                  = "vmware-system-tkg-controller-manager"
 	VSphereCSIConf                            = "csi-vsphere.conf"
-	VsphereTKGSystemNamespace                 = "svc-tkg-domain-c10"
 	WcpServiceName                            = "wcp"
 	VmcWcpHost                                = "10.2.224.24" //This is the LB IP of VMC WCP and its constant
 	DevopsTKG                                 = "test-cluster-e2e-script"

tests/e2e/gc_block_volume_expansion.go

@@ -1564,7 +1564,7 @@ var _ = ginkgo.Describe("[csi-guest] Volume Expansion Test", func() {
 				"exec",
 				pod.Name,
 				"--namespace=" + namespace,
-				"powershell.exe",
+				"-- powershell.exe",
 				"$out = New-Object byte[] 536870912; (New-Object Random).NextBytes($out); " +
 					"[System.IO.File]::WriteAllBytes('/mnt/volume1/testdata2.txt', $out)",
 			}

tests/e2e/volume_health_test.go

@@ -57,6 +57,7 @@ var _ = ginkgo.Describe("Volume health check", func() {
 		isVsanHealthServiceStopped bool
 		isSPSServiceStopped        bool
 		csiNamespace               string
+		vsphereTKGSystemNamespace  string
 	)
 
 	ginkgo.BeforeEach(func() {
@@ -70,6 +71,7 @@ var _ = ginkgo.Describe("Volume health check", func() {
 		csiNamespace = GetAndExpectStringEnvVar(envCSINamespace)
 		nodeList, err := fnodes.GetReadySchedulableNodes(ctx, f.ClientSet)
 		datastoreURL = GetAndExpectStringEnvVar(envSharedDatastoreURL)
+		vsphereTKGSystemNamespace = GetAndExpectStringEnvVar(EnvVsphereTKGSystemNamespace)
 		framework.ExpectNoError(err, "Unable to find ready and schedulable Node")
 		if guestCluster {
 			svcClient, svNamespace := getSvcClientAndNamespace()
@@ -2123,7 +2125,6 @@ var _ = ginkgo.Describe("Volume health check", func() {
 			gcClient, err = createKubernetesClientFromConfig(k8senv)
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		}
-
 		tkgReplicaDeployment, err := svcClient.AppsV1().Deployments(vsphereTKGSystemNamespace).Get(ctx,
 			vsphereControllerManager, metav1.GetOptions{})
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())