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

helm: add cli argument instanceid

Browse Source 
Signed-off-by: Andreas <zerotens@users.noreply.github.com>
This commit is contained in:
Andreas 2024-06-21 13:37:56 +02:00 committed by mergify[bot]
parent 6f043698d1
commit 1f192ac3da
9 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PendingReleaseNotes.md
View File

@ -6,5 +6,6 @@
- deploy: podSecurityContexts can be configured for ceph-csi-cephfs chart in [PR](https://github.com/ceph/ceph-csi/pull/4664). - deploy: podSecurityContexts can be configured for ceph-csi-cephfs chart in [PR](https://github.com/ceph/ceph-csi/pull/4664).
- deploy: podSecurityContexts can be configured for ceph-csi-rbd chart in [PR](https://github.com/ceph/ceph-csi/pull/4668) - deploy: podSecurityContexts can be configured for ceph-csi-rbd chart in [PR](https://github.com/ceph/ceph-csi/pull/4668)
- deploy: instanceID can be optionally configured for ceph-csi charts in [PR](https://github.com/ceph/ceph-csi/pull/4666)
## NOTE ## NOTE

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

@ -200,6 +200,7 @@ charts and their default values.
| `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` |
| `instanceID` | Unique ID distinguishing this instance of Ceph CSI among other instances, when sharing Ceph clusters across CSI instances for provisioning. | ` ` |
### Command Line ### Command Line

3
charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml
View File

@ -59,6 +59,9 @@ spec:
- "--endpoint=$(CSI_ENDPOINT)" - "--endpoint=$(CSI_ENDPOINT)"
- "--v={{ .Values.logLevel }}" - "--v={{ .Values.logLevel }}"
- "--drivername=$(DRIVER_NAME)" - "--drivername=$(DRIVER_NAME)"
{{- if .Values.instanceID }}
- "--instanceid={{ .Values.instanceID }}"
{{- end }}
{{- if .Values.nodeplugin.profiling.enabled }} {{- if .Values.nodeplugin.profiling.enabled }}
- "--enableprofiling={{ .Values.nodeplugin.profiling.enabled }}" - "--enableprofiling={{ .Values.nodeplugin.profiling.enabled }}"
{{- end }} {{- end }}

3
charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml
View File

@ -79,6 +79,9 @@ spec:
- "--endpoint=$(CSI_ENDPOINT)" - "--endpoint=$(CSI_ENDPOINT)"
- "--v={{ .Values.logLevel }}" - "--v={{ .Values.logLevel }}"
- "--drivername=$(DRIVER_NAME)" - "--drivername=$(DRIVER_NAME)"
{{- if .Values.instanceID }}
- "--instanceid={{ .Values.instanceID }}"
{{- end }}
{{- if .Values.provisioner.profiling.enabled }} {{- if .Values.provisioner.profiling.enabled }}
- "--enableprofiling={{ .Values.provisioner.profiling.enabled }}" - "--enableprofiling={{ .Values.provisioner.profiling.enabled }}"
{{- end }} {{- end }}

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

@ -372,3 +372,6 @@ configMapName: ceph-csi-config
externallyManagedConfigmap: false externallyManagedConfigmap: false
# Name of the configmap used for ceph.conf # Name of the configmap used for ceph.conf
cephConfConfigMapName: ceph-config cephConfConfigMapName: ceph-config
# Unique ID distinguishing this instance of Ceph CSI among other instances,
# when sharing Ceph clusters across CSI instances for provisioning
# instanceID: default

1
charts/ceph-csi-rbd/README.md
View File

@ -229,6 +229,7 @@ charts and their default values.
| `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` |
| `instanceID` | Unique ID distinguishing this instance of Ceph CSI among other instances, when sharing Ceph clusters across CSI instances for provisioning. | ` ` |
### Command Line ### Command Line

3
charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml
View File

@ -60,6 +60,9 @@ spec:
{{- if .Values.topology.domainLabels }} {{- if .Values.topology.domainLabels }}
- "--domainlabels={{ .Values.topology.domainLabels | join "," }}" - "--domainlabels={{ .Values.topology.domainLabels | join "," }}"
{{- end }} {{- end }}
{{- if .Values.instanceID }}
- "--instanceid={{ .Values.instanceID }}"
{{- end }}
{{- if .Values.nodeplugin.profiling.enabled }} {{- if .Values.nodeplugin.profiling.enabled }}
- "--enableprofiling={{ .Values.nodeplugin.profiling.enabled }}" - "--enableprofiling={{ .Values.nodeplugin.profiling.enabled }}"
{{- end }} {{- end }}

3
charts/ceph-csi-rbd/templates/provisioner-deployment.yaml
View File

@ -87,6 +87,9 @@ spec:
{{- if .Values.provisioner.skipForceFlatten }} {{- if .Values.provisioner.skipForceFlatten }}
- "--skipforceflatten={{ .Values.provisioner.skipForceFlatten }}" - "--skipforceflatten={{ .Values.provisioner.skipForceFlatten }}"
{{- end }} {{- end }}
{{- if .Values.instanceID }}
- "--instanceid={{ .Values.instanceID }}"
{{- end }}
{{- if .Values.provisioner.profiling.enabled }} {{- if .Values.provisioner.profiling.enabled }}
- "--enableprofiling={{ .Values.provisioner.profiling.enabled }}" - "--enableprofiling={{ .Values.provisioner.profiling.enabled }}"
{{- end }} {{- end }}

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

@ -553,3 +553,6 @@ externallyManagedConfigmap: false
cephConfConfigMapName: ceph-config cephConfConfigMapName: ceph-config
# Name of the configmap used for encryption kms configuration # Name of the configmap used for encryption kms configuration
kmsConfigMapName: ceph-csi-encryption-kms-config kmsConfigMapName: ceph-csi-encryption-kms-config
# Unique ID distinguishing this instance of Ceph CSI among other instances,
# when sharing Ceph clusters across CSI instances for provisioning
# instanceID: default