chore: Changed the process to expand yaml so that maxUnavailable, etc…

…. can be used. Signed-off-by: kahirokunn <[email protected]>
open-policy-agent · Sep 9, 2024 · 31a94a8 · 31a94a8
1 parent 7c6107d
commit 31a94a8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/cmd/build/helmify/kustomize-for-helm.yaml b/cmd/build/helmify/kustomize-for-helm.yaml
@@ -310,7 +310,7 @@ metadata:
   name: gatekeeper-controller-manager
   namespace: gatekeeper-system
 spec:
-  minAvailable: HELMSUBST_PDB_CONTROLLER_MANAGER_MINAVAILABLE
+  HELMSUBST_PDB_CONTROLLER_MANAGER: ""
   selector:
     matchLabels:
       control-plane: controller-manager

diff --git a/cmd/build/helmify/replacements.go b/cmd/build/helmify/replacements.go
@@ -248,7 +248,17 @@ var replacements = map[string]string{
 
 	"HELMSUBST_MUTATING_WEBHOOK_MATCH_CONDITIONS": `{{ toYaml .Values.mutatingWebhookMatchConditions | nindent 4 }}`,
 
-	"HELMSUBST_PDB_CONTROLLER_MANAGER_MINAVAILABLE": `{{ .Values.pdb.controllerManager.minAvailable }}`,
+	"HELMSUBST_PDB_CONTROLLER_MANAGER": `{{- if and .Values.maxAvailable .Values.maxUnavailable }}
+    {{ fail "Only one of 'maxAvailable' or 'maxUnavailable' can be set, but not both" }}
+    {{- else if not (or .Values.maxAvailable .Values.maxUnavailable) }}
+    {{ fail "One of 'maxAvailable' or 'maxUnavailable' must be set" }}
+    {{- else }}
+    {{ if .Values.maxAvailable }}
+    maxAvailable: {{ .Values.maxAvailable }}
+    {{ else if .Values.maxUnavailable }}
+    maxUnavailable: {{ .Values.maxUnavailable }}
+    {{ end }}
+  {{- end }}`,
 
 	`HELMSUBST_AUDIT_CONTROLLER_MANAGER_DEPLOYMENT_IMAGE_RELEASE: ""`: `{{- if .Values.image.release }}
         image: {{ .Values.image.repository }}:{{ .Values.image.release }}

diff --git a/config/pdb/pdb.yaml b/config/pdb/pdb.yaml
@@ -3,7 +3,6 @@ kind: PodDisruptionBudget
 metadata:
   name: controller-manager
 spec:
-  minAvailable: 1
   selector:
     matchLabels:
       control-plane: controller-manager

diff --git a/deploy/gatekeeper.yaml b/deploy/gatekeeper.yaml
@@ -5141,7 +5141,6 @@ metadata:
   name: gatekeeper-controller-manager
   namespace: gatekeeper-system
 spec:
-  minAvailable: 1
   selector:
     matchLabels:
       control-plane: controller-manager