mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-12-18 11:00:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

helm: optionally set userID and userKey in cephfs chart

Browse Source 
According to https://github.com/ceph/ceph-csi/issues/4467 the cephfs
static provisioner expect userID and userKey in the credential secret.
Add these values to the helm chart so that they are only included in the
templated yaml if the values are non-empty.

Signed-off-by: james-choncholas <jim@choncholas.com>
This commit is contained in:
james-choncholas 2024-08-25 18:17:45 -04:00 committed by mergify[bot]
parent 689498e66a
commit 3fbe7a8c77
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
charts/ceph-csi-cephfs/README.md
View File

@ -194,7 +194,9 @@ charts and their default values.
| `secret.create` | Specifies whether the secret should be created | `false` | | `secret.create` | Specifies whether the secret should be created | `false` |
| `secret.name` | Specifies the cephFS secret name | `csi-cephfs-secret` | | `secret.name` | Specifies the cephFS secret name | `csi-cephfs-secret` |
| `secret.adminID` | Specifies the admin ID of the cephFS secret | `<plaintext ID>` | | `secret.adminID` | Specifies the admin ID of the cephFS secret | `<plaintext ID>` |
| `secret.adminKey` | Specifies the key that corresponds to the adminID | `<Ceph auth key corresponding to ID above>` | | `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` | | `selinuxMount` | Mount the host /etc/selinux inside pods to support selinux-enabled filesystems | `true` |
| `CSIDriver.fsGroupPolicy` | Specifies the fsGroupPolicy for the CSI driver object | `File` | | `CSIDriver.fsGroupPolicy` | Specifies the fsGroupPolicy for the CSI driver object | `File` |
| `CSIDriver.seLinuxMount` | Specify for efficient SELinux volume relabeling | `true` | | `CSIDriver.seLinuxMount` | Specify for efficient SELinux volume relabeling | `true` |

6
charts/ceph-csi-cephfs/templates/secret.yaml
View File

@ -14,6 +14,12 @@ metadata:
heritage: {{ .Release.Service }} heritage: {{ .Release.Service }}
{{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }} {{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }}
stringData: stringData:
{{- if .Values.secret.userID }}
userID: {{ .Values.secret.userID }}
{{- end }}
{{- if .Values.secret.userKey }}
userKey: {{ .Values.secret.userKey }}
{{- end }}
adminID: {{ .Values.secret.adminID }} adminID: {{ .Values.secret.adminID }}
adminKey: {{ .Values.secret.adminKey }} adminKey: {{ .Values.secret.adminKey }}
{{- end -}} {{- end -}}

3
charts/ceph-csi-cephfs/values.yaml
View File

@ -331,6 +331,9 @@ secret:
# specified in the storage class # specified in the storage class
adminID: <plaintext ID> adminID: <plaintext ID>
adminKey: <Ceph auth key corresponding to ID above> adminKey: <Ceph auth key corresponding to ID above>
# User credentials are required for the static provisioned PVC.
userID: ""
userKey: ""
# This is a sample configmap that helps define a Ceph configuration as required # This is a sample configmap that helps define a Ceph configuration as required
# by the CSI plugins. # by the CSI plugins.