(dev-v2.6-archive) Remove additional image volume mount support

(partially cherry picked from commit 01463307a6)
pull/1680/head
brendarearden 2021-12-15 07:32:26 -07:00 committed by Arvind Iyengar
parent 7f610e7b83
commit a6cb214d89
No known key found for this signature in database
GPG Key ID: A8DD9BFD6C811498
2 changed files with 0 additions and 19 deletions

View File

@ -42,11 +42,6 @@ spec:
mountPath: /app/overlay-config.yaml mountPath: /app/overlay-config.yaml
subPath: overlay-config.yaml subPath: overlay-config.yaml
{{- end }} {{- 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: volumes:
- name: config-volume - name: config-volume
configMap: configMap:
@ -56,9 +51,6 @@ spec:
configMap: configMap:
name: istio-installer-overlay name: istio-installer-overlay
{{- end }} {{- end }}
{{- if .Values.installer.releaseMirror.additionalIstioImage.enabled }}
{{ toYaml .Values.installer.releaseMirror.additionalIstioImage.volumes | indent 8 }}
{{- end }}
serviceAccountName: istio-installer serviceAccountName: istio-installer
securityContext: securityContext:
runAsUser: 101 runAsUser: 101

View File

@ -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. ##for airgap setups. Setting releaseMirror.enabled to false means istio will call externally to github to fetch the required assets.
releaseMirror: releaseMirror:
enabled: false 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 ##Set the secondsSleep to run a sleep command `sleep <secondsSleep>s` to allow time to exec into istio-installer pod for debugging
debug: debug: