fix: gateway deployed by istiod didn't use delta xds (#646)

Signed-off-by: spacewander <[email protected]>
mosn · Jul 26, 2024 · 51ae4cb · 51ae4cb
1 parent 6ca9062
commit 51ae4cb
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 8 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -64,14 +64,9 @@ jobs:
           exit 1
         fi
         popd
-        make gen-helm-schema
+        make gen-helm
         if ! git diff --exit-code; then
-          echo "Generated files are not up-to-date. Please run 'make gen-helm-schema' and commit changes."
-          exit 1
-        fi
-        make gen-helm-docs
-        if ! git diff --exit-code; then
-          echo "Generated files are not up-to-date. Please run 'make gen-helm-docs' and commit changes."
+          echo "Generated files are not up-to-date. Please run 'make gen-helm' and commit changes."
           exit 1
         fi
 

diff --git a/Makefile b/Makefile
@@ -52,6 +52,9 @@ gen-helm-schema: $(LOCALBIN)
 		pushd ./${CHART} && $(LOCALBIN)/helm-schema -n -k additionalProperties || exit 1; popd; \
 	)
 
+.PHONY: gen-helm
+gen-helm: gen-helm-docs gen-helm-schema
+
 .PHONY: dev-tools
 dev-tools:
 	@if ! docker images ${DEV_TOOLS_IMAGE} | grep dev-tools > /dev/null; then \

diff --git a/manifests/charts/htnn-controller/README.md b/manifests/charts/htnn-controller/README.md
@@ -106,6 +106,7 @@ helm uninstall htnn-controller -n istio-system
 | istiodRemote.injectionCABundle | string | `""` |  |
 | istiodRemote.injectionPath | string | `"/inject"` |  |
 | istiodRemote.injectionURL | string | `""` |  |
+| meshConfig.defaultConfig.proxyMetadata.ISTIO_DELTA_XDS | string | `"true"` |  |
 | meshConfig.enablePrometheusMerge | bool | `true` |  |
 | ownerName | string | `""` |  |
 | pilot.affinity | object | `{}` |  |

diff --git a/manifests/charts/htnn-controller/values.schema.json b/manifests/charts/htnn-controller/values.schema.json
@@ -627,6 +627,29 @@
     },
     "meshConfig": {
       "properties": {
+        "defaultConfig": {
+          "properties": {
+            "proxyMetadata": {
+              "properties": {
+                "ISTIO_DELTA_XDS": {
+                  "default": "true",
+                  "title": "ISTIO_DELTA_XDS",
+                  "type": "string"
+                }
+              },
+              "title": "proxyMetadata",
+              "type": "object",
+              "required": [
+                "ISTIO_DELTA_XDS"
+              ]
+            }
+          },
+          "title": "defaultConfig",
+          "type": "object",
+          "required": [
+            "proxyMetadata"
+          ]
+        },
         "enablePrometheusMerge": {
           "default": "true",
           "title": "enablePrometheusMerge",
@@ -637,7 +660,8 @@
       "title": "meshConfig",
       "type": "object",
       "required": [
-        "enablePrometheusMerge"
+        "enablePrometheusMerge",
+        "defaultConfig"
       ]
     },
     "ownerName": {

diff --git a/manifests/charts/htnn-controller/values.yaml b/manifests/charts/htnn-controller/values.yaml
@@ -203,6 +203,9 @@ ownerName: ""
 # See https://istio.io/docs/reference/config/istio.mesh.v1alpha1/ for all available options
 meshConfig:
   enablePrometheusMerge: true
+  defaultConfig:
+    proxyMetadata:
+      ISTIO_DELTA_XDS: "true"
 
 experimental:
   stableValidationPolicy: false