allow configure of proxy image (istio#9565)

* allow configure of proxy image when it has / in it * Update install/kubernetes/helm/subcharts/mixer/templates/deployment.yaml allow configure of proxy image istio#9565 * add $. to hope to fix the parsing error * fix space issue * delete not needed file * delete not needed file
AmitKumarDas · Oct 31, 2018 · 6b46169 · 6b46169
1 parent 4d9d7d6
commit 6b46169
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/install/kubernetes/helm/subcharts/mixer/templates/deployment.yaml b/install/kubernetes/helm/subcharts/mixer/templates/deployment.yaml
@@ -73,16 +73,20 @@
           initialDelaySeconds: 5
           periodSeconds: 5
       - name: istio-proxy
+{{- if contains "/" $.Values.global.proxy.image }}
+        image: "{{ $.Values.global.proxy.image }}"
+{{- else }}
         image: "{{ $.Values.global.hub }}/{{ $.Values.global.proxy.image }}:{{ $.Values.global.tag }}"
+{{- end }}
         imagePullPolicy: {{ $.Values.global.imagePullPolicy }}
         ports:
         - containerPort: 9091
         - containerPort: 15004
-{{ if ne .Values.global.proxy.stats.prometheusPort 0. }}
+{{- if ne .Values.global.proxy.stats.prometheusPort 0. }}
         - containerPort: {{ .Values.global.proxy.stats.prometheusPort }}
           protocol: TCP
           name: http-envoy-prom
-{{ end }}
+{{- end }}
         args:
         - proxy
         - --serviceCluster
@@ -200,17 +204,21 @@
           initialDelaySeconds: 5
           periodSeconds: 5
       - name: istio-proxy
+{{- if contains "/" $.Values.global.proxy.image }}
+        image: "{{ $.Values.global.proxy.image }}"
+{{- else }}
         image: "{{ $.Values.global.hub }}/{{ $.Values.global.proxy.image }}:{{ $.Values.global.tag }}"
+{{- end }}
         imagePullPolicy: {{ $.Values.global.imagePullPolicy }}
         ports:
         - containerPort: 9091
         - containerPort: 15004
-{{ if ne .Values.global.proxy.stats.prometheusPort 0. }}
+{{- if ne .Values.global.proxy.stats.prometheusPort 0. }}
         ports:
         - containerPort: {{ .Values.global.proxy.stats.prometheusPort }}
           protocol: TCP
           name: http-envoy-prom
-{{ end }}
+{{- end }}
         args:
         - proxy
 {{- if $.Values.global.proxy.proxyDomain }}

diff --git a/install/kubernetes/helm/subcharts/pilot/templates/deployment.yaml b/install/kubernetes/helm/subcharts/pilot/templates/deployment.yaml
@@ -113,7 +113,11 @@ spec:
             readOnly: true
 {{- if .Values.sidecar }}
         - name: istio-proxy
+{{- if contains "/" .Values.global.proxy.image }}
+          image: "{{ .Values.global.proxy.image }}"
+{{- else }}
           image: "{{ .Values.global.hub }}/{{ .Values.global.proxy.image }}:{{ .Values.global.tag }}"
+{{- end }}
           imagePullPolicy: {{ .Values.global.imagePullPolicy }}
           ports:
           - containerPort: 15003

diff --git a/test.yaml b/test.yaml