helm: Update helm charts to use userID and Keys

Signed-off-by: Niraj Yadav <[email protected]>
ceph · Dec 9, 2024 · 091d65b · 091d65b
1 parent 396ca38
commit 091d65b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 16 deletions.
diff --git a/charts/ceph-csi-cephfs/README.md b/charts/ceph-csi-cephfs/README.md
@@ -232,8 +232,6 @@ charts and their default values.
 | `storageClass.mountOptions`                    | Specifies the mount options                                                                                                                          | `[]`                                               |
 | `secret.create`                                | Specifies whether the secret should be created                                                                                                       | `false`                                            |
 | `secret.name`                                  | Specifies the cephFS secret name                                                                                                                     | `csi-cephfs-secret`                                |
-| `secret.adminID`                               | Specifies the admin ID of the cephFS secret                                                                                                          | `<plaintext ID>`                                   |
-| `secret.adminKey`                              | Specifies the key that corresponds to the adminID                                                                                                    | `""`                                               |
 | `secret.userID`                                | Specifies the user ID of the cephFS secret. Optional, used for static provisioned PVC.                                                               | `""`                                               |
 | `secret.userKey`                               | Specifies the key that corresponds to the userID. Optional, used for static  provisioned PVC.                                                        | `<Ceph auth key corresponding to ID above>`        |
 | `selinuxMount`                                | Mount the host /etc/selinux inside pods to support selinux-enabled filesystems                                                                                                      | `true`                                            |

diff --git a/charts/ceph-csi-cephfs/templates/secret.yaml b/charts/ceph-csi-cephfs/templates/secret.yaml
@@ -14,12 +14,6 @@ metadata:
     heritage: {{ .Release.Service }}
     {{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }}
 stringData:
-  {{- if .Values.secret.userID }}
   userID: {{ .Values.secret.userID }}
-  {{- end }}
-  {{- if .Values.secret.userKey }}
   userKey: {{ .Values.secret.userKey }}
-  {{- end }}
-  adminID: {{ .Values.secret.adminID }}
-  adminKey: {{ .Values.secret.adminKey }}
 {{- end -}}
diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml
@@ -383,9 +383,6 @@ secret:
   # Key values correspond to a user name and its key, as defined in the
   # ceph cluster. User ID should have required access to the 'pool'
   # specified in the storage class
-  adminID: <plaintext ID>
-  adminKey: <Ceph auth key corresponding to ID above>
-  # User credentials are required for the static provisioned PVC.
   userID: ""
   userKey: ""
 

diff --git a/scripts/install-helm.sh b/scripts/install-helm.sh
@@ -172,7 +172,7 @@ install_cephcsi_helm_charts() {
     if [ "${DEPLOY_SECRET}" -eq 1 ]; then
         fetch_template_values
         RBD_SECRET_TEMPLATE_VALUES="--set secret.create=true --set secret.userID=admin --set secret.userKey=${ADMIN_KEY}"
-        CEPHFS_SECRET_TEMPLATE_VALUES="--set secret.create=true --set secret.adminID=admin --set secret.adminKey=${ADMIN_KEY}"
+        CEPHFS_SECRET_TEMPLATE_VALUES="--set secret.create=true --set secret.userID=admin --set secret.userKey=${ADMIN_KEY}"
     fi
     # enable read affinity
     if [ "${ENABLE_READ_AFFINITY}" -eq 1 ]; then
@@ -232,16 +232,14 @@ if ! helm_loc="$(type -p "helm")" || [[ -z ${helm_loc} ]]; then
     HELM="${TEMP}/${dist}-${arch}/helm"
 fi
 
-if [ "$#" -le 2 ]
-then
+if [ "$#" -le 2 ]; then
     ACTION=$1
     NAMESPACE=$2
     SKIP_PARSE="true"
 fi
 
 if [ ${#SKIP_PARSE} -eq 0 ]; then
-    while [ "$1" != "" ]
-    do
+    while [ "$1" != "" ]; do
         case $1 in
         up)
             shift