Merge pull request #5 from johnlanni/change-helm

adjust istio helm

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

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

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