Fix indentation and nodeselector, tolerations issues in gatekeeper chart

pull/2710/head
Venkata Krishna Rohit Sakala 2023-06-08 09:20:27 -07:00
parent c5dcee5d4b
commit 88f180b683
3 changed files with 26 additions and 4 deletions

View File

@ -12,7 +12,7 @@
+{{- end -}}
+{{- end -}}
+
+{{/*
{{/*
+Windows cluster will add default taint for linux nodes,
+add below linux tolerations to workloads could be scheduled to those linux nodes
+*/}}
@ -27,7 +27,7 @@
+kubernetes.io/os: linux
+{{- end -}}
+
{{/*
+{{/*
Output post install webhook probe container entry
*/}}
{{- define "gatekeeper.postInstallWebhookProbeContainer" -}}

View File

@ -9,14 +9,29 @@
imagePullPolicy: {{ .Values.preUninstall.deleteWebhookConfigurations.image.pullPolicy }}
args:
- delete
@@ -54,12 +54,10 @@
@@ -46,7 +46,7 @@
- mutatingwebhookconfiguration/{{ .Values.mutatingWebhookName }}
{{- end }}
resources:
- {{- toYaml .Values.preUninstall.resources | nindent 10 }}
+ {{- toYaml .Values.preUninstall.resources | nindent 12 }}
securityContext:
{{- if .Values.enableRuntimeDefaultSeccompProfile }}
seccompProfile:
@@ -54,12 +54,16 @@
{{- end }}
{{- toYaml .Values.preUninstall.securityContext | nindent 10 }}
{{- with .Values.preUninstall }}
- nodeSelector:
- {{- toYaml .nodeSelector | nindent 8 }}
+ nodeSelector: {{ include "linux-node-selector" . | nindent 8 }}
+{{- if .nodeSelector }}
+{{ toYaml .nodeSelector | indent 8 }}
+{{- end }}
+ tolerations: {{ include "linux-node-tolerations" . | nindent 8 }}
+{{- if .tolerations }}
+{{ toYaml .tolerations | indent 8 }}
+{{- end }}
affinity:
{{- toYaml .affinity | nindent 8 }}
- tolerations:

View File

@ -47,7 +47,7 @@
tag: 7.83.1
pullPolicy: IfNotPresent
pullSecrets: []
@@ -121,7 +124,7 @@
@@ -121,13 +124,13 @@
extraRules: []
enabled: false
image:
@ -56,6 +56,13 @@
tag: v3.12.0
pullPolicy: IfNotPresent
pullSecrets: []
affinity: {}
tolerations: []
- nodeSelector: {kubernetes.io/os: linux}
+ nodeSelector: {}
resources: {}
securityContext:
allowPrivilegeEscalation: false
@@ -171,7 +174,7 @@
weight: 100
topologySpreadConstraints: []