Merge pull request #1432 from FabianKramm/main

fix: wrong volumes check
loft-sh · Dec 28, 2023 · d7876d3 · d7876d3
2 parents a7b2680 + 3c05964
commit d7876d3
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 2 deletions.
diff --git a/charts/eks/templates/etcd-statefulset.yaml b/charts/eks/templates/etcd-statefulset.yaml
@@ -81,7 +81,7 @@ spec:
         - name: certs
           secret:
             secretName: {{ .Release.Name }}-certs
-      {{- if .Values.volumes }}
+      {{- if .Values.etcd.volumes }}
 {{ toYaml .Values.etcd.volumes | indent 8 }}
       {{- end }}
       {{- if not .Values.etcd.storage.persistence }}

diff --git a/charts/eks/templates/syncer-deployment.yaml b/charts/eks/templates/syncer-deployment.yaml
@@ -76,6 +76,9 @@ spec:
           emptyDir: {}
         - name: certs
           emptyDir: {}
+      {{- if .Values.volumes }}
+{{ toYaml .Values.volumes | indent 8 }}
+      {{- end }}
       {{- if .Values.syncer.volumes }}
 {{ toYaml .Values.syncer.volumes | indent 8 }}
       {{- end }}

diff --git a/charts/k0s/templates/statefulset.yaml b/charts/k0s/templates/statefulset.yaml
@@ -80,6 +80,9 @@ spec:
           emptyDir: {}
         - name: k0s-binary
           emptyDir: {}
+      {{- if .Values.syncer.volumes }}
+{{ toYaml .Values.syncer.volumes | indent 8 }}
+      {{- end }}
       {{- if .Values.volumes }}
 {{ toYaml .Values.volumes | indent 8 }}
       {{- end }}

diff --git a/charts/k3s/templates/statefulset.yaml b/charts/k3s/templates/statefulset.yaml
@@ -114,6 +114,9 @@ spec:
           emptyDir: {}
         - name: config
           emptyDir: {}
+      {{- if .Values.syncer.volumes }}
+{{ toYaml .Values.syncer.volumes | indent 8 }}
+      {{- end }}
       {{- if .Values.volumes }}
 {{ toYaml .Values.volumes | indent 8 }}
       {{- end }}

diff --git a/charts/k8s/templates/etcd-statefulset.yaml b/charts/k8s/templates/etcd-statefulset.yaml
@@ -116,7 +116,7 @@ spec:
         - name: certs
           secret:
             secretName: {{ .Release.Name }}-certs
-      {{- if .Values.volumes }}
+      {{- if .Values.etcd.volumes }}
 {{ toYaml .Values.etcd.volumes | indent 8 }}
       {{- end }}
       {{- if not .Values.etcd.storage.persistence }}

diff --git a/charts/k8s/templates/syncer-deployment.yaml b/charts/k8s/templates/syncer-deployment.yaml
@@ -106,6 +106,9 @@ spec:
           emptyDir: {}
         - name: certs
           emptyDir: {}
+      {{- if .Values.volumes }}
+{{ toYaml .Values.volumes | indent 8 }}
+      {{- end }}
       {{- if .Values.syncer.volumes }}
 {{ toYaml .Values.syncer.volumes | indent 8 }}
       {{- end }}