From a6cb214d894b18350d7f1e1837825ea8abcd3201 Mon Sep 17 00:00:00 2001 From: brendarearden Date: Wed, 15 Dec 2021 07:32:26 -0700 Subject: [PATCH] (dev-v2.6-archive) Remove additional image volume mount support (partially cherry picked from commit 01463307a6ef928419c5de9dc363d8063272946b) --- .../charts/templates/istio-install-job.yaml | 8 -------- packages/rancher-istio/charts/values.yaml | 11 ----------- 2 files changed, 19 deletions(-) diff --git a/packages/rancher-istio/charts/templates/istio-install-job.yaml b/packages/rancher-istio/charts/templates/istio-install-job.yaml index c687b6a7f..625da0832 100644 --- a/packages/rancher-istio/charts/templates/istio-install-job.yaml +++ b/packages/rancher-istio/charts/templates/istio-install-job.yaml @@ -42,11 +42,6 @@ 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: @@ -56,9 +51,6 @@ 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 diff --git a/packages/rancher-istio/charts/values.yaml b/packages/rancher-istio/charts/values.yaml index 0a6ba71f9..0b35794f1 100644 --- a/packages/rancher-istio/charts/values.yaml +++ b/packages/rancher-istio/charts/values.yaml @@ -11,17 +11,6 @@ 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 s` to allow time to exec into istio-installer pod for debugging debug: