From 99dba82a66296cb53744cddf289542f25205c563 Mon Sep 17 00:00:00 2001
From: Michael Lin <michael.lin1@ibm.com>
Date: Mon, 22 Nov 2021 11:57:37 -0800
Subject: [PATCH] feat(pontoon): able to override busybox image (#4)

---
 charts/pontoon/Chart.yaml                                   | 2 +-
 charts/pontoon/templates/pontoon-deployment.yaml            | 3 ++-
 charts/pontoon/templates/pontoon-sync-projects-cronjob.yaml | 3 ++-
 charts/pontoon/templates/pontoon-worker-deployment.yaml     | 3 ++-
 charts/pontoon/values.yaml                                  | 5 +++++
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/charts/pontoon/Chart.yaml b/charts/pontoon/Chart.yaml
index 9aac0c7..bfc2134 100644
--- a/charts/pontoon/Chart.yaml
+++ b/charts/pontoon/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: pontoon
 home: https://github.com/mozilla/pontoon
-version: 1.5.0
+version: 1.6.0
 # Pontoon no longer cuts releases.
 # See https://github.com/mozilla/pontoon/releases/tag/2018-12-19
 # and https://hub.docker.com/r/skillsnetwork/pontoon/tags
diff --git a/charts/pontoon/templates/pontoon-deployment.yaml b/charts/pontoon/templates/pontoon-deployment.yaml
index 4fbdd05..d8aa02c 100644
--- a/charts/pontoon/templates/pontoon-deployment.yaml
+++ b/charts/pontoon/templates/pontoon-deployment.yaml
@@ -45,7 +45,8 @@ spec:
       {{- if or .Values.ssh.config .Values.ssh.privateKeys }}
       initContainers:
         - name: copy-ssh-secrets
-          image: "busybox"
+          image: "{{ .Values.ssh.image.repository }}:{{ .Values.ssh.image.tag }}"
+          imagePullPolicy: {{ .Values.ssh.image.pullPolicy }}
           command:
             - "cp"
             - "-r"
diff --git a/charts/pontoon/templates/pontoon-sync-projects-cronjob.yaml b/charts/pontoon/templates/pontoon-sync-projects-cronjob.yaml
index 0048848..7eb6ea3 100644
--- a/charts/pontoon/templates/pontoon-sync-projects-cronjob.yaml
+++ b/charts/pontoon/templates/pontoon-sync-projects-cronjob.yaml
@@ -50,7 +50,8 @@ spec:
           {{- if or (or .Values.ssh.config .Values.ssh.privateKeys) .Values.syncProjectCronjob.initContainers }}
           initContainers:
             - name: copy-ssh-secrets
-              image: "busybox"
+              image: "{{ .Values.ssh.image.repository }}:{{ .Values.ssh.image.tag }}"
+              imagePullPolicy: {{ .Values.ssh.image.pullPolicy }}
               command:
                 - "cp"
                 - "-r"
diff --git a/charts/pontoon/templates/pontoon-worker-deployment.yaml b/charts/pontoon/templates/pontoon-worker-deployment.yaml
index ebee22e..674a427 100644
--- a/charts/pontoon/templates/pontoon-worker-deployment.yaml
+++ b/charts/pontoon/templates/pontoon-worker-deployment.yaml
@@ -45,7 +45,8 @@ spec:
       {{- if or .Values.ssh.config .Values.ssh.privateKeys }}
       initContainers:
         - name: copy-ssh-secrets
-          image: "busybox"
+          image: "{{ .Values.ssh.image.repository }}:{{ .Values.ssh.image.tag }}"
+          imagePullPolicy: {{ .Values.ssh.image.pullPolicy }}
           command:
             - "cp"
             - "-r"
diff --git a/charts/pontoon/values.yaml b/charts/pontoon/values.yaml
index cdd9d3d..67a9a73 100644
--- a/charts/pontoon/values.yaml
+++ b/charts/pontoon/values.yaml
@@ -51,6 +51,11 @@ ssh:
   config: ""
   mountPath: "/home/pontoon/.ssh"
 
+  image:
+    repository: busybox
+    pullPolicy: IfNotPresent
+    tag: "latest"
+
 replicaCount: 1
 image:
   repository: skillsnetwork/pontoon