andata
/
rancher-charts
mirror of https://git.rancher.io/charts
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(dev-v2.6-archive) Add cattle system registry 

(partially cherry picked from commit 46204a9171)
pull/1680/head
Brenda Rearden 2020-09-09 17:04:25 -07:00 committed by Arvind Iyengar
parent 759d9a2f35
commit e2f6c101ab
No known key found for this signature in database
GPG Key ID: A8DD9BFD6C811498
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/rancher-istio/charts/templates/_helpers.tpl
View File

@ -4,8 +4,8 @@
{{- end -}}
{{- define "system_default_registry" -}}
{{- if .Values.global.systemDefaultRegistry -}}
{{- printf "%s/" .Values.global.systemDefaultRegistry -}}
{{- if .Values.global.cattle.systemDefaultRegistry -}}
{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}}
{{- else -}}
{{- "" -}}
{{- end -}}

3
packages/rancher-istio/charts/values.yaml
View File

@ -54,7 +54,8 @@ sidecarInjectorWebhook:
rewriteAppHTTPProbe: true
global:
systemDefaultRegistry: ""
cattle:
systemDefaultRegistry: ""
proxy:
repository: rancher/istio-proxyv2
tag: 1.6.8