feat: fix ingressControllerMode and ingressClass (#62)

Signed-off-by: xianyanglin <xianyanglinde@163.com>
hango-io · Jul 28, 2023 · 601baac · 601baac
1 parent 69fcd45
commit 601baac
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...go-gateway/charts/hango-gateway/templates/base/hango-gateway/hango-gateway-configmap.yaml b/...go-gateway/charts/hango-gateway/templates/base/hango-gateway/hango-gateway-configmap.yaml
@@ -53,7 +53,9 @@ data:
     localityLbSetting:
       enabled: false
 
-    ingressControllerMode: 1
+    ingressControllerMode: 3
+    ingressClass: hango
+
 
     # DNS refresh rate for Envoy clusters of type STRICT_DNS
     dnsRefreshRate: 300s

diff --git a/...hango-gateway/charts/hango-gateway/templates/base/hango-gateway/hango-gateway-deploy.yaml b/...hango-gateway/charts/hango-gateway/templates/base/hango-gateway/hango-gateway-deploy.yaml
@@ -45,7 +45,7 @@ spec:
             - name: NCE_PORT
               value: "10880"
             - name: NCE_JAVA_OPTS
-              value: "-DistioNamespace={{ .Values.namespace }} -DgatewayNamespace={{ .Values.namespace }} -DistioName=istiod -DstartInformer=false -DresourceNamespace={{ .Values.namespace }} -DmeshRegistryName=slime-hango"
+              value: "-DistioNamespace={{ .Values.namespace }} -DistioRev={{ .Values.istio_rev }} -DgatewayNamespace={{ .Values.namespace }} -DistioName=istiod -DstartInformer=false -DresourceNamespace={{ .Values.namespace }} -DmeshRegistryName=slime-hango"
           image: "{{.Values.images.hango_apiplane_image}}"
           resources:
             requests:
@@ -207,6 +207,8 @@ spec:
           env:
             - name: KUBE_NAMESPACE_WHITELIST
               value: {{ .Values.namespace }}
+            - name: K8S_INGRESS_LABEL
+              value: gw_cluster:{{ .Values.gateway_cluster}}
             - name: REVISION
               value: {{ .Values.istio_rev }}
             - name: JWT_POLICY