mirror of https://git.rancher.io/rke2-charts
39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
--- charts-original/templates/deployment.yaml
|
|
+++ charts/templates/deployment.yaml
|
|
@@ -52,9 +52,6 @@
|
|
{{- end }}
|
|
annotations:
|
|
checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
|
|
- {{- if .Values.isClusterService }}
|
|
- scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
|
|
- {{- end }}
|
|
{{- if .Values.podAnnotations }}
|
|
{{ toYaml .Values.podAnnotations | indent 8 }}
|
|
{{- end }}
|
|
@@ -80,9 +77,15 @@
|
|
topologySpreadConstraints:
|
|
{{ tpl (toYaml .Values.topologySpreadConstraints) $ | indent 8 }}
|
|
{{- end }}
|
|
- {{- if .Values.tolerations }}
|
|
+ {{- if or (.Values.isClusterService) (.Values.tolerations) }}
|
|
tolerations:
|
|
+ {{- if .Values.isClusterService }}
|
|
+ - key: CriticalAddonsOnly
|
|
+ operator: Exists
|
|
+ {{- end }}
|
|
+ {{- if .Values.tolerations }}
|
|
{{ toYaml .Values.tolerations | indent 8 }}
|
|
+ {{- end }}
|
|
{{- end }}
|
|
{{- if .Values.nodeSelector }}
|
|
nodeSelector:
|
|
@@ -94,7 +97,7 @@
|
|
{{- end }}
|
|
containers:
|
|
- name: "coredns"
|
|
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
|
|
+ image: {{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
|
|
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
|
args: [ "-conf", "/etc/coredns/Corefile" ]
|
|
volumeMounts:
|