Skip to content
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

Jump to bottom

Populate supervisor FSS values for node plugin in guest cluster #2386

Merged
merged 1 commit into from
May 18, 2023
Merged

Populate supervisor FSS values for node plugin in guest cluster #2386

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
2 changes: 1 addition & 1 deletion manifests/guestcluster/1.25/pvcsi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 5 additions & 5 deletions 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 @@ -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.
Expand Down Expand Up @@ -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 {
Expand All @@ -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 {
Expand All @@ -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
}
Expand All @@ -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
}
Expand Down