From ceac9aa76187258bffa9c6dd2d358e6d42c23bce Mon Sep 17 00:00:00 2001 From: iutx Date: Mon, 5 Dec 2022 18:52:23 +0800 Subject: [PATCH 1/2] cleanup: controller redundant configuration Signed-off-by: iutx --- helm/higress/values.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/helm/higress/values.yaml b/helm/higress/values.yaml index 7fb9a2b7d..6ad70a223 100644 --- a/helm/higress/values.yaml +++ b/helm/higress/values.yaml @@ -113,7 +113,6 @@ controller: image: higress tag: "268c73301e78514552fe0576fb0059c42c854a5c" env: {} - replicaCount: 1 labels: {} From b96cde16e3e5340da86bcc32d92901007117e92a Mon Sep 17 00:00:00 2001 From: iutx Date: Mon, 5 Dec 2022 22:17:11 +0800 Subject: [PATCH 2/2] feat: rename replicaCount to replicas Signed-off-by: iutx --- helm/higress/templates/controller-deployment.yaml | 2 +- helm/higress/templates/deployment.yaml | 2 +- helm/higress/values.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/helm/higress/templates/controller-deployment.yaml b/helm/higress/templates/controller-deployment.yaml index 0ffc0d9a4..41b44c7c8 100644 --- a/helm/higress/templates/controller-deployment.yaml +++ b/helm/higress/templates/controller-deployment.yaml @@ -6,7 +6,7 @@ metadata: {{- include "controller.labels" . | nindent 4 }} spec: {{- if not .Values.controller.autoscaling.enabled }} - replicas: {{ .Values.controller.replicaCount }} + replicas: {{ .Values.controller.replicas }} {{- end }} selector: matchLabels: diff --git a/helm/higress/templates/deployment.yaml b/helm/higress/templates/deployment.yaml index 812f43be7..ba0a4e654 100644 --- a/helm/higress/templates/deployment.yaml +++ b/helm/higress/templates/deployment.yaml @@ -10,7 +10,7 @@ metadata: spec: {{- if not .Values.gateway.autoscaling.enabled }} {{- if not .Values.global.kind }} - replicas: {{ .Values.gateway.replicaCount }} + replicas: {{ .Values.gateway.replicas }} {{- else }} replicas: 1 {{- end }} diff --git a/helm/higress/values.yaml b/helm/higress/values.yaml index 6ad70a223..cb1dd0c61 100644 --- a/helm/higress/values.yaml +++ b/helm/higress/values.yaml @@ -12,7 +12,7 @@ istioNamespace: "istio-system" meshConfig: {} gateway: name: "higress-gateway" - replicaCount: 2 + replicas: 2 image: gateway tag: "268c73301e78514552fe0576fb0059c42c854a5c" # revision declares which revision this gateway is a part of @@ -109,7 +109,7 @@ gateway: controller: name: "higress-controller" - replicaCount: 1 + replicas: 1 image: higress tag: "268c73301e78514552fe0576fb0059c42c854a5c" env: {}