DEVOPS-2855 - Set pod disruption budget to be enabled only if replicacount is more than 1

Author: chris onare

charts/argocd-apps/Values.yaml

@@ -17,9 +17,7 @@ main:
     targetGroupARN:
     securityGroupID:
   pdb:
-    # Set to false to disable creating the PDB for frontend
-    enabled: true
-    # Minimum number of frontend pods that must be available during disruptions
+    # (Optional) Minimum number of frontend pods that must be available during disruptions
     minAvailable: 1
 worker:
   name:
@@ -33,7 +31,5 @@ worker:
   resources:
   replicaCount:
   pdb:
-    # Set to false to disable creating the PDB for frontend
-    enabled: true
-    # Minimum number of frontend pods that must be available during disruptions
+    # (Optional) Minimum number of frontend pods that must be available during disruptions
     minAvailable: 1

charts/argocd-apps/templates/frontend-pdb.yaml

@@ -1,16 +1,17 @@
-{{- if and .Values.main.enabled .Values.main.pdb.enabled }}
+{{- if and .Values.main.enabled (gt .Values.main.replicaCount 1) }}
 apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
-  name: {{ .Values.main.name }}-frontend-pdb
-  namespace: {{ $.Release.Namespace | quote }}
+  name: {{ .Values.main.name }}-pdb
   labels:
-    app: {{ .Values.main.name | quote }}
+    app.kubernetes.io/name: {{ .Values.main.name }}
+    app.kubernetes.io/component: web
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
-  minAvailable: {{ .Values.main.pdb.minAvailable }}
+  minAvailable: {{ .Values.main.pdb.minAvailable | default 1 }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ .Values.main.name | quote }}
+      app.kubernetes.io/name: {{ .Values.main.name }}
       app.kubernetes.io/component: web
       app.kubernetes.io/part-of: {{ $.Release.Name | quote }}
 {{- end }}

charts/argocd-apps/templates/worker-pdb.yaml

@@ -1,16 +1,17 @@
-{{- if and .Values.worker.enabled .Values.worker.pdb.enabled }}
+{{- if and .Values.worker.enabled (gt .Values.worker.replicaCount 1) }}
 apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
-  name: {{ .Values.worker.name }}-worker-pdb
-  namespace: {{ $.Release.Namespace | quote }}
+  name: {{ .Values.worker.name }}-pdb
   labels:
-    app: {{ .Values.worker.name | quote }}
+    app.kubernetes.io/name: {{ .Values.worker.name }}
+    app.kubernetes.io/component: worker
+    app.kubernetes.io/part-of: {{ $.Release.Name | quote }}
 spec:
-  minAvailable: {{ .Values.worker.pdb.minAvailable }}
+  minAvailable: {{ .Values.worker.pdb.minAvailable | default 1 }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ .Values.worker.name | quote }}
+      app.kubernetes.io/name: {{ .Values.worker.name }}
       app.kubernetes.io/component: worker
       app.kubernetes.io/part-of: {{ $.Release.Name | quote }}
 {{- end }}

charts/generic-service/Values.yaml

@@ -23,10 +23,8 @@ frontend:
       secretRef: php-app-tls # pragma: allowlist secret
     imagepolicy:
       pattern: ^DEVOPS-338-deploy-breeze-qa-api-[a-fA-F0-9]+-(?P<ts>.*)
-      pdb:
-      # Set to false to disable creating the PDB for frontend
-      enabled: true
-      # Minimum number of frontend pods that must be available during disruptions
+    pdb:
+      # (Optional) Minimum number of frontend pods that must be available during disruptions
       minAvailable: 1
 
 worker:
@@ -41,9 +39,7 @@ worker:
     imagepolicy:
       pattern: ^DEVOPS-338-deploy-breeze-qa-api-[a-fA-F0-9]+-(?P<ts>.*)
     pdb:
-      # Set to false to disable creating the PDB for frontend
-      enabled: true
-      # Minimum number of frontend pods that must be available during disruptions
+      # (Optional) Minimum number of frontend pods that must be available during disruptions
       minAvailable: 1
 
 autoscaling:

charts/generic-service/templates/frontend-pdb.yaml

@@ -1,14 +1,16 @@
 {{- range $key, $value := .Values.frontend }}
-  {{- if and $value.pdb.enabled $value.name }}
+  {{- if and $value.enabled (gt $value.replicaCount 1) }}
 apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
-  name: {{ $value.name }}-frontend-pdb
+  name: {{ $value.name }}-pdb
   namespace: {{ $.Release.Namespace | quote }}
   labels:
-    app: {{ $value.name | quote }}
+    app.kubernetes.io/name: {{ $value.name | quote }}
+    app.kubernetes.io/component: web
+    app.kubernetes.io/part-of: {{ $.Release.Name | quote }}
 spec:
-  minAvailable: {{ .Values.frontend.pdb.minAvailable }}
+  minAvailable: {{ $value.pdb.minAvailable | default 1 }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ $value.name | quote }}

charts/generic-service/templates/worker-pdb.yaml

@@ -1,14 +1,16 @@
 {{- range $key, $value := .Values.worker }}
-  {{- if and $value.pdb.enabled $value.name }}
+  {{- if and $value.enabled (gt $value.replicaCount 1) }}
 apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
-  name: {{ $value.name }}-worker-pdb
+  name: {{ $value.name }}-pdb
   namespace: {{ $.Release.Namespace | quote }}
   labels:
-    app: {{ $value.name | quote }}
+    app.kubernetes.io/name: {{ $value.name | quote }}
+    app.kubernetes.io/component: worker
+    app.kubernetes.io/part-of: {{ $.Release.Name | quote }}
 spec:
-  minAvailable: {{ .Values.worker.pdb.minAvailable }}
+  minAvailable: {{ $value.pdb.minAvailable | default 1 }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ $value.name | quote }}