(dev-v2.6-archive) Merge pull request #1655 from ryansann/rancher-webhook-0.2.2

(partially cherry picked from commit 4fc1527822)

packages/rancher-istio/charts/templates/istio-install-job.yaml

@@ -42,6 +42,11 @@ spec:
             mountPath: /app/overlay-config.yaml
             subPath: overlay-config.yaml
           {{- end }}
+          {{- if .Values.installer.releaseMirror.additionalIstioImage.enabled }}
+          - name: {{ .Values.installer.releaseMirror.additionalIstioImage.volumeMountName }}
+            mountPath: /opt/istio-releases/{{ .Values.installer.releaseMirror.additionalIstioImage.tag }}/istio-{{ .Values.installer.releaseMirror.additionalIstioImage.tag }}-linux-amd64.tar.gz
+            subPath: istio-{{ .Values.installer.releaseMirror.additionalIstioImage.tag }}-linux-amd64.tar.gz
+          {{- end }}
       volumes:
         - name: config-volume
           configMap:
@@ -51,6 +56,9 @@ spec:
           configMap:
             name: istio-installer-overlay
         {{- end }}
+{{- if .Values.installer.releaseMirror.additionalIstioImage.enabled }}
+{{ toYaml .Values.installer.releaseMirror.additionalIstioImage.volumes | indent 8 }}
+{{- end }}
       serviceAccountName: istio-installer
       securityContext:
         runAsUser: 101

packages/rancher-istio/charts/values.yaml

@@ -11,6 +11,17 @@ installer:
   ##for airgap setups. Setting releaseMirror.enabled to false means istio will call externally to github to fetch the required assets.
   releaseMirror:
     enabled: false
+    ##If the image you need is not packaged with the rancher/istio-installer, create a volume mount with the istio-{{ .Values.installer.additionalIstioImage.tag }}-linux-amd64.tar.gz
+    ##file in it and set the additionalIstioImage values to connect to the volume prior to installing/upgrading your rancher-istio chart.  
+    additionalIstioImage:
+      enabled: false
+      volumeMountName: rancher-istio-additional-image
+      volumes:
+        - name: rancher-istio-additional-image
+          persistentVolumeClaim:
+            claimName: rancher-istio-additional-image
+            readOnly: false
+      tag: 1.10.4
       
   ##Set the secondsSleep to run a sleep command `sleep <secondsSleep>s` to allow time to exec into istio-installer pod for debugging
   debug:

packages/rancher-webhook/package.yaml

@@ -1,2 +1,2 @@
-url: https://github.com/rancher/webhook/releases/download/v0.2.2-rc2/rancher-webhook-0.2.2-rc2.tgz
+url: https://github.com/rancher/webhook/releases/download/v0.2.2/rancher-webhook-0.2.2.tgz
 version: 1.0.2