diff --git a/charts/templates/_helpers.tpl b/charts/templates/_helpers.tpl index b03cfbd5f..977e716ab 100644 --- a/charts/templates/_helpers.tpl +++ b/charts/templates/_helpers.tpl @@ -12,7 +12,7 @@ {{- if .Values.apiServer.labels }} {{- range $key, $value := .Values.apiServer.labels}} {{ $key }}: {{ $value }} -{{- end}} +{{- end }} {{- else}} app: {{- include "karmada.name" .}}-apiserver {{- end }} @@ -22,7 +22,7 @@ app: {{- include "karmada.name" .}}-apiserver {{- if .Values.apiServer.podLabels }} {{- range $key, $value := .Values.apiServer.podLabels}} {{ $key }}: {{ $value }} -{{- end}} +{{- end }} {{- end }} {{- end -}} @@ -30,7 +30,7 @@ app: {{- include "karmada.name" .}}-apiserver {{- if .Values.aggregatedApiServer.labels }} {{- range $key, $value := .Values.aggregatedApiServer.labels}} {{ $key }}: {{ $value }} -{{- end}} +{{- end }} {{- else}} app: {{- include "karmada.name" .}}-aggregated-apiserver {{- end }} @@ -40,7 +40,7 @@ app: {{- include "karmada.name" .}}-aggregated-apiserver {{- if .Values.aggregatedApiServer.podLabels }} {{- range $key, $value := .Values.aggregatedApiServer.podLabels}} {{ $key }}: {{ $value }} -{{- end}} +{{- end }} {{- end }} {{- end -}} @@ -48,7 +48,7 @@ app: {{- include "karmada.name" .}}-aggregated-apiserver {{- if .Values.kubeControllerManager.labels }} {{- range $key, $value := .Values.kubeControllerManager.labels}} {{ $key }}: {{ $value }} -{{- end}} +{{- end }} {{- else}} app: {{- include "karmada.name" .}}-kube-controller-manager {{- end }} @@ -58,7 +58,7 @@ app: {{- include "karmada.name" .}}-kube-controller-manager {{- if .Values.kubeControllerManager.podLabels }} {{- range $key, $value := .Values.kubeControllerManager.podLabels}} {{ $key }}: {{ $value }} -{{- end}} +{{- end }} {{- end }} {{- end -}} @@ -92,7 +92,7 @@ app: {{$name}}-controller-manager {{- if .Values.controllerManager.podLabels }} {{- range $key, $value := .Values.controllerManager.podLabels}} {{ $key }}: {{ $value }} -{{- end}} +{{- end }} {{- end }} {{- end -}} @@ -113,7 +113,7 @@ app: {{$name}}-scheduler {{- if .Values.scheduler.podLabels }} {{- range $key, $value := .Values.scheduler.podLabels}} {{ $key }}: {{ $value }} -{{- end}} +{{- end }} {{- end }} {{- end -}} @@ -134,7 +134,7 @@ app: {{$name}} {{- if .Values.descheduler.podLabels }} {{- range $key, $value := .Values.descheduler.podLabels}} {{ $key }}: {{ $value }} -{{- end}} +{{- end }} {{- end }} {{- end -}} @@ -150,7 +150,7 @@ app: {{$name}} {{- if .Values.webhook.labels }} {{- range $key, $value := .Values.webhook.labels}} {{ $key }}: {{ $value }} -{{- end}} +{{- end }} {{- else}} app: {{$name}}-webhook {{- end }} @@ -161,7 +161,7 @@ app: {{$name}}-webhook {{- if .Values.webhook.podLabels }} {{- range $key, $value := .Values.webhook.podLabels}} {{ $key }}: {{ $value }} -{{- end}} +{{- end }} {{- end }} {{- end -}} @@ -171,7 +171,7 @@ app: {{$name}}-webhook {{- if .Values.agent.labels }} {{- range $key, $value := .Values.agent.labels}} {{ $key }}: {{ $value }} -{{- end}} +{{- end }} {{- else}} app: {{$name}} {{- end }} @@ -182,7 +182,7 @@ app: {{$name}} {{- if .Values.agent.podLabels }} {{- range $key, $value := .Values.agent.podLabels }} {{ $key }}: {{ $value }} -{{- end}} +{{- end }} {{- end }} {{- end -}} @@ -199,7 +199,7 @@ caBundle: {{ b64enc .Values.certs.custom.caCrt }} {{- if .Values.schedulerEstimator.podLabels }} {{- range $key, $value := .Values.schedulerEstimator.podLabels}} {{ $key }}: {{ $value }} -{{- end}} +{{- end }} {{- end }} {{- end -}} @@ -207,6 +207,6 @@ caBundle: {{ b64enc .Values.certs.custom.caCrt }} {{- if .Values.schedulerEstimator.labels }} {{- range $key, $value := .Values.schedulerEstimator.labels}} {{ $key }}: {{ $value }} -{{- end}} +{{- end }} {{- end }} {{- end -}} diff --git a/charts/templates/etcd.yaml b/charts/templates/etcd.yaml index e79c0a3bd..54ae5b209 100644 --- a/charts/templates/etcd.yaml +++ b/charts/templates/etcd.yaml @@ -103,7 +103,7 @@ spec: path: /var/lib/{{ include "karmada.namespace" . }}/karmada-etcd type: DirectoryOrCreate name: etcd-data - {{- end}} + {{- end }} {{- if eq .Values.etcd.internal.storageType "pvc"}} volumeClaimTemplates: - metadata: @@ -114,7 +114,7 @@ spec: resources: requests: storage: {{ .Values.etcd.internal.pvc.size }} - {{- end}} + {{- end }} --- apiVersion: v1 kind: Service diff --git a/charts/templates/karmada-aggregated-apiserver.yaml b/charts/templates/karmada-aggregated-apiserver.yaml index 178ae2aa3..d8e8cdbe5 100644 --- a/charts/templates/karmada-aggregated-apiserver.yaml +++ b/charts/templates/karmada-aggregated-apiserver.yaml @@ -109,4 +109,4 @@ spec: selector: {{- include "karmada.aggregatedApiserver.labels" . | nindent 4}} -{{- end}} +{{- end }} diff --git a/charts/templates/karmada_apiserver.yaml b/charts/templates/karmada_apiserver.yaml index 9ce557d50..3ca1c36af 100644 --- a/charts/templates/karmada_apiserver.yaml +++ b/charts/templates/karmada_apiserver.yaml @@ -168,4 +168,4 @@ spec: selector: {{- include "karmada.apiserver.labels" . | nindent 4}} -{{- end}} +{{- end }}