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

Fix/hdds 11597 #1

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Fix/hdds 11597 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9786b95
HDDS-11597 fixed persistent feature in helm chart statefulSet
pyttel Oct 23, 2024
14f9633
HDDS-11597 enabled Test Charts workflow
pyttel Oct 23, 2024
23d435b
HDDS-11597 enabled Test Charts workflow
pyttel Oct 23, 2024
30c75e7
HDDS-11597 enabled Test Charts workflow
pyttel Oct 23, 2024
c6b1e9d
Revert "HDDS-11597 enabled Test Charts workflow"
pyttel Oct 23, 2024
d7ab985
Revert "HDDS-11597 enabled Test Charts workflow"
pyttel Oct 23, 2024
49b6e74
Revert "HDDS-11597 enabled Test Charts workflow"
pyttel Oct 23, 2024
e7ed32d
Update charts/ozone/templates/datanode/datanode-statefulset.yaml
pyttel Oct 27, 2024
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
2 changes: 1 addition & 1 deletion charts/ozone/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
34 changes: 0 additions & 34 deletions charts/ozone/templates/datanode/datanode-pvc.yaml
View file
Open in desktop

This file was deleted.

32 changes: 23 additions & 9 deletions charts/ozone/templates/datanode/datanode-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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
{{- 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 }}
34 changes: 0 additions & 34 deletions charts/ozone/templates/om/om-pvc.yaml
View file
Open in desktop

This file was deleted.

32 changes: 23 additions & 9 deletions charts/ozone/templates/om/om-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
2 changes: 1 addition & 1 deletion charts/ozone/templates/ozone-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
34 changes: 0 additions & 34 deletions charts/ozone/templates/s3g/s3g-pvc.yaml
View file
Open in desktop

This file was deleted.

32 changes: 23 additions & 9 deletions charts/ozone/templates/s3g/s3g-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
34 changes: 0 additions & 34 deletions charts/ozone/templates/scm/scm-pvc.yaml
View file
Open in desktop

This file was deleted.

34 changes: 24 additions & 10 deletions charts/ozone/templates/scm/scm-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 }}
Expand All @@ -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 }}
Loading