ae2da62c56
This reverts commit 8b1f987add87d217f720f505b9f65f80fc8dbd20. Reason for revert: This review possibly caused a sanity failure Change-Id: I6d0958f793cd46abca552fa0f9b3188d87036db8
136 lines
5.9 KiB
Diff
136 lines
5.9 KiB
Diff
From 8ef1e051d4166dd0f9f8c931465b27cadfde7ca0 Mon Sep 17 00:00:00 2001
|
|
From: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
|
|
Date: Tue, 21 Mar 2023 21:09:29 -0300
|
|
Subject: [PATCH] ceph-csi-cephfs: update storageclass
|
|
|
|
Signed-off-by: Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windriver.com>
|
|
Signed-off-by: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
|
|
---
|
|
.../templates/storageclass.yaml | 104 ++++++++++--------
|
|
1 file changed, 56 insertions(+), 48 deletions(-)
|
|
|
|
diff --git a/charts/ceph-csi-cephfs/templates/storageclass.yaml b/charts/ceph-csi-cephfs/templates/storageclass.yaml
|
|
index a21c99824..e3a27b455 100644
|
|
--- a/charts/ceph-csi-cephfs/templates/storageclass.yaml
|
|
+++ b/charts/ceph-csi-cephfs/templates/storageclass.yaml
|
|
@@ -1,61 +1,69 @@
|
|
{{- if .Values.storageClass.create -}}
|
|
+{{- $cephCsiDefault := .Values.storageClass }}
|
|
+{{- $defaults := .Values.classdefaults }}
|
|
+{{- range $sc := .Values.classes }}
|
|
apiVersion: storage.k8s.io/v1
|
|
kind: StorageClass
|
|
metadata:
|
|
- name: {{ .Values.storageClass.name }}
|
|
-{{- if .Values.storageClass.annotations }}
|
|
+ name: {{ $sc.name }}
|
|
+{{- if $cephCsiDefault.annotations }}
|
|
annotations:
|
|
-{{ toYaml .Values.storageClass.annotations | indent 4 }}
|
|
+{{ toYaml $cephCsiDefault.annotations | indent 4 }}
|
|
{{- end }}
|
|
labels:
|
|
- app: {{ include "ceph-csi-cephfs.name" . }}
|
|
- chart: {{ include "ceph-csi-cephfs.chart" . }}
|
|
- release: {{ .Release.Name }}
|
|
- heritage: {{ .Release.Service }}
|
|
- {{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }}
|
|
-provisioner: {{ .Values.driverName }}
|
|
+ app: {{ include "ceph-csi-cephfs.name" $ }}
|
|
+ chart: {{ include "ceph-csi-cephfs.chart" $ }}
|
|
+ release: {{ $.Release.Name }}
|
|
+ heritage: {{ $.Release.Service }}
|
|
+ {{- with $.Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }}
|
|
+provisioner: {{ $.Values.driverName }}
|
|
parameters:
|
|
- clusterID: {{ .Values.storageClass.clusterID }}
|
|
- fsName: {{ .Values.storageClass.fsName }}
|
|
-{{- if .Values.storageClass.pool }}
|
|
- pool: {{ .Values.storageClass.pool }}
|
|
-{{- end }}
|
|
-{{- if .Values.storageClass.fuseMountOptions }}
|
|
- fuseMountOptions: "{{ .Values.storageClass.fuseMountOptions }}"
|
|
-{{- end }}
|
|
-{{- if .Values.storageClass.kernelMountOptions }}
|
|
- kernelMountOptions: "{{ .Values.storageClass.kernelMountOptions }}"
|
|
-{{- end }}
|
|
-{{- if .Values.storageClass.mounter }}
|
|
- mounter: "{{ .Values.storageClass.mounter }}"
|
|
-{{- end }}
|
|
-{{- if .Values.storageClass.volumeNamePrefix }}
|
|
- volumeNamePrefix: "{{ .Values.storageClass.volumeNamePrefix }}"
|
|
-{{- end }}
|
|
- csi.storage.k8s.io/provisioner-secret-name: {{ .Values.storageClass.provisionerSecret }}
|
|
-{{- if .Values.storageClass.provisionerSecretNamespace }}
|
|
- csi.storage.k8s.io/provisioner-secret-namespace: {{ .Values.storageClass.provisionerSecretNamespace }}
|
|
-{{ else }}
|
|
- csi.storage.k8s.io/provisioner-secret-namespace: {{ .Release.Namespace }}
|
|
-{{- end }}
|
|
- csi.storage.k8s.io/controller-expand-secret-name: {{ .Values.storageClass.controllerExpandSecret }}
|
|
-{{- if .Values.storageClass.controllerExpandSecretNamespace }}
|
|
- csi.storage.k8s.io/controller-expand-secret-namespace: {{ .Values.storageClass.controllerExpandSecretNamespace }}
|
|
-{{ else }}
|
|
- csi.storage.k8s.io/controller-expand-secret-namespace: {{ .Release.Namespace }}
|
|
-{{- end }}
|
|
- csi.storage.k8s.io/node-stage-secret-name: {{ .Values.storageClass.nodeStageSecret }}
|
|
-{{- if .Values.storageClass.nodeStageSecretNamespace }}
|
|
- csi.storage.k8s.io/node-stage-secret-namespace: {{ .Values.storageClass.nodeStageSecretNamespace }}
|
|
-{{ else }}
|
|
- csi.storage.k8s.io/node-stage-secret-namespace: {{ .Release.Namespace }}
|
|
-{{- end }}
|
|
-reclaimPolicy: {{ .Values.storageClass.reclaimPolicy }}
|
|
-allowVolumeExpansion: {{ .Values.storageClass.allowVolumeExpansion }}
|
|
-{{- if .Values.storageClass.mountOptions }}
|
|
+{{- with (first $.Values.csiConfig) }}
|
|
+ clusterID: {{ or $sc.clusterID .clusterID }}
|
|
+{{- end}}
|
|
+ fsName: {{ $sc.fs_name }}
|
|
+{{- if $sc.data_pool_name }}
|
|
+ pool: {{ $sc.data_pool_name }}
|
|
+{{- end }}
|
|
+{{- if $sc.fuseMountOptions }}
|
|
+ fuseMountOptions: "{{ $sc.fuseMountOptions }}"
|
|
+{{- else if $cephCsiDefault.fuseMountOptions }}
|
|
+ fuseMountOptions: "{{ $cephCsiDefault.fuseMountOptions }}"
|
|
+{{- end }}
|
|
+{{- if $sc.kernelMountOptions }}
|
|
+ kernelMountOptions: "{{ $sc.kernelMountOptions }}"
|
|
+{{- else if $cephCsiDefault.kernelMountOptions }}
|
|
+ kernelMountOptions: "{{ $cephCsiDefault.kernelMountOptions }}"
|
|
+{{- end }}
|
|
+{{- if $sc.mounter }}
|
|
+ mounter: "{{ $sc.mounter }}"
|
|
+{{- else if $cephCsiDefault.mounter }}
|
|
+ mounter: "{{ $cephCsiDefault.mounter }}"
|
|
+{{- end }}
|
|
+{{- if $sc.volumeNamePrefix }}
|
|
+ volumeNamePrefix: "{{ $sc.volumeNamePrefix }}"
|
|
+{{- else if $cephCsiDefault.volumeNamePrefix }}
|
|
+ volumeNamePrefix: "{{ $cephCsiDefault.volumeNamePrefix }}"
|
|
+{{- end }}
|
|
+ csi.storage.k8s.io/provisioner-secret-name: {{ or $sc.provisionerSecret $defaults.adminSecretName }}
|
|
+ csi.storage.k8s.io/provisioner-secret-namespace: {{ or $sc.provisionerSecretNamespace $.Release.Namespace }}
|
|
+ csi.storage.k8s.io/controller-expand-secret-name: {{ or $sc.controllerExpandSecret $defaults.adminSecretName }}
|
|
+ csi.storage.k8s.io/controller-expand-secret-namespace: {{ or $sc.controllerExpandSecretNamespace $.Release.Namespace }}
|
|
+ csi.storage.k8s.io/node-stage-secret-name: {{ or $sc.nodeStageSecret $defaults.adminSecretName }}
|
|
+ csi.storage.k8s.io/node-stage-secret-namespace: {{ or $sc.nodeStageSecretNamespace $.Release.Namespace }}
|
|
+reclaimPolicy: {{ or $sc.reclaimPolicy $cephCsiDefault.reclaimPolicy }}
|
|
+allowVolumeExpansion: {{ or $sc.allowVolumeExpansion $cephCsiDefault.allowVolumeExpansion }}
|
|
+{{- if $sc.mountOptions }}
|
|
mountOptions:
|
|
- {{- range .Values.storageClass.mountOptions }}
|
|
+ {{- range $sc.mountOptions }}
|
|
- {{ . }}
|
|
{{- end }}
|
|
+{{- else if $cephCsiDefault.mountOptions }}
|
|
+mountOptions:
|
|
+ {{- range $cephCsiDefault.mountOptions }}
|
|
+ - {{ . }}
|
|
+ {{- end }}
|
|
+{{- end }}
|
|
+---
|
|
{{- end }}
|
|
{{- end -}}
|
|
--
|
|
2.25.1
|