From 85c7b1f50102c13f61434d09330a9395fd28b7f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BE=84=E6=BD=AD?= Date: Fri, 6 Dec 2024 13:52:03 +0800 Subject: [PATCH] rel: Release 2.0.4 (#1571) --- VERSION | 2 +- helm/core/Chart.yaml | 4 ++-- helm/core/templates/_pod.tpl | 7 ------- helm/core/templates/configmap.yaml | 8 -------- helm/core/templates/controller-deployment.yaml | 6 ------ helm/core/templates/controller-service.yaml | 2 -- helm/core/values.yaml | 2 -- helm/higress/Chart.lock | 8 ++++---- helm/higress/Chart.yaml | 8 ++++---- helm/higress/README.md | 1 - 10 files changed, 11 insertions(+), 37 deletions(-) diff --git a/VERSION b/VERSION index f256be6034..8a5b818b44 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.3 +v2.0.4 diff --git a/helm/core/Chart.yaml b/helm/core/Chart.yaml index 347267ee56..7e2f44fc19 100644 --- a/helm/core/Chart.yaml +++ b/helm/core/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 2.0.3 +appVersion: 2.0.4 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.3 +version: 2.0.4 diff --git a/helm/core/templates/_pod.tpl b/helm/core/templates/_pod.tpl index 4e7e0a6ac7..26eab8970e 100644 --- a/helm/core/templates/_pod.tpl +++ b/helm/core/templates/_pod.tpl @@ -7,9 +7,6 @@ Rendering the pod template of gateway component. template: metadata: annotations: - {{- if .Values.global.enableHigressIstio }} - "enableHigressIstio": "true" - {{- end }} {{- if .Values.gateway.podAnnotations }} {{- toYaml .Values.gateway.podAnnotations | nindent 6 }} {{- end }} @@ -268,11 +265,7 @@ template: {{- end }} - name: higress-ca-root-cert configMap: - {{- if .Values.global.enableHigressIstio }} - name: istio-ca-root-cert - {{- else }} name: higress-ca-root-cert - {{- end }} - name: config configMap: name: higress-config diff --git a/helm/core/templates/configmap.yaml b/helm/core/templates/configmap.yaml index a915604d15..633cdfa2b0 100644 --- a/helm/core/templates/configmap.yaml +++ b/helm/core/templates/configmap.yaml @@ -20,11 +20,7 @@ # 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. - {{- if .Values.global.enableHigressIstio }} - rootNamespace: {{ .Values.meshConfig.rootNamespace | default .Values.global.istioNamespace }} - {{- else }} rootNamespace: {{ .Release.Namespace }} - {{- end }} configSources: - address: "xds://127.0.0.1:15051" @@ -85,12 +81,8 @@ discoveryAddress: {{ printf "istiod.%s.svc" .Release.Namespace }}:15012 {{- end }} {{- else }} - {{- if .Values.global.enableHigressIstio }} - discoveryAddress: {{ printf "istiod.%s.svc" .Values.global.istioNamespace }}:15012 - {{- else }} discoveryAddress: {{ include "controller.name" . }}.{{.Release.Namespace}}.svc:15012 {{- end }} - {{- end }} proxyStatsMatcher: inclusionRegexps: - ".*" diff --git a/helm/core/templates/controller-deployment.yaml b/helm/core/templates/controller-deployment.yaml index dda26d2433..ff30b856fe 100644 --- a/helm/core/templates/controller-deployment.yaml +++ b/helm/core/templates/controller-deployment.yaml @@ -96,7 +96,6 @@ spec: volumeMounts: - name: log mountPath: /var/log -{{- if not .Values.global.enableHigressIstio }} - name: discovery image: "{{ .Values.pilot.hub | default .Values.global.hub }}/{{ .Values.pilot.image | default "pilot" }}:{{ .Values.pilot.tag | default .Chart.AppVersion }}" {{- if .Values.global.imagePullPolicy }} @@ -229,10 +228,8 @@ spec: value: "false" - name: PILOT_ENABLE_GATEWAY_API_DEPLOYMENT_CONTROLLER value: "false" - {{- if not .Values.global.enableHigressIstio }} - name: CUSTOM_CA_CERT_NAME value: "higress-ca-root-cert" - {{- end }} {{- if not (or .Values.global.local .Values.global.kind) }} resources: {{- if .Values.pilot.resources }} @@ -269,7 +266,6 @@ spec: - name: extracacerts mountPath: /cacerts {{- end }} -{{- end }} {{- with .Values.controller.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} @@ -285,7 +281,6 @@ spec: volumes: - name: log emptyDir: {} - {{- if not .Values.global.enableHigressIstio }} - name: config configMap: name: higress-config @@ -317,4 +312,3 @@ spec: configMap: name: pilot-jwks-extra-cacerts{{- if not (eq .Values.revision "") }}-{{ .Values.revision }}{{- end }} {{- end }} - {{- end }} diff --git a/helm/core/templates/controller-service.yaml b/helm/core/templates/controller-service.yaml index 70b22351e4..fd21d05ba6 100644 --- a/helm/core/templates/controller-service.yaml +++ b/helm/core/templates/controller-service.yaml @@ -9,7 +9,6 @@ spec: type: {{ .Values.controller.service.type }} ports: {{- toYaml .Values.controller.ports | nindent 4 }} - {{- if not .Values.global.enableHigressIstio }} - port: 15010 name: grpc-xds # plaintext protocol: TCP @@ -23,6 +22,5 @@ spec: - port: 15014 name: http-monitoring # prometheus stats protocol: TCP - {{- end }} selector: {{- include "controller.selectorLabels" . | nindent 4 }} diff --git a/helm/core/values.yaml b/helm/core/values.yaml index e0b818bb12..43695e77d4 100644 --- a/helm/core/values.yaml +++ b/helm/core/values.yaml @@ -40,8 +40,6 @@ global: enableIstioAPI: true # -- If true, Higress Controller will monitor Gateway API resources as well enableGatewayAPI: false - # Deprecated - enableHigressIstio: false # -- Used to locate istiod. istioNamespace: istio-system # -- enable pod disruption budget for the control plane, which is used to diff --git a/helm/higress/Chart.lock b/helm/higress/Chart.lock index 5d19538bda..8073e7373b 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.3 + version: 2.0.4 - name: higress-console repository: https://higress.io/helm-charts/ - version: 1.4.5 -digest: sha256:74b772113264168483961f5d0424459fd7359adc509a4b50400229581d7cddbf -generated: "2024-11-08T14:06:51.871719+08:00" + version: 1.4.6 +digest: sha256:ec570ac7ae8a6de976e7ffafaadae4a33beeabfb4b13debe63e0cfa100e2eb8c +generated: "2024-12-06T11:34:04.628976+08:00" diff --git a/helm/higress/Chart.yaml b/helm/higress/Chart.yaml index 437a0f6a92..57207cc2f4 100644 --- a/helm/higress/Chart.yaml +++ b/helm/higress/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 2.0.3 +appVersion: 2.0.4 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.3 + version: 2.0.4 - name: higress-console repository: "https://higress.io/helm-charts/" - version: 1.4.5 + version: 1.4.6 type: application -version: 2.0.3 +version: 2.0.4 diff --git a/helm/higress/README.md b/helm/higress/README.md index 45afff63d6..fd1ecc4c3d 100644 --- a/helm/higress/README.md +++ b/helm/higress/README.md @@ -159,7 +159,6 @@ The command removes all the Kubernetes components associated with the chart and | global.disableAlpnH2 | bool | `false` | Whether to disable HTTP/2 in ALPN | | global.enableGatewayAPI | bool | `false` | If true, Higress Controller will monitor Gateway API resources as well | | global.enableH3 | bool | `false` | | -| global.enableHigressIstio | bool | `false` | | | global.enableIPv6 | bool | `false` | | | global.enableIstioAPI | bool | `true` | If true, Higress Controller will monitor istio resources as well | | global.enableProxyProtocol | bool | `false` | |