Skip to content

Add controller publish secrets to default RBD/CephFS StorageClasses #3374

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Add controller publish secrets to default RBD/CephFS StorageClasses #3374

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
77 changes: 42 additions & 35 deletions controllers/util/storageclasses.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ func NewDefaultRbdStorageClass(
storageId string,
isDefaultStorageClass bool,
) *storagev1.StorageClass {

sc := &storagev1.StorageClass{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
Expand All @@ -102,12 +101,14 @@ func NewDefaultRbdStorageClass(
"imageFeatures": "layering,deep-flatten,exclusive-lock,object-map,fast-diff",
"csi.storage.k8s.io/fstype": "ext4",
"imageFormat": "2",
"csi.storage.k8s.io/provisioner-secret-name": provisionerSecret,
"csi.storage.k8s.io/node-stage-secret-name": nodeSecret,
"csi.storage.k8s.io/controller-expand-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/provisioner-secret-name": provisionerSecret,
"csi.storage.k8s.io/node-stage-secret-name": nodeSecret,
"csi.storage.k8s.io/controller-expand-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-publish-secret-name": provisionerSecret,
"csi.storage.k8s.io/controller-publish-secret-namespace": namespace,
},
}

Expand All @@ -129,7 +130,6 @@ func NewDefaultVirtRbdStorageClass(
storageId string,
isDefaultVirtStorageClass bool,
) *storagev1.StorageClass {

sc := &storagev1.StorageClass{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
Expand All @@ -149,12 +149,14 @@ func NewDefaultVirtRbdStorageClass(
"imageFormat": "2",
"mounter": "rbd",
"mapOptions": "krbd:rxbounce",
"csi.storage.k8s.io/provisioner-secret-name": provisionerSecret,
"csi.storage.k8s.io/node-stage-secret-name": nodeSecret,
"csi.storage.k8s.io/controller-expand-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/provisioner-secret-name": provisionerSecret,
"csi.storage.k8s.io/node-stage-secret-name": nodeSecret,
"csi.storage.k8s.io/controller-expand-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-publish-secret-name": provisionerSecret,
"csi.storage.k8s.io/controller-publish-secret-namespace": namespace,
},
}

Expand All @@ -177,7 +179,6 @@ func NewDefaultEncryptedRbdStorageClass(
encryptionServiceName string,
KeyRotationAnnotationValue string,
) *storagev1.StorageClass {

sc := &storagev1.StorageClass{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
Expand All @@ -198,12 +199,14 @@ func NewDefaultEncryptedRbdStorageClass(
"imageFormat": "2",
"encrypted": "true",
"encryptionKMSID": encryptionServiceName,
"csi.storage.k8s.io/provisioner-secret-name": provisionerSecret,
"csi.storage.k8s.io/node-stage-secret-name": nodeSecret,
"csi.storage.k8s.io/controller-expand-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/provisioner-secret-name": provisionerSecret,
"csi.storage.k8s.io/node-stage-secret-name": nodeSecret,
"csi.storage.k8s.io/controller-expand-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-publish-secret-name": provisionerSecret,
"csi.storage.k8s.io/controller-publish-secret-namespace": namespace,
},
}
if KeyRotationAnnotationValue != "" {
Expand All @@ -220,7 +223,6 @@ func NewDefaultNonResilientRbdStorageClass(
namespace,
storageId string,
) *storagev1.StorageClass {

sc := &storagev1.StorageClass{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
Expand All @@ -239,12 +241,14 @@ func NewDefaultNonResilientRbdStorageClass(
"imageFeatures": "layering,deep-flatten,exclusive-lock,object-map,fast-diff",
"csi.storage.k8s.io/fstype": "ext4",
"imageFormat": "2",
"csi.storage.k8s.io/provisioner-secret-name": provisionerSecret,
"csi.storage.k8s.io/node-stage-secret-name": nodeSecret,
"csi.storage.k8s.io/controller-expand-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/provisioner-secret-name": provisionerSecret,
"csi.storage.k8s.io/node-stage-secret-name": nodeSecret,
"csi.storage.k8s.io/controller-expand-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-publish-secret-name": provisionerSecret,
"csi.storage.k8s.io/controller-publish-secret-namespace": namespace,
},
}
if storageId != "" {
Expand All @@ -261,7 +265,6 @@ func NewDefaultCephFsStorageClass(
namespace,
storageId string,
) *storagev1.StorageClass {

sc := &storagev1.StorageClass{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
Expand All @@ -275,12 +278,14 @@ func NewDefaultCephFsStorageClass(
Parameters: map[string]string{
"clusterID": clusterID,
"fsName": fsName,
"csi.storage.k8s.io/provisioner-secret-name": provisionerSecret,
"csi.storage.k8s.io/node-stage-secret-name": nodeSecret,
"csi.storage.k8s.io/controller-expand-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/provisioner-secret-name": provisionerSecret,
"csi.storage.k8s.io/node-stage-secret-name": nodeSecret,
"csi.storage.k8s.io/controller-expand-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-publish-secret-name": provisionerSecret,
"csi.storage.k8s.io/controller-publish-secret-namespace": namespace,
},
}

Expand Down Expand Up @@ -399,6 +404,8 @@ func StorageClassFromExisting(
params["csi.storage.k8s.io/node-stage-secret-namespace"] = operatorNamespace
params["csi.storage.k8s.io/controller-expand-secret-name"] = provisionerSecretName
params["csi.storage.k8s.io/controller-expand-secret-namespace"] = operatorNamespace
params["csi.storage.k8s.io/controller-publish-secret-name"] = provisionerSecretName
params["csi.storage.k8s.io/controller-publish-secret-namespace"] = operatorNamespace
AddLabel(storageClass, storageIdLabelKey, storageId)
return storageClass, nil
}
77 changes: 42 additions & 35 deletions metrics/vendor/github.com/red-hat-storage/ocs-operator/v4/controllers/util/storageclasses.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading