chore: Controller Manager affinity can now be deleted.

Signed-off-by: kahirokunn <[email protected]>
open-policy-agent · Oct 18, 2023 · 14ba61d · 14ba61d
1 parent e47b2ba
commit 14ba61d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/cmd/build/helmify/replacements.go b/cmd/build/helmify/replacements.go
@@ -53,7 +53,9 @@ var replacements = map[string]string{
 
 	`HELMSUBST_DEPLOYMENT_CONTROLLER_MANAGER_POD_SECURITY_CONTEXT: ""`: `{{- toYaml .Values.controllerManager.podSecurityContext | nindent 8 }}`,
 
-	`HELMSUBST_DEPLOYMENT_CONTROLLER_MANAGER_AFFINITY: ""`: `{{- toYaml .Values.controllerManager.affinity | nindent 8 }}`,
+	`HELMSUBST_DEPLOYMENT_CONTROLLER_MANAGER_AFFINITY: ""`: `{{- if .Values.controllerManager.affinity }}
+        {{- toYaml .Values.controllerManager.affinity | nindent 8 }}
+        {{- end }}`,
 
 	"HELMSUBST_DEPLOYMENT_CONTROLLER_MANAGER_STRATEGY_TYPE": `{{ .Values.controllerManager.strategyType }}`,
 

diff --git a/manifest_staging/charts/gatekeeper/templates/gatekeeper-controller-manager-deployment.yaml b/manifest_staging/charts/gatekeeper/templates/gatekeeper-controller-manager-deployment.yaml
@@ -42,7 +42,9 @@ spec:
         release: '{{ .Release.Name }}'
     spec:
       affinity:
+        {{- if .Values.controllerManager.affinity }}
         {{- toYaml .Values.controllerManager.affinity | nindent 8 }}
+        {{- end }}
       automountServiceAccountToken: true
       containers:
       - {{- if .Values.image.release }}