From 98b059a759f2baf789805b89cc4b17b79b34e9ee Mon Sep 17 00:00:00 2001
From: Cassie Souza <cassie.c.souza@lmco.com>
Date: Tue, 8 Jun 2021 18:16:01 +0000
Subject: [PATCH 1/3] Templatize kubectl image

---
 chart/templates/bigbang/upgrade-job.yaml | 2 +-
 chart/values.yaml                        | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/chart/templates/bigbang/upgrade-job.yaml b/chart/templates/bigbang/upgrade-job.yaml
index 3231361..4046af1 100644
--- a/chart/templates/bigbang/upgrade-job.yaml
+++ b/chart/templates/bigbang/upgrade-job.yaml
@@ -67,7 +67,7 @@ spec:
       serviceAccountName: {{ .Release.Name }}-bb-upgrade
       containers:
         - name: bb-{{ .Release.Name }}-upgrade
-          image: registry1.dso.mil/ironbank/gitlab/gitlab/kubectl:13.9.0
+          image: {{ $.Values.kubectl.image.repository }}
           command:
             - /bin/bash
             - -ec
diff --git a/chart/values.yaml b/chart/values.yaml
index ffd7e24..944f321 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -262,4 +262,8 @@ networkPolicies:
   enabled: false
   ingressLabels: 
     app: istio-ingressgateway
-    istio: ingressgateway
\ No newline at end of file
+    istio: ingressgateway
+
+kubectl:
+  image:
+    repository: registry1.dso.mil/ironbank/gitlab/gitlab/kubectl:13.9.0
-- 
GitLab


From ae1452349b4a763af42ab238335d81a5fa9db108 Mon Sep 17 00:00:00 2001
From: Cassie Souza <cassie.c.souza@lmco.com>
Date: Tue, 8 Jun 2021 17:33:31 -0500
Subject: [PATCH 2/3] MR comments

---
 chart/templates/bigbang/upgrade-job.yaml | 2 +-
 chart/values.yaml                        | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/chart/templates/bigbang/upgrade-job.yaml b/chart/templates/bigbang/upgrade-job.yaml
index 4046af1..118aeec 100644
--- a/chart/templates/bigbang/upgrade-job.yaml
+++ b/chart/templates/bigbang/upgrade-job.yaml
@@ -67,7 +67,7 @@ spec:
       serviceAccountName: {{ .Release.Name }}-bb-upgrade
       containers:
         - name: bb-{{ .Release.Name }}-upgrade
-          image: {{ $.Values.kubectl.image.repository }}
+          image: {{ $.Values.upgradeJob.image.repository }}:{{ $.Values.upgradeJob.image.tag }}
           command:
             - /bin/bash
             - -ec
diff --git a/chart/values.yaml b/chart/values.yaml
index 944f321..d38c026 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -264,6 +264,7 @@ networkPolicies:
     app: istio-ingressgateway
     istio: ingressgateway
 
-kubectl:
+upgradeJob:
   image:
-    repository: registry1.dso.mil/ironbank/gitlab/gitlab/kubectl:13.9.0
+    repository: registry1.dso.mil/ironbank/gitlab/gitlab/kubectl
+    tag: 13.9.0
-- 
GitLab


From 18d34324df8f296885b801334e2c616ee51c600c Mon Sep 17 00:00:00 2001
From: Cassie Souza <cassie.c.souza@lmco.com>
Date: Tue, 8 Jun 2021 17:52:13 -0500
Subject: [PATCH 3/3] Update chart version and changelog

---
 CHANGELOG.md     | 4 ++++
 chart/Chart.yaml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3264095..691c918 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ---
 
+## [0.1.14-bb.0] - 2021-06-08
+### Added
+- UpgradeJob image. Allow for overrides
+
 ## [0.1.13-bb.0] - 2021-06-04
 ### Added
 - Network Policy templates. Allow ingress from mattermost to elasticsearch
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 4ece8c4..df2158b 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: logging
-version: 0.1.13-bb.0
+version: 0.1.14-bb.0
 appVersion: 7.10.0
 dependencies:
   - name: bb-test-lib
-- 
GitLab