diff --git a/Makefile.core.mk b/Makefile.core.mk index 6a93c5b87..5c3dfb7d8 100644 --- a/Makefile.core.mk +++ b/Makefile.core.mk @@ -188,7 +188,7 @@ install: pre-install helm install higress helm/higress -n higress-system --create-namespace --set 'global.local=true' ENVOY_LATEST_IMAGE_TAG ?= 958467a353d411ae3f06e03b096bfd342cddb2c6 -ISTIO_LATEST_IMAGE_TAG ?= 958467a353d411ae3f06e03b096bfd342cddb2c6 +ISTIO_LATEST_IMAGE_TAG ?= 01ad224eff2bb7eb200869fc64221f739a48e07e install-dev: pre-install helm install higress helm/core -n higress-system --create-namespace --set 'controller.tag=$(TAG)' --set 'gateway.replicas=1' --set 'pilot.tag=$(ISTIO_LATEST_IMAGE_TAG)' --set 'gateway.tag=$(ENVOY_LATEST_IMAGE_TAG)' --set 'global.local=true' diff --git a/VERSION b/VERSION index 792691530..666f1ab89 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.6-rc.1 +v2.0.6-rc.2 diff --git a/helm/core/Chart.yaml b/helm/core/Chart.yaml index a15599223..cae16deae 100644 --- a/helm/core/Chart.yaml +++ b/helm/core/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 2.0.6-rc.1 +appVersion: 2.0.6-rc.2 description: Helm chart for deploying higress gateways icon: https://higress.io/img/higress_logo_small.png home: http://higress.io/ @@ -10,4 +10,4 @@ name: higress-core sources: - http://github.com/alibaba/higress type: application -version: 2.0.6-rc.1 +version: 2.0.6-rc.2 diff --git a/helm/core/templates/controller-deployment.yaml b/helm/core/templates/controller-deployment.yaml index 84a741143..38a770248 100644 --- a/helm/core/templates/controller-deployment.yaml +++ b/helm/core/templates/controller-deployment.yaml @@ -136,8 +136,10 @@ spec: periodSeconds: 3 timeoutSeconds: 5 env: + - name: ENABLE_PUSH_ALL_MCP_CLUSTERS + value: "{{ .Values.global.enablePushAllMCPClusters }}" - name: PILOT_ENABLE_LDS_CACHE - valvue: "{{ .Values.global.enableLDSCache }}" + value: "{{ .Values.global.enableLDSCache }}" - name: PILOT_ENABLE_QUIC_LISTENERS value: "true" - name: VALIDATION_WEBHOOK_CONFIG_NAME diff --git a/helm/core/values.yaml b/helm/core/values.yaml index 936ec62fb..7c212e682 100644 --- a/helm/core/values.yaml +++ b/helm/core/values.yaml @@ -4,6 +4,7 @@ global: enableIPv6: false enableProxyProtocol: false enableLDSCache: true + enablePushAllMCPClusters: true liteMetrics: false xdsMaxRecvMsgSize: "104857600" defaultUpstreamConcurrencyThreshold: 10000 diff --git a/helm/higress/Chart.lock b/helm/higress/Chart.lock index 642611d6f..93eca6f17 100644 --- a/helm/higress/Chart.lock +++ b/helm/higress/Chart.lock @@ -1,9 +1,9 @@ dependencies: - name: higress-core repository: file://../core - version: 2.0.6-rc.1 + version: 2.0.6-rc.2 - name: higress-console repository: https://higress.io/helm-charts/ - version: 2.0.0 -digest: sha256:66a5261f3d68abf63d2bade50e36ac696bec8aac909442d328fd5d395bf4bc21 -generated: "2025-01-08T17:14:12.432022+08:00" + version: 2.0.1 +digest: sha256:084449006a5b90bdffad7ef47fdfd02924412e67297bcce6d216efdc12c02acf +generated: "2025-01-14T19:37:32.036755+08:00" diff --git a/helm/higress/Chart.yaml b/helm/higress/Chart.yaml index 7a91e1bde..fd8c91eaa 100644 --- a/helm/higress/Chart.yaml +++ b/helm/higress/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 2.0.6-rc.1 +appVersion: 2.0.6-rc.2 description: Helm chart for deploying Higress gateways icon: https://higress.io/img/higress_logo_small.png home: http://higress.io/ @@ -12,9 +12,9 @@ sources: dependencies: - name: higress-core repository: "file://../core" - version: 2.0.6-rc.1 + version: 2.0.6-rc.2 - name: higress-console repository: "https://higress.io/helm-charts/" - version: 2.0.0 + version: 2.0.1 type: application -version: 2.0.6-rc.1 +version: 2.0.6-rc.2 diff --git a/helm/higress/README.md b/helm/higress/README.md index fa6980494..61f62a693 100644 --- a/helm/higress/README.md +++ b/helm/higress/README.md @@ -164,6 +164,7 @@ The command removes all the Kubernetes components associated with the chart and | global.enableIstioAPI | bool | `true` | If true, Higress Controller will monitor istio resources as well | | global.enableLDSCache | bool | `true` | | | global.enableProxyProtocol | bool | `false` | | +| global.enablePushAllMCPClusters | bool | `true` | | | global.enableSRDS | bool | `true` | | | global.enableStatus | bool | `true` | If true, Higress Controller will update the status field of Ingress resources. When migrating from Nginx Ingress, in order to avoid status field of Ingress objects being overwritten, this parameter needs to be set to false, so Higress won't write the entry IP to the status field of the corresponding Ingress object. | | global.externalIstiod | bool | `false` | Configure a remote cluster data plane controlled by an external istiod. When set to true, istiod is not deployed locally and only a subset of the other discovery charts are enabled. | diff --git a/istio/istio b/istio/istio index 81a46c581..4253037d5 160000 --- a/istio/istio +++ b/istio/istio @@ -1 +1 @@ -Subproject commit 81a46c581f6b9a82ddf3786bb0bd6fdb75050744 +Subproject commit 4253037d5fa1ebd62eb2d38b278ee4e9b2c73049