From 573ca29d03bf2c044004c1aa387f652a36ada23a Mon Sep 17 00:00:00 2001
From: Justin Moy <justincmoy@users.noreply.github.com>
Date: Wed, 25 Nov 2020 12:54:40 -0700
Subject: [PATCH] Fix clickhouse imagePullSecrets

---
 clickhouse/Chart.yaml                                    | 2 +-
 clickhouse/templates/statefulset-clickhouse-replica.yaml | 4 ----
 clickhouse/templates/statefulset-clickhouse.yaml         | 4 ----
 sentry/Chart.yaml                                        | 2 +-
 sentry/templates/hooks/clickhouse-init.job.yaml          | 4 +++-
 5 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/clickhouse/Chart.yaml b/clickhouse/Chart.yaml
index fec4488ce..396ad305d 100755
--- a/clickhouse/Chart.yaml
+++ b/clickhouse/Chart.yaml
@@ -10,4 +10,4 @@ keywords:
 name: clickhouse
 sources:
 - https://github.com/sentry-kubernetes/charts
-version: 1.5.0
+version: 2.0.0
diff --git a/clickhouse/templates/statefulset-clickhouse-replica.yaml b/clickhouse/templates/statefulset-clickhouse-replica.yaml
index e7b6646f1..c07c9e417 100755
--- a/clickhouse/templates/statefulset-clickhouse-replica.yaml
+++ b/clickhouse/templates/statefulset-clickhouse-replica.yaml
@@ -121,10 +121,6 @@ spec:
         resources: {{- toYaml .Values.clickhouse.metrics.resources | nindent 8 }}
         {{- end }}
       {{- end }}
-      {{- if .Values.clickhouse.imagePullSecrets }}
-      imagePullSecrets:
-      - name: {{ .Values.clickhouse.imagePullSecrets }}
-    {{- end }}
     {{- if .Values.clickhouse.nodeSelector }}
       nodeSelector:
 {{ toYaml .Values.clickhouse.nodeSelector | indent 8 }}
diff --git a/clickhouse/templates/statefulset-clickhouse.yaml b/clickhouse/templates/statefulset-clickhouse.yaml
index 802765300..d45e5f0ff 100755
--- a/clickhouse/templates/statefulset-clickhouse.yaml
+++ b/clickhouse/templates/statefulset-clickhouse.yaml
@@ -120,10 +120,6 @@ spec:
         resources: {{- toYaml .Values.clickhouse.metrics.resources | nindent 8 }}
       {{- end }}
       {{- end }}
-    {{- if .Values.clickhouse.imagePullSecrets }}
-      imagePullSecrets:
-      - name: {{ .Values.clickhouse.imagePullSecrets }}
-    {{- end }}
     {{- if .Values.clickhouse.nodeSelector }}
       nodeSelector:
 {{ toYaml .Values.clickhouse.nodeSelector | indent 8 }}
diff --git a/sentry/Chart.yaml b/sentry/Chart.yaml
index 8c8771f26..409b5288c 100644
--- a/sentry/Chart.yaml
+++ b/sentry/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: sentry
 description: A Helm chart for Kubernetes
 type: application
-version: 8.0.0
+version: 9.0.0
 appVersion: 20.10.1
 dependencies:
   - name: redis
diff --git a/sentry/templates/hooks/clickhouse-init.job.yaml b/sentry/templates/hooks/clickhouse-init.job.yaml
index d3813cbbe..93b84059a 100644
--- a/sentry/templates/hooks/clickhouse-init.job.yaml
+++ b/sentry/templates/hooks/clickhouse-init.job.yaml
@@ -31,7 +31,9 @@ spec:
       restartPolicy: Never
       {{- if .Values.clickhouse.clickhouse.imagePullSecrets }}
       imagePullSecrets:
-{{ toYaml .Values.clickhouse.clickhouse.imagePullSecrets | indent 8 }}
+      {{- range .Values.clickhouse.imagePullSecrets }}
+        - name: {{ . | quote }}
+      {{- end }}
       {{- end }}
       containers:
       - name: clickhouse-init