Populate supervisor FSS values for node plugin in guest cluster (kube…

…rnetes-sigs#2386)
rpanduranga · May 19, 2023 · ad61a87 · ad61a87
1 parent 1fee0ea
commit ad61a87
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/manifests/guestcluster/1.25/pvcsi.yaml b/manifests/guestcluster/1.25/pvcsi.yaml
@@ -504,7 +504,7 @@ data:
   "volume-health": "true"
   "online-volume-extend": "true"
   "file-volume": "true"
-  "csi-sv-feature-states-replication": "false"
+  "csi-sv-feature-states-replication": "false" # Do not enable for guest cluster, Refer PR#2386 for details
   "block-volume-snapshot": "false"
   "tkgs-ha": "true"
   "cnsmgr-suspend-create-volume": "true"

diff --git a/pkg/csi/service/common/commonco/k8sorchestrator/k8sorchestrator.go b/pkg/csi/service/common/commonco/k8sorchestrator/k8sorchestrator.go
@@ -528,7 +528,7 @@ func initFSS(ctx context.Context, k8sClient clientset.Interface,
 	// CR is not registered yet.
 	if controllerClusterFlavor == cnstypes.CnsClusterFlavorWorkload ||
 		(controllerClusterFlavor == cnstypes.CnsClusterFlavorGuest &&
-			!getSvFssCRAvailability() && serviceMode != "node") {
+			!getSvFssCRAvailability()) {
 		if k8sOrchestratorInstance.supervisorFSS.configMapName != "" &&
 			k8sOrchestratorInstance.supervisorFSS.configMapNamespace != "" {
 			// Retrieve configmap.
@@ -1013,7 +1013,7 @@ func (c *K8sOrchestrator) IsFSSEnabled(ctx context.Context, featureName string)
 			return internalFeatureState
 		}
 		c.internalFSS.featureStatesLock.RUnlock()
-		log.Debugf("Could not find the %s feature state in ConfigMap %s. "+
+		log.Infof("Could not find the %s feature state in ConfigMap %s. "+
 			"Setting the feature state to false", featureName, c.internalFSS.configMapName)
 		return false
 	} else if c.clusterFlavor == cnstypes.CnsClusterFlavorWorkload {
@@ -1030,7 +1030,7 @@ func (c *K8sOrchestrator) IsFSSEnabled(ctx context.Context, featureName string)
 			return supervisorFeatureState
 		}
 		c.supervisorFSS.featureStatesLock.RUnlock()
-		log.Debugf("Could not find the %s feature state in ConfigMap %s. "+
+		log.Infof("Could not find the %s feature state in ConfigMap %s. "+
 			"Setting the feature state to false", featureName, c.supervisorFSS.configMapName)
 		return false
 	} else if c.clusterFlavor == cnstypes.CnsClusterFlavorGuest {
@@ -1051,7 +1051,7 @@ func (c *K8sOrchestrator) IsFSSEnabled(ctx context.Context, featureName string)
 			}
 		} else {
 			c.internalFSS.featureStatesLock.RUnlock()
-			log.Debugf("Could not find the %s feature state in ConfigMap %s. Setting the feature state to false",
+			log.Infof("Could not find the %s feature state in ConfigMap %s. Setting the feature state to false",
 				featureName, c.internalFSS.configMapName)
 			return false
 		}
@@ -1072,7 +1072,7 @@ func (c *K8sOrchestrator) IsFSSEnabled(ctx context.Context, featureName string)
 			}
 		} else {
 			c.supervisorFSS.featureStatesLock.RUnlock()
-			log.Debugf("Could not find the %s feature state in ConfigMap %s. Setting the feature state to false",
+			log.Infof("Could not find the %s feature state in ConfigMap %s. Setting the feature state to false",
 				featureName, c.supervisorFSS.configMapName)
 			return false
 		}

diff --git a/tests/e2e/operationstorm.go b/tests/e2e/operationstorm.go
@@ -330,9 +330,11 @@ var _ = ginkgo.Describe("[csi-block-vanilla] [csi-block-vanilla-parallelized] Vo
 				pv.Spec.CSI.VolumeHandle, podArray[podCount].Spec.NodeName))
 			isDiskAttached, err := e2eVSphere.isVolumeAttachedToVM(client, volumeID, vmUUID)
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
-			gomega.Expect(isDiskAttached).To(gomega.BeTrue(),
-				fmt.Sprintf("Volume: %s is not attached to the node: %s",
-					pv.Spec.CSI.VolumeHandle, podArray[podCount].Spec.NodeName))
+			if !rwxAccessMode {
+				gomega.Expect(isDiskAttached).To(gomega.BeTrue(),
+					fmt.Sprintf("Volume: %s is not attached to the node: %s",
+						pv.Spec.CSI.VolumeHandle, podArray[podCount].Spec.NodeName))
+			}
 			podCount++
 		}
 

diff --git a/tests/e2e/vsphere_volume_fsgroup.go b/tests/e2e/vsphere_volume_fsgroup.go
@@ -93,14 +93,8 @@ var _ = ginkgo.Describe("[csi-block-vanilla] [csi-file-vanilla] [csi-guest] [csi
 		if vanillaCluster {
 			ginkgo.By("CNS_TEST: Running for vanilla k8s setup")
 			scParameters[scParamDatastoreURL] = datastoreURL
-			accessMode := v1.ReadWriteOnce
-
-			// Check if it is file volumes setups
-			if rwxAccessMode {
-				accessMode = v1.ReadWriteMany
-			}
 			storageclasspvc, pvclaim, err = createPVCAndStorageClass(client,
-				namespace, nil, scParameters, diskSize, nil, "", false, accessMode)
+				namespace, nil, scParameters, diskSize, nil, "", false, "")
 		} else if supervisorCluster {
 			ginkgo.By("CNS_TEST: Running for WCP setup")
 			profileID := e2eVSphere.GetSpbmPolicyID(storagePolicyName)
@@ -136,6 +130,7 @@ var _ = ginkgo.Describe("[csi-block-vanilla] [csi-file-vanilla] [csi-guest] [csi
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 			err = e2eVSphere.waitForCNSVolumeToBeDeleted(volHandle)
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
+
 		}()
 
 		// Create a Pod to use this PVC, and verify volume has been attached