mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-01-12 06:49:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

helm: Update helm charts to use userID and Keys

Browse Source 
Signed-off-by: Niraj Yadav <niryadav@redhat.com>
This commit is contained in:
Niraj Yadav 2024-12-09 17:53:05 +05:30
parent 396ca38d16
commit c928c85d3f
4 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -232,10 +232,8 @@ charts and their default values.
| `storageClass.mountOptions` | Specifies the mount options | `[]` | | `storageClass.mountOptions` | Specifies the mount options | `[]` |
| `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.userID` | Specifies the user ID of the cephFS secret. | `""` |
| `secret.adminKey` | Specifies the key that corresponds to the adminID | `""` | | `secret.userKey` | Specifies the key that corresponds to the userID. | `<Ceph auth key corresponding to ID above>` |
| `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,12 +14,6 @@ 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 }} userID: {{ .Values.secret.userID }}
{{- end }}
{{- if .Values.secret.userKey }}
userKey: {{ .Values.secret.userKey }} userKey: {{ .Values.secret.userKey }}
{{- end }}
adminID: {{ .Values.secret.adminID }}
adminKey: {{ .Values.secret.adminKey }}
{{- end -}} {{- end -}}

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

@ -383,9 +383,6 @@ secret:
# Key values correspond to a user name and its key, as defined in the # 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' # ceph cluster. User ID should have required access to the 'pool'
# specified in the storage class # 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: "" userID: ""
userKey: "" userKey: ""

8
scripts/install-helm.sh
View File

@ -172,7 +172,7 @@ install_cephcsi_helm_charts() {
if [ "${DEPLOY_SECRET}" -eq 1 ]; then if [ "${DEPLOY_SECRET}" -eq 1 ]; then
fetch_template_values fetch_template_values
RBD_SECRET_TEMPLATE_VALUES="--set secret.create=true --set secret.userID=admin --set secret.userKey=${ADMIN_KEY}" 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 fi
# enable read affinity # enable read affinity
if [ "${ENABLE_READ_AFFINITY}" -eq 1 ]; then 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" HELM="${TEMP}/${dist}-${arch}/helm"
fi fi
if [ "$#" -le 2 ] if [ "$#" -le 2 ]; then
then
ACTION=$1 ACTION=$1
NAMESPACE=$2 NAMESPACE=$2
SKIP_PARSE="true" SKIP_PARSE="true"
fi fi
if [ ${#SKIP_PARSE} -eq 0 ]; then if [ ${#SKIP_PARSE} -eq 0 ]; then
while [ "$1" != "" ] while [ "$1" != "" ]; do
do
case $1 in case $1 in
up) up)
shift shift