Merge "manila: make manifest configurable for cephfs"

manila/templates/bin/_ceph-keyring.sh.tpl

@@ -17,7 +17,7 @@ limitations under the License.
 set -ex
 export HOME=/tmp
 
-cat > /etc/ceph/ceph.client.manila.keyring <<EOF
-[client.manila]
+cat > /etc/ceph/ceph.client.${CEPHFS_AUTH_ID}.keyring <<EOF
+[client.${CEPHFS_AUTH_ID}]
     key = $(cat /tmp/client-keyring)
 EOF

manila/templates/deployment-share.yaml

@@ -84,6 +84,9 @@ spec:
         - name: ceph-keyring-placement
 {{ tuple $envAll "manila_share" | include "helm-toolkit.snippets.image" | indent 10 }}
 {{ dict "envAll" $envAll "application" "manila" "container" "ceph_keyring_placement" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
+          env:
+            - name: CEPHFS_AUTH_ID
+              value: {{ .Values.conf.manila.DEFAULT.cephfs_auth_id | quote }}
           command:
             - /tmp/ceph-keyring.sh
           volumeMounts:
@@ -210,11 +213,11 @@ spec:
           emptyDir: {}
         - name: ceph-etc
           configMap:
-            name: ceph-etc
+            name: {{ .Values.ceph_client.configmap }}
             defaultMode: 0444
         - name: ceph-keyring
           secret:
-            secretName: manila-keyring
+            secretName: {{ .Values.secrets.rbd | quote }}
 {{- end }}
 {{- dict "enabled" .Values.manifests.certificates "name" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }}
 {{- dict "enabled" (or .Values.manifests.certificates .Values.tls.identity) "name" .Values.secrets.tls.share.api.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }}

manila/values.yaml

@@ -314,6 +314,9 @@ bootstrap:
         container_format: bare
         private: false
 
+ceph_client:
+  configmap: ceph-etc
+
 dependencies:
   dynamic:
     common:
@@ -704,6 +707,7 @@ conf:
       api_paste_config: /etc/manila/api-paste.ini
       enabled_share_backends: generic
       enabled_share_protocols: NFS
+      cephfs_auth_id: manila
     keystone_authtoken:
       auth_type: password
       auth_version: v3
@@ -879,6 +883,7 @@ secrets:
   oslo_db:
     admin: manila-db-admin
     manila: manila-db-user
+  rbd: manila-keyring
   oslo_messaging:
     admin: manila-rabbitmq-admin
     manila: manila-rabbitmq-user

releasenotes/notes/manila-23590e37667d10a5.yaml

@@ -0,0 +1,8 @@
+---
+manila:
+  - |
+    This change enhances the flexibility of the Manila Chart by introducing
+    configurability for the CephFS backend. Previously, CephFS-related configuration values
+    were statically defined within the manifests, limiting deployment customization.
+    With this update, CephFS backend parameters can now be overridden via values.
+...