From 237e44a8f1bda850a012c240f1ca39509171be15 Mon Sep 17 00:00:00 2001
From: Brenda Rearden <brenda@rancher.com>
Date: Fri, 18 Sep 2020 16:41:06 -0700
Subject: [PATCH] (dev-v2.6-archive) Merge pull request #667 from
 brendarearden/image-updates

Set installer repo,tag in values.yaml

(partially cherry picked from commit 34676b359adbae3409415ea9c3fe0003e6a4b8a4)
---
 .../rancher-istio/charts/templates/istio-install-job.yaml    | 2 +-
 .../rancher-istio/charts/templates/istio-uninstall-job.yaml  | 2 +-
 packages/rancher-istio/charts/values.yaml                    | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/rancher-istio/charts/templates/istio-install-job.yaml b/packages/rancher-istio/charts/templates/istio-install-job.yaml
index 24604673e..0e9c732e1 100644
--- a/packages/rancher-istio/charts/templates/istio-install-job.yaml
+++ b/packages/rancher-istio/charts/templates/istio-install-job.yaml
@@ -13,7 +13,7 @@ spec:
     spec:
       containers:
         - name: istioctl-installer
-          image: rancher/istio-installer:{{ .Values.installerVersion }}
+          image: {{ template "system_default_registry" . }}{{ .Values.installer.repository }}:{{ .Values.installer.tag }}
           env:
           - name: RELEASE_NAME
             value: {{ .Release.Name }}
diff --git a/packages/rancher-istio/charts/templates/istio-uninstall-job.yaml b/packages/rancher-istio/charts/templates/istio-uninstall-job.yaml
index 937722a04..b5946e55f 100644
--- a/packages/rancher-istio/charts/templates/istio-uninstall-job.yaml
+++ b/packages/rancher-istio/charts/templates/istio-uninstall-job.yaml
@@ -12,7 +12,7 @@ spec:
     spec:
       containers:
         - name: istioctl-uninstaller
-          image: rancher/istio-installer:{{ .Values.installerVersion }}
+          image: {{ template "system_default_registry" . }}{{ .Values.installer.repository }}:{{ .Values.installer.tag }}
           env:
           - name: RELEASE_NAME
             value: {{ .Release.Name }}
diff --git a/packages/rancher-istio/charts/values.yaml b/packages/rancher-istio/charts/values.yaml
index a7f1be8fa..90e467be3 100644
--- a/packages/rancher-istio/charts/values.yaml
+++ b/packages/rancher-istio/charts/values.yaml
@@ -1,8 +1,11 @@
 overlayFile: ""
 tag: 1.7.1
-installerVersion: 1.7.1-rancher1
 forceInstall: false
 
+installer:
+  repository: rancher/istio-installer
+  tag: 1.7.1-rancher1
+
 istiocoredns:
     enabled: false
     image: