tkg win test 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/e2e_common.go

@@ -229,7 +229,7 @@ const (
 	vsphereCloudProviderConfiguration         = "vsphere-cloud-provider.conf"
 	vsphereControllerManager                  = "vmware-system-tkg-controller-manager"
 	vSphereCSIConf                            = "csi-vsphere.conf"
-	vsphereTKGSystemNamespace                 = "svc-tkg-domain-c10"
+	envVsphereTKGSystemNamespace              = "VSPHERE_TKG_SYSTEM_NAMESPACE"
 	waitTimeForCNSNodeVMAttachmentReconciler  = 30 * time.Second
 	wcpServiceName                            = "wcp"
 	vmcWcpHost                                = "10.2.224.24" //This is the LB IP of VMC WCP and its constant
@@ -349,6 +349,7 @@ const (
 	stretchedSvc          = "stretchedSvc"
 	devops                = "devops"
 	vc901                 = "vc901"
+	multiGc               = "multiGc"
 )
 
 // The following variables are required to know cluster type to run common e2e

tests/e2e/gc_block_resize_retain_policy.go

@@ -126,7 +126,7 @@ var _ = ginkgo.Describe("[csi-guest] Volume Expansion Tests with reclaimation po
 
 		// Replace second element with pod.Name.
 		if windowsEnv {
-			cmd = []string{"exec", "", "--namespace=" + namespace, "powershell.exe", "cat", "/mnt/volume1/fstype.txt"}
+			cmd = []string{"exec", "", "--namespace=" + namespace, "--", "powershell.exe", "cat", "/mnt/volume1/fstype.txt"}
 		} else {
 			cmd = []string{"exec", "", "--namespace=" + namespace, "--", "/bin/sh", "-c", "df -Tkm | grep /mnt/volume1"}
 		}
@@ -206,7 +206,8 @@ var _ = ginkgo.Describe("[csi-guest] Volume Expansion Tests with reclaimation po
 	// 18. Delete PVC created in step 6.
 	// 19. Delete PV leftover in GC.
 	// 20. Delete SC created in step 1.
-	ginkgo.It("PV with reclaim policy can be reused and resized with pod", ginkgo.Label(p0, block, tkg, vc70), func() {
+	ginkgo.It("PV with reclaim policy can be reused and resized with pod", ginkgo.Label(p0, block, tkg,
+		windows, vc70), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 		// Create a Pod to use this PVC, and verify volume has been attached.
@@ -412,7 +413,7 @@ var _ = ginkgo.Describe("[csi-guest] Volume Expansion Tests with reclaimation po
 	// 17. delete GC2.
 	// Steps 6 and 17 need to run manually before and after this suite.
 	ginkgo.It("PV with reclaim policy retain can be resized when used in a fresh GC", ginkgo.Label(p0,
-		block, tkg, vc70), func() {
+		block, tkg, windows, multiGc, vc70), func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 		newGcKubconfigPath := os.Getenv("NEW_GUEST_CLUSTER_KUBE_CONFIG")

tests/e2e/gc_block_volume_expansion.go

@@ -117,7 +117,7 @@ var _ = ginkgo.Describe("[csi-guest] Volume Expansion Test", func() {
 
 		// Replace second element with pod.Name.
 		if windowsEnv {
-			cmd = []string{"exec", "", "--namespace=" + namespace, "powershell.exe", "cat", "/mnt/volume1/fstype.txt"}
+			cmd = []string{"exec", "", "--namespace=" + namespace, "--", "powershell.exe", "cat", "/mnt/volume1/fstype.txt"}
 		} else {
 			cmd = []string{"exec", "", "--namespace=" + namespace, "--", "/bin/sh", "-c", "df -Tkm | grep /mnt/volume1"}
 		}
@@ -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/tkgs_ha_utils.go

@@ -268,7 +268,7 @@ func verifyOnlineVolumeExpansionOnGc(client clientset.Interface, namespace strin
 			"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)",
 		}
@@ -286,7 +286,7 @@ func verifyOnlineVolumeExpansionOnGc(client clientset.Interface, namespace strin
 			"exec",
 			pod.Name,
 			"--namespace=" + namespace,
-			"powershell.exe",
+			"-- powershell.exe",
 			"Copy-Item -Path '/mnt/volume1/testdata2.txt' " +
 				"-Destination '/mnt/volume1/testdata2_pod.txt'",
 		}
@@ -306,7 +306,7 @@ func verifyOnlineVolumeExpansionOnGc(client clientset.Interface, namespace strin
 			"exec",
 			pod.Name,
 			"--namespace=" + namespace,
-			"powershell.exe",
+			"-- powershell.exe",
 			"((Get-FileHash '/mnt/volume1/testdata2.txt' -Algorithm SHA256).Hash -eq " +
 				"(Get-FileHash '/mnt/volume1/testdata2_pod.txt' -Algorithm SHA256).Hash)",
 		}

tests/e2e/util.go

@@ -1067,6 +1067,7 @@ func bringDownCsiController(Client clientset.Interface, namespace ...string) {
 // bringDownTKGController helps to bring the TKG control manager pod down.
 // Its taks svc client as input.
 func bringDownTKGController(Client clientset.Interface) {
+	vsphereTKGSystemNamespace = GetAndExpectStringEnvVar(envVsphereTKGSystemNamespace)
 	updateDeploymentReplica(Client, 0, vsphereControllerManager, vsphereTKGSystemNamespace)
 	ginkgo.By("TKGControllManager replica is set to 0")
 }
@@ -1089,6 +1090,7 @@ func bringUpCsiController(Client clientset.Interface, csiReplicaCount int32, nam
 // bringUpTKGController helps to bring the TKG control manager pod up.
 // Its taks svc client as input.
 func bringUpTKGController(Client clientset.Interface, tkgReplica int32) {
+	vsphereTKGSystemNamespace = GetAndExpectStringEnvVar(envVsphereTKGSystemNamespace)
 	err := updateDeploymentReplicawithWait(Client, tkgReplica, vsphereControllerManager, vsphereTKGSystemNamespace)
 	gomega.Expect(err).NotTo(gomega.HaveOccurred())
 	ginkgo.By("TKGControllManager is up")

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())