Remove FSS csi-internal-generated-cluster-id

Author: johnchobroadcom

cmd/syncer/main.go

@@ -275,8 +275,7 @@ func initSyncerComponents(ctx context.Context, clusterFlavor cnstypes.CnsCluster
 		}
 		var configInfo *config.ConfigurationInfo
 		var err error
-		if clusterFlavor == cnstypes.CnsClusterFlavorVanilla &&
-			commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.CSIInternalGeneratedClusterID) {
+		if clusterFlavor == cnstypes.CnsClusterFlavorVanilla {
 			configInfo, err = syncer.SyncerInitConfigInfo(ctx)
 			if err != nil {
 				log.Errorf("failed to initialize the configInfo. Err: %+v", err)

pkg/common/unittestcommon/utils.go

@@ -65,7 +65,6 @@ func GetFakeContainerOrchestratorInterface(orchestratorType int) (commonco.COCom
 				"block-volume-snapshot":             "true",
 				"tkgs-ha":                           "true",
 				"list-volumes":                      "true",
-				"csi-internal-generated-cluster-id": "true",
 				"online-volume-extend":              "true",
 				"csi-windows-support":               "true",
 				"use-csinode-id":                    "true",

pkg/csi/service/common/commonco/k8sorchestrator/k8sorchestrator.go

@@ -366,7 +366,6 @@ func getReleasedVanillaFSS() map[string]struct{} {
 		common.TopologyPreferentialDatastores: {},
 		common.MaxPVSCSITargetsPerVM:          {},
 		common.MultiVCenterCSITopology:        {},
-		common.CSIInternalGeneratedClusterID:  {},
 		common.TopologyAwareFileVolume:        {},
 	}
 }

pkg/csi/service/common/constants.go

@@ -422,9 +422,6 @@ const (
 	MaxPVSCSITargetsPerVM = "max-pvscsi-targets-per-vm"
 	// MultiVCenterCSITopology is the feature gate for enabling multi vCenter topology support for vSphere CSI driver.
 	MultiVCenterCSITopology = "multi-vcenter-csi-topology"
-	// CSIInternalGeneratedClusterID enables support to generate unique cluster
-	// ID internally if user doesn't provide it in vSphere config secret.
-	CSIInternalGeneratedClusterID = "csi-internal-generated-cluster-id"
 	// TopologyAwareFileVolume enables provisioning of file volumes in a topology enabled environment
 	TopologyAwareFileVolume = "topology-aware-file-volume"
 	// PodVMOnStretchedSupervisor is the WCP FSS which determines if PodVM

pkg/csi/service/driver.go

@@ -147,8 +147,7 @@ func (driver *vsphereCSIDriver) BeforeServe(ctx context.Context) error {
 		return err
 	}
 
-	if clusterFlavor == cnstypes.CnsClusterFlavorVanilla &&
-		commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.CSIInternalGeneratedClusterID) {
+	if clusterFlavor == cnstypes.CnsClusterFlavorVanilla {
 		CSINamespace := common.GetCSINamespace()
 		if cfg.Global.ClusterID == "" {
 			var clusterID string

pkg/syncer/metadatasyncer.go

@@ -2057,8 +2057,7 @@ func ReloadConfiguration(metadataSyncer *metadataSyncInformer, reconnectToVCFrom
 	log.Info("Reloading Configuration")
 	var cfg *cnsconfig.Config
 	var err error
-	if metadataSyncer.clusterFlavor == cnstypes.CnsClusterFlavorVanilla &&
-		commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.CSIInternalGeneratedClusterID) {
+	if metadataSyncer.clusterFlavor == cnstypes.CnsClusterFlavorVanilla {
 		cfg, err = getConfig(ctx)
 	} else {
 		cfg, err = cnsconfig.GetConfig(ctx)