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

…. can be used. Signed-off-by: kahirokunn <[email protected]>
open-policy-agent · Jan 30, 2024 · a692c48 · a692c48
1 parent 07d5d57
commit a692c48
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/charts/gatekeeper/templates/gatekeeper-controller-manager-poddisruptionbudget.yaml b/charts/gatekeeper/templates/gatekeeper-controller-manager-poddisruptionbudget.yaml
@@ -11,8 +11,7 @@ metadata:
  release: '{{ .Release.Name }}'
  name: gatekeeper-controller-manager
  namespace: '{{ .Release.Namespace }}'
-spec:
- minAvailable: {{ .Values.pdb.controllerManager.minAvailable }}
+spec: {{ .Values.pdb.controllerManager | toYaml | nindent 2 }}
  selector:
  matchLabels:
  app: '{{ template "gatekeeper.name" . }}'

diff --git a/cmd/build/helmify/kustomize-for-helm.yaml b/cmd/build/helmify/kustomize-for-helm.yaml
@@ -297,7 +297,7 @@ metadata:
  name: gatekeeper-controller-manager
  namespace: gatekeeper-system
 spec:
- minAvailable: HELMSUBST_PDB_CONTROLLER_MANAGER_MINAVAILABLE
+ 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
@@ -217,7 +217,7 @@ var replacements = map[string]string{
  - 'services/status'
  {{- end }}`,
 
- "HELMSUBST_PDB_CONTROLLER_MANAGER_MINAVAILABLE": `{{ .Values.pdb.controllerManager.minAvailable }}`,
+ "HELMSUBST_PDB_CONTROLLER_MANAGER": `{{ .Values.pdb.controllerManager | toYaml | nindent 2 }}`,
 
  `HELMSUBST_AUDIT_CONTROLLER_MANAGER_DEPLOYMENT_IMAGE_RELEASE: ""`: `{{- if .Values.image.release }}
  image: {{ .Values.image.repository }}:{{ .Values.image.release }}

diff --git a/...taging/charts/gatekeeper/templates/gatekeeper-controller-manager-poddisruptionbudget.yaml b/...taging/charts/gatekeeper/templates/gatekeeper-controller-manager-poddisruptionbudget.yaml
@@ -12,7 +12,7 @@ metadata:
  name: gatekeeper-controller-manager
  namespace: '{{ .Release.Namespace }}'
 spec:
- minAvailable: {{ .Values.pdb.controllerManager.minAvailable }}
+ minAvailable: {{ .Values.pdb.controllerManager | toYaml | nindent 2 }}
  selector:
  matchLabels:
  app: '{{ template "gatekeeper.name" . }}'