From 05d09e7fe50f94fd0582a8aec16afff527c66cdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=98=B1=E9=80=9A?= <hyt@yhglobal.com>
Date: Thu, 2 Nov 2023 10:38:03 +0800
Subject: [PATCH] Adjust the case of the aggregatedApiServer field in the
 karmada chart to solve installation errors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 黄昱通 <hyt@yhglobal.com>
---
 charts/karmada/templates/_helpers.tpl         |  4 ++--
 .../karmada-aggregated-apiserver.yaml         | 20 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/charts/karmada/templates/_helpers.tpl b/charts/karmada/templates/_helpers.tpl
index 1afa41aba..9727620d3 100644
--- a/charts/karmada/templates/_helpers.tpl
+++ b/charts/karmada/templates/_helpers.tpl
@@ -44,7 +44,7 @@ app: etcd
 {{- end }}
 {{- end -}}
 
-{{- define "karmada.aggregatedApiserver.labels" -}}
+{{- define "karmada.aggregatedApiServer.labels" -}}
 {{- if .Values.aggregatedApiServer.labels }}
 {{- range $key, $value := .Values.aggregatedApiServer.labels }}
 {{ $key }}: {{ $value }}
@@ -54,7 +54,7 @@ app: {{- include "karmada.name" .}}-aggregated-apiserver
 {{- end }}
 {{- end -}}
 
-{{- define "karmada.aggregatedApiserver.podLabels" -}}
+{{- define "karmada.aggregatedApiServer.podLabels" -}}
 {{- if .Values.aggregatedApiServer.podLabels }}
 {{- range $key, $value := .Values.aggregatedApiServer.podLabels }}
 {{ $key }}: {{ $value }}
diff --git a/charts/karmada/templates/karmada-aggregated-apiserver.yaml b/charts/karmada/templates/karmada-aggregated-apiserver.yaml
index a48843d9e..3acafae97 100644
--- a/charts/karmada/templates/karmada-aggregated-apiserver.yaml
+++ b/charts/karmada/templates/karmada-aggregated-apiserver.yaml
@@ -7,11 +7,11 @@ metadata:
   name: {{ $name }}-aggregated-apiserver
   namespace: {{ include "karmada.namespace" . }}
   labels:
-    {{- include "karmada.aggregatedApiserver.labels" . | nindent 4 }}
+    {{- include "karmada.aggregatedApiServer.labels" . | nindent 4 }}
 spec:
   selector:
     matchLabels:
-      {{- include "karmada.aggregatedApiserver.labels" . | nindent 6 }}
+      {{- include "karmada.aggregatedApiServer.labels" . | nindent 6 }}
   replicas: {{ .Values.aggregatedApiServer.replicaCount }}
   {{- with .Values.aggregatedApiServer.strategy }}
   strategy:
@@ -24,8 +24,8 @@ spec:
       {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "karmada.aggregatedApiserver.labels" . | nindent 8 }}
-        {{- include "karmada.aggregatedApiserver.podLabels" . | nindent 8 }}
+        {{- include "karmada.aggregatedApiServer.labels" . | nindent 8 }}
+        {{- include "karmada.aggregatedApiServer.podLabels" . | nindent 8 }}
     spec:
       {{- include "karmada.aggregatedApiServer.imagePullSecrets" . | nindent 6 }}
       automountServiceAccountToken: false
@@ -115,16 +115,16 @@ metadata:
   name: {{ $name }}-aggregated-apiserver
   namespace: {{ include "karmada.namespace" . }}
   labels:
-    {{- include "karmada.aggregatedApiserver.labels" . | nindent 4 }}
+    {{- include "karmada.aggregatedApiServer.labels" . | nindent 4 }}
 spec:
   ports:
     - port: 443
       protocol: TCP
       targetPort: 443
   selector:
-    {{- include "karmada.aggregatedApiserver.labels" . | nindent 4 }}
+    {{- include "karmada.aggregatedApiServer.labels" . | nindent 4 }}
 
-{{ if and .Values.aggregatedApiserver .Values.aggregatedApiserver.podDisruptionBudget }}
+{{ if and .Values.aggregatedApiServer .Values.aggregatedApiServer.podDisruptionBudget }}
 ---
 apiVersion: policy/v1
 kind: PodDisruptionBudget
@@ -132,12 +132,12 @@ metadata:
   name: {{ $name }}-aggregated-apiserver
   namespace: {{ include "karmada.namespace" . }}
   labels:
-    {{- include "karmada.aggregatedApiserver.labels" . | nindent 4 }}
+    {{- include "karmada.aggregatedApiServer.labels" . | nindent 4 }}
 spec:
   selector:
     matchLabels:
-      {{- include "karmada.aggregatedApiserver.labels" . | nindent 6 }}
-  {{ toYaml .Values.aggregatedApiserver.podDisruptionBudget | nindent 2 }}
+      {{- include "karmada.aggregatedApiServer.labels" . | nindent 6 }}
+  {{ toYaml .Values.aggregatedApiServer.podDisruptionBudget | nindent 2 }}
 {{- end -}}
 
 {{- end }}