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

Merge pull request #4203 from huangyutongs/master 

Adjust the case of the aggregatedApiServer field in the karmada chart…
This commit is contained in:
karmada-bot 2023-11-03 14:26:37 +08:00 committed by GitHub
parent 086a6c449e 05d09e7fe5
commit e99df8ee54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 }}
{{- end -}} {{- end -}}
{{- define "karmada.aggregatedApiserver.labels" -}} {{- define "karmada.aggregatedApiServer.labels" -}}
{{- if .Values.aggregatedApiServer.labels }} {{- if .Values.aggregatedApiServer.labels }}
{{- range $key, $value := .Values.aggregatedApiServer.labels }} {{- range $key, $value := .Values.aggregatedApiServer.labels }}
{{ $key }}: {{ $value }} {{ $key }}: {{ $value }}
@ -54,7 +54,7 @@ app: {{- include "karmada.name" .}}-aggregated-apiserver
{{- end }} {{- end }}
{{- end -}} {{- end -}}
{{- define "karmada.aggregatedApiserver.podLabels" -}} {{- define "karmada.aggregatedApiServer.podLabels" -}}
{{- if .Values.aggregatedApiServer.podLabels }} {{- if .Values.aggregatedApiServer.podLabels }}
{{- range $key, $value := .Values.aggregatedApiServer.podLabels }} {{- range $key, $value := .Values.aggregatedApiServer.podLabels }}
{{ $key }}: {{ $value }} {{ $key }}: {{ $value }}

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

@ -7,11 +7,11 @@ metadata:
name: {{ $name }}-aggregated-apiserver name: {{ $name }}-aggregated-apiserver
namespace: {{ include "karmada.namespace" . }} namespace: {{ include "karmada.namespace" . }}
labels: labels:
{{- include "karmada.aggregatedApiserver.labels" . | nindent 4 }} {{- include "karmada.aggregatedApiServer.labels" . | nindent 4 }}
spec: spec:
selector: selector:
matchLabels: matchLabels:
{{- include "karmada.aggregatedApiserver.labels" . | nindent 6 }} {{- include "karmada.aggregatedApiServer.labels" . | nindent 6 }}
replicas: {{ .Values.aggregatedApiServer.replicaCount }} replicas: {{ .Values.aggregatedApiServer.replicaCount }}
{{- with .Values.aggregatedApiServer.strategy }} {{- with .Values.aggregatedApiServer.strategy }}
strategy: strategy:
@ -24,8 +24,8 @@ spec:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
labels: labels:
{{- include "karmada.aggregatedApiserver.labels" . | nindent 8 }} {{- include "karmada.aggregatedApiServer.labels" . | nindent 8 }}
{{- include "karmada.aggregatedApiserver.podLabels" . | nindent 8 }} {{- include "karmada.aggregatedApiServer.podLabels" . | nindent 8 }}
spec: spec:
{{- include "karmada.aggregatedApiServer.imagePullSecrets" . | nindent 6 }} {{- include "karmada.aggregatedApiServer.imagePullSecrets" . | nindent 6 }}
automountServiceAccountToken: false automountServiceAccountToken: false
@ -115,16 +115,16 @@ metadata:
name: {{ $name }}-aggregated-apiserver name: {{ $name }}-aggregated-apiserver
namespace: {{ include "karmada.namespace" . }} namespace: {{ include "karmada.namespace" . }}
labels: labels:
{{- include "karmada.aggregatedApiserver.labels" . | nindent 4 }} {{- include "karmada.aggregatedApiServer.labels" . | nindent 4 }}
spec: spec:
ports: ports:
- port: 443 - port: 443
protocol: TCP protocol: TCP
targetPort: 443 targetPort: 443
selector: 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 apiVersion: policy/v1
kind: PodDisruptionBudget kind: PodDisruptionBudget
@ -132,12 +132,12 @@ metadata:
name: {{ $name }}-aggregated-apiserver name: {{ $name }}-aggregated-apiserver
namespace: {{ include "karmada.namespace" . }} namespace: {{ include "karmada.namespace" . }}
labels: labels:
{{- include "karmada.aggregatedApiserver.labels" . | nindent 4 }} {{- include "karmada.aggregatedApiServer.labels" . | nindent 4 }}
spec: spec:
selector: selector:
matchLabels: matchLabels:
{{- include "karmada.aggregatedApiserver.labels" . | nindent 6 }} {{- include "karmada.aggregatedApiServer.labels" . | nindent 6 }}
{{ toYaml .Values.aggregatedApiserver.podDisruptionBudget | nindent 2 }} {{ toYaml .Values.aggregatedApiServer.podDisruptionBudget | nindent 2 }}
{{- end -}} {{- end -}}
{{- end }} {{- end }}