Skip to content

Commit 344102d

Browse files
feat: global tolertions/nodeSelector/affinity
1 parent 5066017 commit 344102d

File tree

1 file changed

+3
-3
lines changed
  • charts/cf-common/templates/controller

1 file changed

+3
-3
lines changed

charts/cf-common/templates/controller/_pod.tpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@ hostAliases: {{ toYaml . | nindent 2 }}
8282

8383
{{- $nodeSelector := .Values.nodeSelector | default dict }}
8484
{{- $globalNodeSelector := .Values.global.nodeSelector | default dict }}
85+
{{- if or (not (kindIs "map" $nodeSelector)) (not (kindIs "map" $globalNodeSelector)) }}
86+
{{- fail "ERROR: nodeSelector block must be a map!" }}
87+
{{- end }}
8588
{{- $allNodeSelector := mergeOverwrite $globalNodeSelector $nodeSelector }}
8689
{{- with $allNodeSelector }}
87-
{{- if not (kindIs "map" .) }}
88-
{{- fail "ERROR: nodeSelector block must be a map!" }}
89-
{{- end }}
9090
nodeSelector: {{ toYaml . | nindent 2 }}
9191
{{- end }}
9292

0 commit comments

Comments
 (0)