Remove FSS vdpp-on-stretched-supervisor (#3393)

* Remove FSS vdpp-on-stretched-supervisor

* Removed fss from 3 most recent yaml configs

* Fix bad merge

Author: johnchobroadcom

manifests/supervisorcluster/1.30/cns-csi.yaml

@@ -566,7 +566,6 @@ data:
   "list-volumes": "true"
   "cnsmgr-suspend-create-volume": "true"
   "storage-quota-m2": "true"
-  "vdpp-on-stretched-supervisor": "true"
   "cns-unregister-volume": "false"
   "workload-domain-isolation": "false"
   "WCP_VMService_BYOK": "true"

manifests/supervisorcluster/1.31/cns-csi.yaml

@@ -566,7 +566,6 @@ data:
   "list-volumes": "true"
   "cnsmgr-suspend-create-volume": "true"
   "storage-quota-m2": "true"
-  "vdpp-on-stretched-supervisor": "true"
   "cns-unregister-volume": "false"
   "workload-domain-isolation": "false"
   "WCP_VMService_BYOK": "true"

manifests/supervisorcluster/1.32/cns-csi.yaml

@@ -566,7 +566,6 @@ data:
   "list-volumes": "true"
   "cnsmgr-suspend-create-volume": "true"
   "storage-quota-m2": "true"
-  "vdpp-on-stretched-supervisor": "true"
   "cns-unregister-volume": "false"
   "workload-domain-isolation": "false"
   "WCP_VMService_BYOK": "true"

pkg/csi/service/common/constants.go

@@ -420,8 +420,6 @@ const (
 	PodVMOnStretchedSupervisor = "PodVM_On_Stretched_Supervisor_Supported"
 	// StorageQuotaM2 enables support for snapshot quota feature
 	StorageQuotaM2 = "storage-quota-m2"
-	// VdppOnStretchedSupervisor enables support for vDPp workloads on stretched SV clusters
-	VdppOnStretchedSupervisor = "vdpp-on-stretched-supervisor"
 	// CSIDetachOnSupervisor enables CSI to detach the disk from the podvm in a supervisor environment
 	CSIDetachOnSupervisor = "CSI_Detach_Supported"
 	// CnsUnregisterVolume enables the creation of CRD and controller for CnsUnregisterVolume API.

pkg/csi/service/wcp/controller.go

@@ -462,9 +462,7 @@ func (c *controller) createBlockVolume(ctx context.Context, req *csi.CreateVolum
 		isLinkedCloneRequest      bool
 		linkedCloneSupportEnabled bool
 	)
-	isVdppOnStretchedSVEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.VdppOnStretchedSupervisor)
 	linkedCloneSupportEnabled = commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.LinkedCloneSupport)
-
 	// Support case insensitive parameters.
 	for paramName := range req.Parameters {
 		param := strings.ToLower(paramName)
@@ -480,7 +478,7 @@ func (c *controller) createBlockVolume(ctx context.Context, req *csi.CreateVolum
 			storageTopologyType = req.Parameters[paramName]
 			val := strings.ToLower(storageTopologyType)
 			if val != "zonal" {
-				if isVdppOnStretchedSVEnabled && val == "hostlocal" {
+				if val == "hostlocal" {
 					log.Debugf("StorageTopologyType HostLocal is accepted.")
 				} else {
 					return nil, csifault.CSIInvalidArgumentFault, logger.LogNewErrorCodef(log, codes.InvalidArgument,
@@ -557,17 +555,12 @@ func (c *controller) createBlockVolume(ctx context.Context, req *csi.CreateVolum
 		// keys as topology requirement during volume provisioning.
 		hostnameLabelPresent, zoneLabelPresent = checkTopologyKeysFromAccessibilityReqs(topologyRequirement)
 		if zoneLabelPresent && hostnameLabelPresent {
-			if isVdppOnStretchedSVEnabled {
-				if IsMultipleClustersPerVsphereZoneFSSEnabled && c.topologyMgr.ZonesWithMultipleClustersExist(ctx) {
-					return nil, csifault.CSIInternalFault, logger.LogNewErrorCode(log, codes.Internal,
-						"Creating volume with both zone and hostname in topology requirement is not "+
-							"supported on deployment with multiple vSphere Clusters per zone")
-				}
-				log.Infof("Host Local volume provisioning with requirement: %+v", topologyRequirement)
-			} else {
-				return nil, csifault.CSIUnimplementedFault, logger.LogNewErrorCodef(log, codes.Unimplemented,
-					"support for topology requirement with both zone and hostname labels is not yet implemented.")
+			if IsMultipleClustersPerVsphereZoneFSSEnabled && c.topologyMgr.ZonesWithMultipleClustersExist(ctx) {
+				return nil, csifault.CSIInternalFault, logger.LogNewErrorCode(log, codes.Internal,
+					"Creating volume with both zone and hostname in topology requirement is not "+
+						"supported on deployment with multiple vSphere Clusters per zone")
 			}
+			log.Infof("Host Local volume provisioning with requirement: %+v", topologyRequirement)
 		} else if zoneLabelPresent {
 			if !isWorkloadDomainIsolationEnabled {
 				if storageTopologyType == "" {
@@ -671,7 +664,7 @@ func (c *controller) createBlockVolume(ctx context.Context, req *csi.CreateVolum
 					log.Infof("Active vSphere clusters: %v for the namespace: %q", vSphereClusterMorefs, pvcNamespace)
 				}
 			}
-		} else if hostnameLabelPresent && isVdppOnStretchedSVEnabled {
+		} else if hostnameLabelPresent {
 			log.Infof("Host Local volume provisioning with requirement: %+v", topologyRequirement)
 		} else {
 			// No topology labels present in the topologyRequirement
@@ -734,14 +727,12 @@ func (c *controller) createBlockVolume(ctx context.Context, req *csi.CreateVolum
 					"too many accessible nodes")
 			}
 
-			if isVdppOnStretchedSVEnabled {
-				selectedDatastoreURL, err = getDatastoreURLFromStoragePool(ctx, storagePool)
-				if err != nil {
-					return nil, csifault.CSIInternalFault, logger.LogNewErrorCodef(log, codes.Internal,
-						"error in specified StoragePool %s. Error: %+v", storagePool, err)
-				}
-				log.Infof("Will select datastore %s as per the provided storage pool %s", selectedDatastoreURL, storagePool)
+			selectedDatastoreURL, err = getDatastoreURLFromStoragePool(ctx, storagePool)
+			if err != nil {
+				return nil, csifault.CSIInternalFault, logger.LogNewErrorCodef(log, codes.Internal,
+					"error in specified StoragePool %s. Error: %+v", storagePool, err)
 			}
+			log.Infof("Will select datastore %s as per the provided storage pool %s", selectedDatastoreURL, storagePool)
 
 			hostMoid, err := getHostMOIDFromK8sCloudOperatorService(ctx, accessibleNodes[0])
 			if err != nil {
@@ -753,14 +744,12 @@ func (c *controller) createBlockVolume(ctx context.Context, req *csi.CreateVolum
 			log.Debugf("Setting the affineToHost value as %s", affineToHost)
 		}
 
-		if isVdppOnStretchedSVEnabled {
-			datastore, err := cnsvsphere.GetDatastoreInfoByURL(ctx, vc, clusterMoIds, selectedDatastoreURL)
-			if err != nil {
-				return nil, csifault.CSIInternalFault, logger.LogNewErrorCodef(log, codes.Internal,
-					"failed to find the datastore from the selected datastore URL %s. Error: %v", selectedDatastoreURL, err)
-			}
-			candidateDatastores = []*cnsvsphere.DatastoreInfo{datastore}
+		datastore, err := cnsvsphere.GetDatastoreInfoByURL(ctx, vc, clusterMoIds, selectedDatastoreURL)
+		if err != nil {
+			return nil, csifault.CSIInternalFault, logger.LogNewErrorCodef(log, codes.Internal,
+				"failed to find the datastore from the selected datastore URL %s. Error: %v", selectedDatastoreURL, err)
 		}
+		candidateDatastores = []*cnsvsphere.DatastoreInfo{datastore}
 	}
 
 	// Volume Size - Default is 10 GiB.
@@ -847,7 +836,6 @@ func (c *controller) createBlockVolume(ctx context.Context, req *csi.CreateVolum
 	createVolumeOpts := common.CreateBlockVolumeOptions{
 		FilterSuspendedDatastores:      filterSuspendedDatastores,
 		UseSupervisorId:                isTKGSHAEnabled,
-		IsVdppOnStretchedSvFssEnabled:  isVdppOnStretchedSVEnabled,
 		IsByokEnabled:                  isByokEnabled,
 		IsCSITransactionSupportEnabled: isCSITransactionSupportEnabled,
 		VolFromSnapshotOnTargetDs:      volFromSnapshotOnTargetDs,
@@ -933,18 +921,7 @@ func (c *controller) createBlockVolume(ctx context.Context, req *csi.CreateVolum
 		if hostnameLabelPresent {
 			// Configure the volumeTopology in the response so that the external
 			// provisioner will properly sets up the nodeAffinity for this volume.
-			if isVdppOnStretchedSVEnabled {
-				resp.Volume.AccessibleTopology = topologyRequirement.GetPreferred()
-			} else {
-				for _, hostName := range accessibleNodes {
-					volumeTopology := &csi.Topology{
-						Segments: map[string]string{
-							v1.LabelHostname: hostName,
-						},
-					}
-					resp.Volume.AccessibleTopology = append(resp.Volume.AccessibleTopology, volumeTopology)
-				}
-			}
+			resp.Volume.AccessibleTopology = topologyRequirement.GetPreferred()
 		} else if zoneLabelPresent {
 			if IsMultipleClustersPerVsphereZoneFSSEnabled && len(volumeInfo.Clusters) > 0 {
 				// Calculate Volume Accessible Topology from Clusters returned in CreateVolume Response

pkg/syncer/storagepool/service.go

@@ -63,10 +63,9 @@ func InitStoragePoolService(ctx context.Context,
 		}
 		clusterIDs = clusterComputeResourceMoIds
 		if len(clusterIDs) > 1 &&
-			(!commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.PodVMOnStretchedSupervisor) ||
-				!commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.VdppOnStretchedSupervisor)) {
-			log.Infof("`%s` and `%s` should be enabled for storage pool service on Stretched Supervisor. Exiting...",
-				common.PodVMOnStretchedSupervisor, common.VdppOnStretchedSupervisor)
+			(!commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.PodVMOnStretchedSupervisor)) {
+			log.Infof("`%s` should be enabled for storage pool service on Stretched Supervisor. Exiting...",
+				common.PodVMOnStretchedSupervisor)
 			return nil
 		}
 		if commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.MultipleClustersPerVsphereZone) {