(dev-v2.6-archive) Merge pull request #667 from brendarearden/image-updates

Set installer repo,tag in values.yaml

(partially cherry picked from commit 34676b359a)

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 }}

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 }}

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: