Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

helm: Optionally set userID and userKey in cephfs chart. #4801

Merged
merged 1 commit into from
Aug 28, 2024
+12 −1
Merged

helm: Optionally set userID and userKey in cephfs chart. #4801

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
helm: optionally set userID and userKey in cephfs chart 
According to #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>
@james-choncholas @Madhu-1
james-choncholas authored and Madhu-1 committed Aug 28, 2024
commit 61d5bbf5295dcadc1f334656980daa607f250670
4 changes: 3 additions & 1 deletion charts/ceph-csi-cephfs/README.md
View file
Original file line number Diff line number Diff line change
@@ -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` |
6 changes: 6 additions & 0 deletions charts/ceph-csi-cephfs/templates/secret.yaml
View file
Original file line number Diff line number Diff line change
@@ -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
View file
Original file line number Diff line number Diff line change
@@ -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.