From ce298054f179077260e533f9dcd95638118a76cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BE=84=E6=BD=AD?= Date: Tue, 3 Feb 2026 19:13:11 +0800 Subject: [PATCH] Release 2.1.10 (#3447) --- Makefile.core.mk | 2 +- VERSION | 2 +- envoy/envoy | 2 +- helm/core/Chart.yaml | 4 ++-- helm/core/charts/redis/values.yaml | 3 ++- helm/core/templates/_pod.tpl | 2 +- helm/core/templates/service.yaml | 3 --- helm/core/values.yaml | 12 ++++++------ helm/higress/Chart.lock | 6 +++--- helm/higress/Chart.yaml | 6 +++--- helm/higress/README.md | 12 ++++++------ istio/istio | 2 +- 12 files changed, 27 insertions(+), 29 deletions(-) diff --git a/Makefile.core.mk b/Makefile.core.mk index 8e04011bd..92067e9eb 100644 --- a/Makefile.core.mk +++ b/Makefile.core.mk @@ -146,7 +146,7 @@ docker-buildx-push: clean-env docker.higress-buildx export PARENT_GIT_TAG:=$(shell cat VERSION) export PARENT_GIT_REVISION:=$(TAG) -export ENVOY_PACKAGE_URL_PATTERN?=https://github.com/higress-group/proxy/releases/download/v2.2.0/envoy-symbol-ARCH.tar.gz +export ENVOY_PACKAGE_URL_PATTERN?=https://github.com/higress-group/proxy/releases/download/v2.1.10/envoy-symbol-ARCH.tar.gz build-envoy: prebuild ./tools/hack/build-envoy.sh diff --git a/VERSION b/VERSION index 9bb5a448a..dffa71b89 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.1.9 \ No newline at end of file +v2.1.10 \ No newline at end of file diff --git a/envoy/envoy b/envoy/envoy index 3fe314c69..0961b0071 160000 --- a/envoy/envoy +++ b/envoy/envoy @@ -1 +1 @@ -Subproject commit 3fe314c69802c18160065c30028c9f3f7a216e54 +Subproject commit 0961b00718307418dbaa42714e3f0b723efad0cb diff --git a/helm/core/Chart.yaml b/helm/core/Chart.yaml index ab0f45d56..513411ec7 100644 --- a/helm/core/Chart.yaml +++ b/helm/core/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 2.1.9 +appVersion: 2.1.10 description: Helm chart for deploying higress gateways icon: https://higress.io/img/higress_logo_small.png home: http://higress.io/ @@ -15,4 +15,4 @@ dependencies: repository: "file://../redis" version: 0.0.1 type: application -version: 2.1.9 +version: 2.1.10 diff --git a/helm/core/charts/redis/values.yaml b/helm/core/charts/redis/values.yaml index d1ca05b5a..05741b6d9 100644 --- a/helm/core/charts/redis/values.yaml +++ b/helm/core/charts/redis/values.yaml @@ -3,7 +3,8 @@ # Declare variables to be passed into your templates. global: # -- Specify the image registry and pull policy - hub: higress-registry.cn-hangzhou.cr.aliyuncs.com/higress + # Will inherit from parent chart's global.hub if not set + hub: "" # -- Specify image pull policy if default behavior isn't desired. # Default behavior: latest images will be Always else IfNotPresent. imagePullPolicy: "" diff --git a/helm/core/templates/_pod.tpl b/helm/core/templates/_pod.tpl index a5e680384..419a5af6d 100644 --- a/helm/core/templates/_pod.tpl +++ b/helm/core/templates/_pod.tpl @@ -203,7 +203,7 @@ template: {{- if $o11y.enabled }} {{- $config := $o11y.promtail }} - name: promtail - image: {{ $config.image.repository }}:{{ $config.image.tag }} + image: {{ $config.image.repository | default (printf "%s/promtail" .Values.global.hub) }}:{{ $config.image.tag }} imagePullPolicy: IfNotPresent args: - -config.file=/etc/promtail/promtail.yaml diff --git a/helm/core/templates/service.yaml b/helm/core/templates/service.yaml index 632134379..9a2e40be7 100644 --- a/helm/core/templates/service.yaml +++ b/helm/core/templates/service.yaml @@ -24,9 +24,6 @@ spec: {{- end }} {{- with .Values.gateway.service.externalTrafficPolicy }} externalTrafficPolicy: "{{ . }}" -{{- end }} -{{- with .Values.gateway.service.loadBalancerClass}} - loadBalancerClass: "{{ . }}" {{- end }} type: {{ .Values.gateway.service.type }} ports: diff --git a/helm/core/values.yaml b/helm/core/values.yaml index 363a28dad..ce2fee872 100644 --- a/helm/core/values.yaml +++ b/helm/core/values.yaml @@ -362,7 +362,7 @@ global: enabled: false promtail: image: - repository: higress-registry.cn-hangzhou.cr.aliyuncs.com/higress/promtail + repository: "" # Will use global.hub if not set tag: 2.9.4 port: 3101 resources: @@ -377,7 +377,7 @@ global: # The default value is "" and when caName="", the CA will be configured by other # mechanisms (e.g., environmental variable CA_PROVIDER). caName: "" -hub: higress-registry.cn-hangzhou.cr.aliyuncs.com/higress +hub: "" # Will use global.hub if not set clusterName: "" # -- meshConfig defines runtime configuration of components, including Istiod and istio-agent behavior @@ -433,7 +433,7 @@ gateway: # -- The readiness timeout seconds readinessTimeoutSeconds: 3 - hub: higress-registry.cn-hangzhou.cr.aliyuncs.com/higress + hub: "" # Will use global.hub if not set tag: "" # -- revision declares which revision this gateway is a part of revision: "" @@ -555,7 +555,7 @@ controller: replicas: 1 image: higress - hub: higress-registry.cn-hangzhou.cr.aliyuncs.com/higress + hub: "" # Will use global.hub if not set tag: "" env: {} @@ -651,7 +651,7 @@ pilot: rollingMaxSurge: 100% rollingMaxUnavailable: 25% - hub: higress-registry.cn-hangzhou.cr.aliyuncs.com/higress + hub: "" # Will use global.hub if not set tag: "" # -- Can be a full hub/image:tag @@ -804,7 +804,7 @@ pluginServer: replicas: 2 image: plugin-server - hub: higress-registry.cn-hangzhou.cr.aliyuncs.com/higress + hub: "" # Will use global.hub if not set tag: "" imagePullSecrets: [] diff --git a/helm/higress/Chart.lock b/helm/higress/Chart.lock index 20c5fa1c0..84c75ff3d 100644 --- a/helm/higress/Chart.lock +++ b/helm/higress/Chart.lock @@ -1,9 +1,9 @@ dependencies: - name: higress-core repository: file://../core - version: 2.1.9 + version: 2.1.10 - name: higress-console repository: https://higress.io/helm-charts/ version: 2.1.9 -digest: sha256:d696af6726b40219cc16e7cf8de7400101479dfbd8deb3101d7ee736415b9875 -generated: "2025-11-13T16:33:49.721553+08:00" +digest: sha256:fbb896461a8bdc1d5a4f8403253a59497b3b7a13909e9b92a4f3ce3f4f8d999d +generated: "2026-02-03T16:05:30.300315+08:00" diff --git a/helm/higress/Chart.yaml b/helm/higress/Chart.yaml index 768c0c6fe..67380407c 100644 --- a/helm/higress/Chart.yaml +++ b/helm/higress/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 2.1.9 +appVersion: 2.1.10 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.1.9 + version: 2.1.10 - name: higress-console repository: "https://higress.io/helm-charts/" version: 2.1.9 type: application -version: 2.1.9 +version: 2.1.10 diff --git a/helm/higress/README.md b/helm/higress/README.md index 3036a03e0..cf2b1d41a 100644 --- a/helm/higress/README.md +++ b/helm/higress/README.md @@ -44,7 +44,7 @@ The command removes all the Kubernetes components associated with the chart and | controller.autoscaling.minReplicas | int | `1` | | | controller.autoscaling.targetCPUUtilizationPercentage | int | `80` | | | controller.env | object | `{}` | | -| controller.hub | string | `"higress-registry.cn-hangzhou.cr.aliyuncs.com/higress"` | | +| controller.hub | string | `""` | | | controller.image | string | `"higress"` | | | controller.imagePullSecrets | list | `[]` | | | controller.labels | object | `{}` | | @@ -96,7 +96,7 @@ The command removes all the Kubernetes components associated with the chart and | gateway.hostNetwork | bool | `false` | | | gateway.httpPort | int | `80` | | | gateway.httpsPort | int | `443` | | -| gateway.hub | string | `"higress-registry.cn-hangzhou.cr.aliyuncs.com/higress"` | | +| gateway.hub | string | `""` | | | gateway.image | string | `"gateway"` | | | gateway.kind | string | `"Deployment"` | Use a `DaemonSet` or `Deployment` | | gateway.labels | object | `{}` | Labels to apply to all resources | @@ -194,7 +194,7 @@ The command removes all the Kubernetes components associated with the chart and | global.multiCluster.clusterName | string | `""` | Should be set to the name of the cluster this installation will run in. This is required for sidecar injection to properly label proxies | | global.multiCluster.enabled | bool | `true` | Set to true to connect two kubernetes clusters via their respective ingressgateway services when pods in each cluster cannot directly talk to one another. All clusters should be using Istio mTLS and must have a shared root CA for this model to work. | | global.network | string | `""` | Network defines the network this cluster belong to. This name corresponds to the networks in the map of mesh networks. | -| global.o11y | object | `{"enabled":false,"promtail":{"image":{"repository":"higress-registry.cn-hangzhou.cr.aliyuncs.com/higress/promtail","tag":"2.9.4"},"port":3101,"resources":{"limits":{"cpu":"500m","memory":"2Gi"}},"securityContext":{}}}` | Observability (o11y) configurations | +| global.o11y | object | `{"enabled":false,"promtail":{"image":{"repository":"","tag":"2.9.4"},"port":3101,"resources":{"limits":{"cpu":"500m","memory":"2Gi"}},"securityContext":{}}}` | Observability (o11y) configurations | | global.omitSidecarInjectorConfigMap | bool | `false` | | | global.onDemandRDS | bool | `false` | | | global.oneNamespace | bool | `false` | Whether to restrict the applications namespace the controller manages; If not set, controller watches all namespaces | @@ -246,7 +246,7 @@ The command removes all the Kubernetes components associated with the chart and | global.watchNamespace | string | `""` | If not empty, Higress Controller will only watch resources in the specified namespace. When isolating different business systems using K8s namespace, if each namespace requires a standalone gateway instance, this parameter can be used to confine the Ingress watching of Higress within the given namespace. | | global.xdsMaxRecvMsgSize | string | `"104857600"` | | | gzip | object | `{"chunkSize":4096,"compressionLevel":"BEST_COMPRESSION","compressionStrategy":"DEFAULT_STRATEGY","contentType":["text/html","text/css","text/plain","text/xml","application/json","application/javascript","application/xhtml+xml","image/svg+xml"],"disableOnEtagHeader":true,"enable":true,"memoryLevel":5,"minContentLength":1024,"windowBits":12}` | Gzip compression settings | -| hub | string | `"higress-registry.cn-hangzhou.cr.aliyuncs.com/higress"` | | +| hub | string | `""` | | | meshConfig | object | `{"enablePrometheusMerge":true,"rootNamespace":null,"trustDomain":"cluster.local"}` | meshConfig defines runtime configuration of components, including Istiod and istio-agent behavior See https://istio.io/docs/reference/config/istio.mesh.v1alpha1/ for all available options | | meshConfig.rootNamespace | string | `nil` | The namespace to treat as the administrative root namespace for Istio configuration. When processing a leaf namespace Istio will search for declarations in that namespace first and if none are found it will search in the root namespace. Any matching declaration found in the root namespace is processed as if it were declared in the leaf namespace. | | meshConfig.trustDomain | string | `"cluster.local"` | The trust domain corresponds to the trust root of a system Refer to https://github.com/spiffe/spiffe/blob/master/standards/SPIFFE-ID.md#21-trust-domain | @@ -263,7 +263,7 @@ The command removes all the Kubernetes components associated with the chart and | pilot.env.PILOT_ENABLE_METADATA_EXCHANGE | string | `"false"` | | | pilot.env.PILOT_SCOPE_GATEWAY_TO_NAMESPACE | string | `"false"` | | | pilot.env.VALIDATION_ENABLED | string | `"false"` | | -| pilot.hub | string | `"higress-registry.cn-hangzhou.cr.aliyuncs.com/higress"` | | +| pilot.hub | string | `""` | | | pilot.image | string | `"pilot"` | Can be a full hub/image:tag | | pilot.jwksResolverExtraRootCA | string | `""` | You can use jwksResolverExtraRootCA to provide a root certificate in PEM format. This will then be trusted by pilot when resolving JWKS URIs. | | pilot.keepaliveMaxServerConnectionAge | string | `"30m"` | The following is used to limit how long a sidecar can be connected to a pilot. It balances out load across pilot instances at the cost of increasing system churn. | @@ -278,7 +278,7 @@ The command removes all the Kubernetes components associated with the chart and | pilot.serviceAnnotations | object | `{}` | | | pilot.tag | string | `""` | | | pilot.traceSampling | float | `1` | | -| pluginServer.hub | string | `"higress-registry.cn-hangzhou.cr.aliyuncs.com/higress"` | | +| pluginServer.hub | string | `""` | | | pluginServer.image | string | `"plugin-server"` | | | pluginServer.imagePullSecrets | list | `[]` | | | pluginServer.labels | object | `{}` | | diff --git a/istio/istio b/istio/istio index 3a661d92b..017e7d8a4 160000 --- a/istio/istio +++ b/istio/istio @@ -1 +1 @@ -Subproject commit 3a661d92b0d541780c961a2984f8a62bb2aa3190 +Subproject commit 017e7d8a4d71fd704d953ecceca8226f2239c3a2