Skip to content

WIP: Fix volume provision issue with latest provisoner sidecar #3970

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
nikhilbarge wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −5
Open

WIP: Fix volume provision issue with latest provisoner sidecar #3970

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
17 changes: 12 additions & 5 deletions pkg/csi/service/wcpguest/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,17 +352,23 @@ func (c *controller) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequ
}

// Get supervisorStorageClass and accessMode
var supervisorStorageClass string
for param := range req.Parameters {
var (
supervisorStorageClass string
storageTopologyType string
)
for param, val := range req.Parameters {
paramName := strings.ToLower(param)
if paramName == common.AttributeSupervisorStorageClass {
supervisorStorageClass = req.Parameters[param]
supervisorStorageClass = val
}
if paramName == common.AttributePvcName {
pvcName = req.Parameters[param]
pvcName = val
}
if paramName == common.AttributePvcNamespace {
pvcNamespace = req.Parameters[param]
pvcNamespace = val
}
if paramName == common.AttributeStorageTopologyType {
storageTopologyType = strings.ToLower(val)
}
}

Expand Down Expand Up @@ -402,6 +408,7 @@ func (c *controller) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequ
labels[key] = c.tanzukubernetesClusterUID
if commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.TKGsHA) &&
req.AccessibilityRequirements != nil &&
storageTopologyType != "" &&
!isLinkedCloneRequest && // the cns-csi mutation webhook in supervisor will automatically set it.
(commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.WorkloadDomainIsolationFSS) ||
!isFileVolumeRequest) {
Expand Down