karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adjust the case of the aggregatedApiServer field in the karmada chart to solve installation errors 

Signed-off-by: 黄昱通 <hyt@yhglobal.com>
This commit is contained in:
黄昱通 2023-11-02 10:38:03 +08:00
parent 086a6c449e
commit 05d09e7fe5
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
charts/karmada/templates/_helpers.tpl
View File

@ -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 }}

20
charts/karmada/templates/karmada-aggregated-apiserver.yaml
View File

@ -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 }}