From 7d5d505b7df2193bfce70ae5830a835577c2fab6 Mon Sep 17 00:00:00 2001
From: zty98751 <zty98751@alibaba-inc.com>
Date: Tue, 1 Nov 2022 18:46:21 +0800
Subject: [PATCH] move values to global

---
 helm/istiod/templates/configmap.yaml  | 2 +-
 helm/istiod/templates/deployment.yaml | 4 ++--
 helm/istiod/values.yaml               | 8 +++-----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/helm/istiod/templates/configmap.yaml b/helm/istiod/templates/configmap.yaml
index 4b52f424d..fed6c9d7a 100644
--- a/helm/istiod/templates/configmap.yaml
+++ b/helm/istiod/templates/configmap.yaml
@@ -11,7 +11,7 @@
 
     configSources:
       - address: k8s://
-      - address: {{ printf "xds://%s.%s:%s" .Values.higress.name .Values.higress.namespace .Values.higress.port }}
+      - address: {{ printf "xds://%s.%s:%s" .Values.global.higressName .Values.global.higressNamespace .Values.global.higressPort }}
 
     defaultConfig:
       {{- if .Values.global.meshID }}
diff --git a/helm/istiod/templates/deployment.yaml b/helm/istiod/templates/deployment.yaml
index 2c2625728..b0c8ab69c 100644
--- a/helm/istiod/templates/deployment.yaml
+++ b/helm/istiod/templates/deployment.yaml
@@ -113,9 +113,9 @@ spec:
             timeoutSeconds: 5
           env:
           - name: HIGRESS_CONTROLLER_SVC
-            value: {{ printf "%s.%s" .Values.higress.name .Values.higress.namespace }}
+            value: {{ printf "%s.%s" .Values.global.higressName .Values.global.higressNamespace }}
           - name: HIGRESS_CONTROLLER_PORT
-            value: "{{ .Values.higress.port }}"
+            value: "{{ .Values.global.higressPort }}"
           - name: REVISION
             value: "{{ .Values.revision | default `default` }}"
           - name: JWT_POLICY
diff --git a/helm/istiod/values.yaml b/helm/istiod/values.yaml
index 39e424e8f..80ac6591d 100644
--- a/helm/istiod/values.yaml
+++ b/helm/istiod/values.yaml
@@ -1,8 +1,3 @@
-higress:
-  name: higress-controller
-  namespace: higress-system
-  port: "15051"
-
 #.Values.pilot for discovery and mesh wide config
 
 ## Discovery Settings
@@ -226,6 +221,9 @@ meshConfig:
   # No hurry to do this in 1.6, we're trying to prove the code.
 
 global:
+  higressName: "higress-controller"
+  higressNamespace: "higress-system"
+  higressPort: "15051"
   # Used to locate istiod.
   istioNamespace: istio-system
   # enable pod disruption budget for the control plane, which is used to