From 3c0596465f3276cffa348eba9ffb01daea80a136 Mon Sep 17 00:00:00 2001
From: Fabian Kramm <fab.kramm@googlemail.com>
Date: Thu, 28 Dec 2023 13:59:20 +0100
Subject: [PATCH] fix: wrong volumes check

---
 charts/eks/templates/etcd-statefulset.yaml  | 2 +-
 charts/eks/templates/syncer-deployment.yaml | 3 +++
 charts/k0s/templates/statefulset.yaml       | 3 +++
 charts/k3s/templates/statefulset.yaml       | 3 +++
 charts/k8s/templates/etcd-statefulset.yaml  | 2 +-
 charts/k8s/templates/syncer-deployment.yaml | 3 +++
 6 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/charts/eks/templates/etcd-statefulset.yaml b/charts/eks/templates/etcd-statefulset.yaml
index 9e9fea759..4e27913a2 100644
--- 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
index f6e07bb2b..640ca9bae 100644
--- 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
index 91f805400..5fd6b24e8 100644
--- 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
index b738cc6da..f18740730 100644
--- 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
index fb2e99dba..ba4ce1700 100644
--- 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
index 59e06bb62..705e0b34e 100644
--- 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 }}