HDDS-11597 fixed persistent feature in helm chart statefulSet

pyttel · Oct 23, 2024 · 9786b95 · 9786b95
1 parent 3616a3e
commit 9786b95
Show file tree

Hide file tree

Showing 11 changed files with 108 additions and 184 deletions.
diff --git a/charts/ozone/Chart.yaml b/charts/ozone/Chart.yaml
@@ -18,7 +18,7 @@ apiVersion: v2
 name: ozone
 description: The official Helm chart for Apache Ozone
 type: application
-version: 0.1.0
+version: 0.1.1
 appVersion: "1.4.0"
 home: https://ozone.apache.org
 icon: https://ozone.apache.org/ozone-logo.png

diff --git a/charts/ozone/templates/datanode/datanode-pvc.yaml b/charts/ozone/templates/datanode/datanode-pvc.yaml
diff --git a/charts/ozone/templates/datanode/datanode-statefulset.yaml b/charts/ozone/templates/datanode/datanode-statefulset.yaml
@@ -73,7 +73,7 @@ spec:
           volumeMounts:
             - name: config
               mountPath: {{ .Values.configuration.dir }}
-            - name: data
+            - name: {{ .Release.Name }}-datanode
               mountPath: {{ .Values.datanode.persistence.path }}
       {{- with $nodeSelector }}
       nodeSelector: {{- toYaml . | nindent 8 }}
@@ -92,15 +92,29 @@ spec:
           projected:
             sources:
               - configMap:
-                  name: {{ .Release.Name }}
+                  name: {{ .Release.Name }}-ozone
               {{- with .Values.configuration.filesFrom }}
-                {{- tpl (toYaml .) $ | nindent 8 }}
+                {{- tpl (toYaml .) $ | nindent 14 }}
               {{- end }}
-        {{- if .Values.datanode.persistence.enabled }}
-        - name: data
-          persistentVolumeClaim:
-            claimName: {{ .Values.datanode.persistence.existingClaim | default (printf "%s-%s" .Release.Name "datanode") }}
-        {{- else }}
-        - name: data
-          emptyDir: {}
+        {{- if not .Values.datanode.persistence.enabled }}
+        - name: {{ .Release.Name }}-datanode
+          emptyDir: { }
         {{- end }}
+  {{- if .Values.datanode.persistence.enabled }}
+  volumeClaimTemplates:
+    - metadata:
+        name: {{ .Release.Name }}-datanode
+        labels:
+          {{- include "ozone.labels" . | nindent 10 }}
+          app.kubernetes.io/component: datanode
+      spec:
+        {{- with .Values.datanode.persistence.accessModes }}
+        accessModes: {{- toYaml . | nindent 10 }}
+        {{- end }}
+        resources:
+          requests:
+            storage: {{ .Values.datanode.persistence.size }}
+        {{- with .Values.scm.persistence.storageClassName }}
+        storageClassName: {{ . }}
+        {{- end }}
+  {{- end }}
diff --git a/charts/ozone/templates/om/om-pvc.yaml b/charts/ozone/templates/om/om-pvc.yaml
diff --git a/charts/ozone/templates/om/om-statefulset.yaml b/charts/ozone/templates/om/om-statefulset.yaml
@@ -79,7 +79,7 @@ spec:
           volumeMounts:
             - name: config
               mountPath: {{ .Values.configuration.dir }}
-            - name: data
+            - name: {{ .Release.Name }}-om
               mountPath: {{ .Values.om.persistence.path }}
       {{- with $nodeSelector }}
       nodeSelector: {{- toYaml . | nindent 8 }}
@@ -98,15 +98,29 @@ spec:
           projected:
             sources:
               - configMap:
-                  name: {{ .Release.Name }}
+                  name: {{ .Release.Name }}-ozone
               {{- with .Values.configuration.filesFrom }}
-                {{- tpl (toYaml .) $ | nindent 8 }}
+                {{- tpl (toYaml .) $ | nindent 14 }}
               {{- end }}
-        {{- if .Values.om.persistence.enabled }}
-        - name: data
-          persistentVolumeClaim:
-            claimName: {{ .Values.om.persistence.existingClaim | default (printf "%s-%s" .Release.Name "om") }}
-        {{- else }}
-        - name: data
+        {{- if not .Values.om.persistence.enabled }}
+        - name: {{ .Release.Name }}-om
           emptyDir: {}
         {{- end }}
+  {{- if .Values.om.persistence.enabled }}
+  volumeClaimTemplates:
+    - metadata:
+        name: {{ .Release.Name }}-om
+        labels:
+          {{- include "ozone.labels" . | nindent 10 }}
+          app.kubernetes.io/component: om
+      spec:
+        {{- with .Values.om.persistence.accessModes }}
+        accessModes: {{- toYaml . | nindent 10 }}
+        {{- end }}
+        resources:
+          requests:
+            storage: {{ .Values.om.persistence.size }}
+        {{- with .Values.scm.persistence.storageClassName }}
+        storageClassName: {{ . }}
+        {{- end }}
+  {{- end }}
diff --git a/charts/ozone/templates/ozone-configmap.yaml b/charts/ozone/templates/ozone-configmap.yaml
@@ -19,7 +19,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ .Release.Name }}
+  name: {{ .Release.Name }}-ozone
   labels: {{- include "ozone.labels" . | nindent 4 }}
 data:
   {{- tpl (toYaml .Values.configuration.files) $ | nindent 4 }}
diff --git a/charts/ozone/templates/s3g/s3g-pvc.yaml b/charts/ozone/templates/s3g/s3g-pvc.yaml
diff --git a/charts/ozone/templates/s3g/s3g-statefulset.yaml b/charts/ozone/templates/s3g/s3g-statefulset.yaml
@@ -73,7 +73,7 @@ spec:
           volumeMounts:
             - name: config
               mountPath: {{ .Values.configuration.dir }}
-            - name: data
+            - name: {{ .Release.Name }}-s3g
               mountPath: {{ .Values.s3g.persistence.path }}
       {{- with $nodeSelector }}
       nodeSelector: {{- toYaml . | nindent 8 }}
@@ -92,15 +92,29 @@ spec:
           projected:
             sources:
               - configMap:
-                  name: {{ .Release.Name }}
+                  name: {{ .Release.Name }}-ozone
               {{- with .Values.configuration.filesFrom }}
-                {{- tpl (toYaml .) $ | nindent 8 }}
+                {{- tpl (toYaml .) $ | nindent 14 }}
               {{- end }}
-        {{- if .Values.s3g.persistence.enabled }}
-        - name: data
-          persistentVolumeClaim:
-            claimName: {{ .Values.s3g.persistence.existingClaim | default (printf "%s-%s" .Release.Name "s3g") }}
-        {{- else }}
-        - name: data
+        {{- if not .Values.s3g.persistence.enabled }}
+        - name: {{ .Release.Name }}-s3g
           emptyDir: {}
         {{- end }}
+  {{- if .Values.s3g.persistence.enabled }}
+  volumeClaimTemplates:
+    - metadata:
+        name: {{ .Release.Name }}-s3g
+        labels:
+          {{- include "ozone.labels" . | nindent 10 }}
+          app.kubernetes.io/component: s3g
+      spec:
+        {{- with .Values.s3g.persistence.accessModes }}
+        accessModes: {{- toYaml . | nindent 10 }}
+        {{- end }}
+        resources:
+          requests:
+            storage: {{ .Values.s3g.persistence.size }}
+        {{- with .Values.scm.persistence.storageClassName }}
+        storageClassName: {{ . }}
+        {{- end }}
+  {{- end }}
diff --git a/charts/ozone/templates/scm/scm-pvc.yaml b/charts/ozone/templates/scm/scm-pvc.yaml
diff --git a/charts/ozone/templates/scm/scm-statefulset.yaml b/charts/ozone/templates/scm/scm-statefulset.yaml
@@ -59,7 +59,7 @@ spec:
           volumeMounts:
             - name: config
               mountPath: {{ .Values.configuration.dir }}
-            - name: data
+            - name: {{ .Release.Name }}-scm
               mountPath: {{ .Values.scm.persistence.path }}
       containers:
         - name: scm
@@ -94,7 +94,7 @@ spec:
           volumeMounts:
             - name: config
               mountPath: {{ .Values.configuration.dir }}
-            - name: data
+            - name: {{ .Release.Name }}-scm
               mountPath: {{ .Values.scm.persistence.path }}
       {{- with $nodeSelector }}
       nodeSelector: {{- toYaml . | nindent 8 }}
@@ -113,15 +113,29 @@ spec:
           projected:
             sources:
               - configMap:
-                  name: {{ .Release.Name }}
+                  name: {{ .Release.Name }}-ozone
               {{- with .Values.configuration.filesFrom }}
-                {{- tpl (toYaml .) $ | nindent 8 }}
+                {{- tpl (toYaml .) $ | nindent 14 }}
               {{- end }}
-        {{- if .Values.scm.persistence.enabled }}
-        - name: data
-          persistentVolumeClaim:
-            claimName: {{ .Values.scm.persistence.existingClaim | default (printf "%s-%s" .Release.Name "scm") }}
-        {{- else }}
-        - name: data
+        {{- if not .Values.scm.persistence.enabled }}
+        - name: {{ .Release.Name }}-scm
           emptyDir: {}
         {{- end }}
+  {{- if .Values.scm.persistence.enabled }}
+  volumeClaimTemplates:
+    - metadata:
+        name: {{ .Release.Name }}-scm
+        labels:
+          {{- include "ozone.labels" . | nindent 10 }}
+          app.kubernetes.io/component: scm
+      spec:
+        {{- with .Values.scm.persistence.accessModes }}
+        accessModes: {{- toYaml . | nindent 10 }}
+        {{- end }}
+        resources:
+          requests:
+            storage: {{ .Values.scm.persistence.size }}
+        {{- with .Values.scm.persistence.storageClassName }}
+        storageClassName: {{ . }}
+        {{- end }}
+  {{- end }}