move values to global

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 }}

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

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