From 25265bc9c29922857b29e227716bc652faa2f461 Mon Sep 17 00:00:00 2001 From: "Ali, Akil" Date: Wed, 13 Jul 2022 18:34:38 +0200 Subject: [PATCH] external: fix secrets naming The secrets are being created with "rook-" prefix, but used without it. Signed-off-by: Ali, Akil --- deploy/examples/import-external-cluster.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/deploy/examples/import-external-cluster.sh b/deploy/examples/import-external-cluster.sh index cce0a0b03..47581228c 100644 --- a/deploy/examples/import-external-cluster.sh +++ b/deploy/examples/import-external-cluster.sh @@ -197,11 +197,11 @@ parameters: dataPool: $RBD_METADATA_EC_POOL_NAME imageFormat: "2" imageFeatures: layering - csi.storage.k8s.io/provisioner-secret-name: $CSI_RBD_PROVISIONER_SECRET_NAME + csi.storage.k8s.io/provisioner-secret-name: "rook-$CSI_RBD_PROVISIONER_SECRET_NAME" csi.storage.k8s.io/provisioner-secret-namespace: $NAMESPACE - csi.storage.k8s.io/controller-expand-secret-name: $CSI_RBD_PROVISIONER_SECRET_NAME + csi.storage.k8s.io/controller-expand-secret-name: "rook-$CSI_RBD_PROVISIONER_SECRET_NAME" csi.storage.k8s.io/controller-expand-secret-namespace: $NAMESPACE - csi.storage.k8s.io/node-stage-secret-name: $CSI_RBD_NODE_SECRET_NAME + csi.storage.k8s.io/node-stage-secret-name: "rook-$CSI_RBD_NODE_SECRET_NAME" csi.storage.k8s.io/node-stage-secret-namespace: $NAMESPACE csi.storage.k8s.io/fstype: ext4 allowVolumeExpansion: true @@ -221,11 +221,11 @@ parameters: pool: $RBD_POOL_NAME imageFormat: "2" imageFeatures: layering - csi.storage.k8s.io/provisioner-secret-name: $CSI_RBD_PROVISIONER_SECRET_NAME + csi.storage.k8s.io/provisioner-secret-name: "rook-$CSI_RBD_PROVISIONER_SECRET_NAME" csi.storage.k8s.io/provisioner-secret-namespace: $NAMESPACE - csi.storage.k8s.io/controller-expand-secret-name: $CSI_RBD_PROVISIONER_SECRET_NAME + csi.storage.k8s.io/controller-expand-secret-name: "rook-$CSI_RBD_PROVISIONER_SECRET_NAME" csi.storage.k8s.io/controller-expand-secret-namespace: $NAMESPACE - csi.storage.k8s.io/node-stage-secret-name: $CSI_RBD_NODE_SECRET_NAME + csi.storage.k8s.io/node-stage-secret-name: "rook-$CSI_RBD_NODE_SECRET_NAME" csi.storage.k8s.io/node-stage-secret-namespace: $NAMESPACE csi.storage.k8s.io/fstype: ext4 allowVolumeExpansion: true @@ -244,11 +244,11 @@ parameters: clusterID: $CLUSTER_ID_CEPHFS fsName: $CEPHFS_FS_NAME pool: $CEPHFS_POOL_NAME - csi.storage.k8s.io/provisioner-secret-name: $CSI_CEPHFS_PROVISIONER_SECRET_NAME + csi.storage.k8s.io/provisioner-secret-name: "rook-$CSI_CEPHFS_PROVISIONER_SECRET_NAME" csi.storage.k8s.io/provisioner-secret-namespace: $NAMESPACE - csi.storage.k8s.io/controller-expand-secret-name: $CSI_CEPHFS_PROVISIONER_SECRET_NAME + csi.storage.k8s.io/controller-expand-secret-name: "rook-$CSI_CEPHFS_PROVISIONER_SECRET_NAME" csi.storage.k8s.io/controller-expand-secret-namespace: $NAMESPACE - csi.storage.k8s.io/node-stage-secret-name: $CSI_CEPHFS_NODE_SECRET_NAME + csi.storage.k8s.io/node-stage-secret-name: "rook-$CSI_CEPHFS_NODE_SECRET_NAME" csi.storage.k8s.io/node-stage-secret-namespace: $NAMESPACE allowVolumeExpansion: true reclaimPolicy: Delete