Fix clickhouse imagePullSecrets

sentry-kubernetes · Nov 25, 2020 · 573ca29 · 573ca29
1 parent 0819e79
commit 573ca29
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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