Skip to content

Remove FSS csi-internal-generated-cluster-id #3406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −11
Open

Remove FSS csi-internal-generated-cluster-id #3406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions cmd/syncer/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion pkg/common/unittestcommon/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion pkg/csi/service/common/commonco/k8sorchestrator/k8sorchestrator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,6 @@ func getReleasedVanillaFSS() map[string]struct{} {
common.TopologyPreferentialDatastores: {},
common.MaxPVSCSITargetsPerVM: {},
common.MultiVCenterCSITopology: {},
common.CSIInternalGeneratedClusterID: {},
common.TopologyAwareFileVolume: {},
}
}
Expand Down
3 changes: 0 additions & 3 deletions pkg/csi/service/common/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions pkg/csi/service/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions pkg/syncer/metadatasyncer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down