Skip to content

Commit

Permalink
helm: optionally set userID and userKey in cephfs chart
Browse files Browse the repository at this point in the history
According to ceph#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 <[email protected]>
  • Loading branch information
james-choncholas authored and mergify[bot] committed Aug 28, 2024
1 parent 689498e commit 3fbe7a8
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
4 changes: 3 additions & 1 deletion charts/ceph-csi-cephfs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,9 @@ charts and their default values.
| `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 | `<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` |
| `CSIDriver.fsGroupPolicy` | Specifies the fsGroupPolicy for the CSI driver object | `File` |
| `CSIDriver.seLinuxMount` | Specify for efficient SELinux volume relabeling | `true` |
Expand Down
6 changes: 6 additions & 0 deletions charts/ceph-csi-cephfs/templates/secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ 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 -}}
3 changes: 3 additions & 0 deletions charts/ceph-csi-cephfs/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,9 @@ secret:
# 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: ""

# This is a sample configmap that helps define a Ceph configuration as required
# by the CSI plugins.
Expand Down

0 comments on commit 3fbe7a8

Please sign in to comment.