From c3fe040e10d353eaf264976dbfd53fca0cbacffc Mon Sep 17 00:00:00 2001
From: zty98751 <zty98751@alibaba-inc.com>
Date: Tue, 1 Nov 2022 17:16:08 +0800
Subject: [PATCH] adjust istio helm

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

diff --git a/helm/istiod/templates/configmap.yaml b/helm/istiod/templates/configmap.yaml
index 64ca98039..4b52f424d 100644
--- a/helm/istiod/templates/configmap.yaml
+++ b/helm/istiod/templates/configmap.yaml
@@ -11,7 +11,7 @@
 
     configSources:
       - address: k8s://
-      - address: {{ .Values.higress.xds }}
+      - address: {{ printf "xds://%s.%s:%s" .Values.higress.name .Values.higress.namespace .Values.higress.port }}
 
     defaultConfig:
       {{- if .Values.global.meshID }}
diff --git a/helm/istiod/templates/deployment.yaml b/helm/istiod/templates/deployment.yaml
index 167466efa..2c2625728 100644
--- a/helm/istiod/templates/deployment.yaml
+++ b/helm/istiod/templates/deployment.yaml
@@ -112,6 +112,10 @@ spec:
             periodSeconds: 3
             timeoutSeconds: 5
           env:
+          - name: HIGRESS_CONTROLLER_SVC
+            value: {{ printf "%s.%s" .Values.higress.name .Values.higress.namespace }}
+          - name: HIGRESS_CONTROLLER_PORT
+            value: "{{ .Values.higress.port }}"
           - name: REVISION
             value: "{{ .Values.revision | default `default` }}"
           - name: JWT_POLICY
diff --git a/helm/istiod/values.yaml b/helm/istiod/values.yaml
index 01bf02c80..39e424e8f 100644
--- a/helm/istiod/values.yaml
+++ b/helm/istiod/values.yaml
@@ -1,5 +1,7 @@
 higress:
-  xds: "xds://higress-controller.higress-system:15051"
+  name: higress-controller
+  namespace: higress-system
+  port: "15051"
 
 #.Values.pilot for discovery and mesh wide config
 
@@ -30,8 +32,6 @@ pilot:
     PILOT_ENABLE_METADATA_EXCHANGE: "false"
     PILOT_ENABLE_CROSS_CLUSTER_WORKLOAD_ENTRY: "false"
     VALIDATION_ENABLED: "false"
-    HIGRESS_CONTROLLER_SVC: "higress-controller.higress-system"
-    HIGRESS_CONTROLLER_PORT: "15051"
 
   cpu:
     targetAverageUtilization: 80