From 6f95297b806cb49632265b99836f688def1f0700 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BE=84=E6=BD=AD?= Date: Tue, 14 Jan 2025 20:10:53 +0800 Subject: [PATCH] Release 2.0.6-rc.2 (#1671) --- Makefile.core.mk | 2 +- VERSION | 2 +- helm/core/Chart.yaml | 4 ++-- helm/core/templates/controller-deployment.yaml | 4 +++- helm/core/values.yaml | 1 + helm/higress/Chart.lock | 8 ++++---- helm/higress/Chart.yaml | 8 ++++---- helm/higress/README.md | 1 + istio/istio | 2 +- 9 files changed, 18 insertions(+), 14 deletions(-) diff --git a/Makefile.core.mk b/Makefile.core.mk index 6a93c5b874..5c3dfb7d84 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 792691530d..666f1ab89f 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 a155992233..cae16deaec 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 84a7411435..38a7702480 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 936ec62fbb..7c212e6829 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 642611d6f0..93eca6f177 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 7a91e1bdee..fd8c91eaaa 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 fa6980494b..61f62a693f 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 81a46c581f..4253037d5f 160000 --- a/istio/istio +++ b/istio/istio @@ -1 +1 @@ -Subproject commit 81a46c581f6b9a82ddf3786bb0bd6fdb75050744 +Subproject commit 4253037d5fa1ebd62eb2d38b278ee4e9b2c73049