From 46204a91716ae1966ee5e0d5c493420b766665b5 Mon Sep 17 00:00:00 2001
From: Brenda Rearden <brenda@rancher.com>
Date: Wed, 9 Sep 2020 17:04:25 -0700
Subject: [PATCH] Add cattle system registry

---
 packages/rancher-istio/charts/templates/_helpers.tpl | 4 ++--
 packages/rancher-istio/charts/values.yaml            | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/rancher-istio/charts/templates/_helpers.tpl b/packages/rancher-istio/charts/templates/_helpers.tpl
index c9ff6d396..3f7af953a 100644
--- a/packages/rancher-istio/charts/templates/_helpers.tpl
+++ b/packages/rancher-istio/charts/templates/_helpers.tpl
@@ -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 -}}
diff --git a/packages/rancher-istio/charts/values.yaml b/packages/rancher-istio/charts/values.yaml
index a21137a28..b6470c1cb 100644
--- a/packages/rancher-istio/charts/values.yaml
+++ b/packages/rancher-istio/charts/values.yaml
@@ -54,7 +54,8 @@ sidecarInjectorWebhook:
   rewriteAppHTTPProbe: true
 
 global:
-  systemDefaultRegistry: ""
+  cattle:
+    systemDefaultRegistry: ""
   proxy:
     repository: rancher/istio-proxyv2
     tag: 1.6.8