Skip to content

add controller modify secret to rbd sc #4018

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

add controller modify secret to rbd sc #4018

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
12 changes: 12 additions & 0 deletions pkg/util/storageclasses.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,11 @@ func NewDefaultRbdStorageClass(
"csi.storage.k8s.io/node-stage-secret-name": nodeSecret,
"csi.storage.k8s.io/node-publish-secret-name": nodeSecret,
"csi.storage.k8s.io/controller-expand-secret-name": provisionerSecret,
"csi.storage.k8s.io/controller-modify-secret-name": provisionerSecret,
"csi.storage.k8s.io/provisioner-secret-namespace": namespace,
"csi.storage.k8s.io/node-stage-secret-namespace": namespace,
"csi.storage.k8s.io/controller-expand-secret-namespace": namespace,
"csi.storage.k8s.io/controller-modify-secret-namespace": namespace,
"csi.storage.k8s.io/node-publish-secret-namespace": namespace,
},
}
Expand Down Expand Up @@ -179,10 +181,12 @@ func NewDefaultVirtRbdStorageClass(
"csi.storage.k8s.io/node-stage-secret-name": nodeSecret,
"csi.storage.k8s.io/node-publish-secret-name": nodeSecret,
"csi.storage.k8s.io/controller-expand-secret-name": provisionerSecret,
"csi.storage.k8s.io/controller-modify-secret-name": provisionerSecret,
"csi.storage.k8s.io/provisioner-secret-namespace": namespace,
"csi.storage.k8s.io/node-stage-secret-namespace": namespace,
"csi.storage.k8s.io/controller-expand-secret-namespace": namespace,
"csi.storage.k8s.io/node-publish-secret-namespace": namespace,
"csi.storage.k8s.io/controller-modify-secret-namespace": namespace,
},
}

Expand Down Expand Up @@ -251,10 +255,12 @@ func NewDefaultEncryptedRbdStorageClass(
"csi.storage.k8s.io/node-stage-secret-name": nodeSecret,
"csi.storage.k8s.io/node-publish-secret-name": nodeSecret,
"csi.storage.k8s.io/controller-expand-secret-name": provisionerSecret,
"csi.storage.k8s.io/controller-modify-secret-name": provisionerSecret,
"csi.storage.k8s.io/provisioner-secret-namespace": namespace,
"csi.storage.k8s.io/node-stage-secret-namespace": namespace,
"csi.storage.k8s.io/controller-expand-secret-namespace": namespace,
"csi.storage.k8s.io/node-publish-secret-namespace": namespace,
"csi.storage.k8s.io/controller-modify-secret-namespace": namespace,
},
}

Expand Down Expand Up @@ -301,10 +307,12 @@ func NewDefaultNonResilientRbdStorageClass(
"csi.storage.k8s.io/node-stage-secret-name": nodeSecret,
"csi.storage.k8s.io/node-publish-secret-name": nodeSecret,
"csi.storage.k8s.io/controller-expand-secret-name": provisionerSecret,
"csi.storage.k8s.io/controller-modify-secret-name": provisionerSecret,
"csi.storage.k8s.io/provisioner-secret-namespace": namespace,
"csi.storage.k8s.io/node-stage-secret-namespace": namespace,
"csi.storage.k8s.io/controller-expand-secret-namespace": namespace,
"csi.storage.k8s.io/node-publish-secret-namespace": namespace,
"csi.storage.k8s.io/controller-modify-secret-namespace": namespace,
},
}
if storageId != "" {
Expand Down Expand Up @@ -481,6 +489,10 @@ func StorageClassFromExisting(
// Node Publish is only required for rbd.
params["csi.storage.k8s.io/node-publish-secret-name"] = nodeSecretName
params["csi.storage.k8s.io/node-publish-secret-namespace"] = operatorNamespace
// Controller modify secret is only required for rbd.
params["csi.storage.k8s.io/controller-modify-secret-name"] = provisionerSecretName
params["csi.storage.k8s.io/controller-modify-secret-namespace"] = operatorNamespace

case CephFSDriverName:
clientProfileName = consumerConfig.GetCephFsClientProfileName()
provisionerSecretName = consumerConfig.GetCsiCephFsProvisionerCephUserName()
Expand Down
Loading