From 2bfbbec489ffc1ca3dd22508af0df920b3b96a78 Mon Sep 17 00:00:00 2001
From: Marcelo Grebois <mgrebois@dc.uba.ar>
Date: Sun, 24 Jun 2018 16:08:04 +0200
Subject: [PATCH] Adding the possibility to pull the image from a private
 repository (#5811)

* Adding the possibitlity to pull the image from a private repository

* Bumping version, fixing missing space, fixing variable name

* Fixing comment and adding comment

* Bumping version to match the chart, adding imagePullSecrets to cron

* Adding missing imagePullSecrets to post hooks

* Fixing format of all deployments to follow @unguiculus example

* Update values.yaml

* Bump minor version for new feature
---
 stable/sentry/Chart.yaml                           | 4 ++--
 stable/sentry/templates/cron-deployment.yaml       | 4 ++++
 stable/sentry/templates/hooks/db-init.job.yaml     | 4 ++++
 stable/sentry/templates/hooks/user-create.job.yaml | 4 ++++
 stable/sentry/templates/web-deployment.yaml        | 4 ++++
 stable/sentry/templates/workers-deployment.yaml    | 4 ++++
 stable/sentry/values.yaml                          | 5 ++++-
 7 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/stable/sentry/Chart.yaml b/stable/sentry/Chart.yaml
index 2b1586349d..5b9b0032e6 100644
--- a/stable/sentry/Chart.yaml
+++ b/stable/sentry/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 description: Sentry is a cross-platform crash reporting and aggregation platform.
 name: sentry
-version: 0.1.14
-appVersion: 8.17
+version: 0.2.0
+appVersion: 8.22
 keywords:
   - debugging
   - logging
diff --git a/stable/sentry/templates/cron-deployment.yaml b/stable/sentry/templates/cron-deployment.yaml
index 81bb47f5be..2f1c12230a 100644
--- a/stable/sentry/templates/cron-deployment.yaml
+++ b/stable/sentry/templates/cron-deployment.yaml
@@ -27,6 +27,10 @@ spec:
       {{- if .Values.cron.tolerations }}
       tolerations:
 {{ toYaml .Values.cron.tolerations | indent 8 }}
+      {{- end }}
+      {{- if .Values.image.imagePullSecrets }}
+      imagePullSecrets:
+{{ toYaml .Values.image.imagePullSecrets | indent 8 }}
       {{- end }}
       containers:
       - name: {{ .Chart.Name }}-cron
diff --git a/stable/sentry/templates/hooks/db-init.job.yaml b/stable/sentry/templates/hooks/db-init.job.yaml
index d05ec3e49d..4c649cd09d 100644
--- a/stable/sentry/templates/hooks/db-init.job.yaml
+++ b/stable/sentry/templates/hooks/db-init.job.yaml
@@ -22,6 +22,10 @@ spec:
         release: "{{ .Release.Name }}"
     spec:
       restartPolicy: Never
+      {{- if .Values.image.imagePullSecrets }}
+      imagePullSecrets:
+{{ toYaml .Values.image.imagePullSecrets | indent 8 }}
+      {{- end }}
       containers:
       - name: db-init-job
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
diff --git a/stable/sentry/templates/hooks/user-create.job.yaml b/stable/sentry/templates/hooks/user-create.job.yaml
index 618c7256cb..76bf681895 100644
--- a/stable/sentry/templates/hooks/user-create.job.yaml
+++ b/stable/sentry/templates/hooks/user-create.job.yaml
@@ -21,6 +21,10 @@ spec:
         release: "{{ .Release.Name }}"
     spec:
       restartPolicy: Never
+      {{- if .Values.image.imagePullSecrets }}
+      imagePullSecrets:
+{{ toYaml .Values.image.imagePullSecrets | indent 8 }}
+      {{- end }}
       containers:
       - name: user-create-job
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
diff --git a/stable/sentry/templates/web-deployment.yaml b/stable/sentry/templates/web-deployment.yaml
index 83138c01f5..428e3086c0 100644
--- a/stable/sentry/templates/web-deployment.yaml
+++ b/stable/sentry/templates/web-deployment.yaml
@@ -27,6 +27,10 @@ spec:
       {{- if .Values.web.tolerations }}
       tolerations:
 {{ toYaml .Values.web.tolerations | indent 8 }}
+      {{- end }}
+      {{- if .Values.image.imagePullSecrets }}
+      imagePullSecrets:
+{{ toYaml .Values.image.imagePullSecrets | indent 8 }}
       {{- end }}
       containers:
       - name: {{ .Chart.Name }}-web
diff --git a/stable/sentry/templates/workers-deployment.yaml b/stable/sentry/templates/workers-deployment.yaml
index 90ff6297b7..77b602c6d6 100644
--- a/stable/sentry/templates/workers-deployment.yaml
+++ b/stable/sentry/templates/workers-deployment.yaml
@@ -27,6 +27,10 @@ spec:
       {{- if .Values.worker.tolerations }}
       tolerations:
 {{ toYaml .Values.worker.tolerations | indent 8 }}
+      {{- end }}
+      {{- if .Values.image.imagePullSecrets }}
+      imagePullSecrets:
+{{ toYaml .Values.image.imagePullSecrets | indent 8 }}
       {{- end }}
       containers:
       - name: {{ .Chart.Name }}-workers
diff --git a/stable/sentry/values.yaml b/stable/sentry/values.yaml
index 27d3db47d4..c64a29b830 100644
--- a/stable/sentry/values.yaml
+++ b/stable/sentry/values.yaml
@@ -3,8 +3,11 @@
 # Declare variables to be passed into your templates.
 image:
   repository: sentry
-  tag: "8.20"
+  tag: "8.22"
   pullPolicy: IfNotPresent
+  # Add the secret name to pull from a private registry.
+  imagePullSecrets: []
+  # - name:
 
 # How many web UI instances to run
 web: