Provi-Engineering · creisor · Jan 3, 2025 · Dec 19, 2024
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.8.8] - 2025-01-03
+
+### Added
+
+- Pod Disruption Budgets can be defined by adding a `podDisruptionBudget` to a deployment with `minAvailable` and `maxUnavailable` specified as described [in the Kubernetes documentation](https://kubernetes.io/docs/tasks/run-application/configure-pdb/).
+
 ## [1.8.7] - 2024-12-23
 
 ### Added

diff --git a/charts/common/Chart.yaml b/charts/common/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v2
 description: Common service chart
 name: common
 type: library
-version: 1.8.7
+version: 1.8.8
 maintainers:
   - name: DevOps
diff --git a/charts/common/templates/_deployment.yaml.tpl b/charts/common/templates/_deployment.yaml.tpl
@@ -22,6 +22,10 @@
 {{ include "common.kubernetes.podautoscaler" (dict "global" $global "selector" $deploymentName "autoscaling" .) }}
 {{- end }}
 
+{{- with $deploymentDetails.podDisruptionBudget }}
+{{- include "common.kubernetes.pod_disruption_budget" (dict "chart" $chart "deploymentName" $deploymentName "selector" $selector "pdb" .) }}
+{{- end }}
+
 ---
 apiVersion: apps/v1
 kind: Deployment

diff --git a/charts/common/templates/_microservice.yaml.tpl b/charts/common/templates/_microservice.yaml.tpl
@@ -42,5 +42,4 @@
 {{- with .Values.secrets }}
 {{- include "common.kubernetes.clusterexternalsecret" (dict "root" $ "global" $global "secrets" .) -}}
 {{- end -}}
-
 {{- end }}
diff --git a/charts/common/templates/_pod_disruption_budget.yaml.tpl b/charts/common/templates/_pod_disruption_budget.yaml.tpl
@@ -0,0 +1,17 @@
+{{- define "common.kubernetes.pod_disruption_budget" -}}
+---
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ printf "%s-%s-pdb" .chart.Name .deploymentName }}
+spec:
+{{- if .pdb.minAvailable }}
+  minAvailable: {{ .pdb.minAvailable }}
+{{- end }}
+{{- if .pdb.maxUnavailable }}
+  maxUnavailable: {{ .pdb.maxUnavailable }}
+{{- end }}
+  selector:
+    matchLabels:
+      app: {{ .selector }}
+{{- end }}
diff --git a/test/expected_output/affinity.yaml b/test/expected_output/affinity.yaml
@@ -1,5 +1,5 @@
 ---
-# Source: defaults/templates/microservice.yaml.tpl
+# Source: my-cool-app/templates/microservice.yaml.tpl
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -10,24 +10,24 @@ metadata:
   labels:
     app: web
     app.kubernetes.io/name: dummy
-    chart: defaults
+    chart: my-cool-app
     chartVersion: 1.0.0
     team: cool-team
 spec:
   replicas: 3
   selector:
     matchLabels:
-      selector: defaults-deployment-web
+      selector: my-cool-app-deployment-web
   template:
     metadata:
       annotations:
         provi.repository: https://github.com/example/repo
         provi.slack: my-cool-team
       labels:
-        selector: defaults-deployment-web
+        selector: my-cool-app-deployment-web
         app: web
         app.kubernetes.io/name: dummy
-        chart: defaults
+        chart: my-cool-app
         chartVersion: 1.0.0
         team: cool-team
     spec:

diff --git a/test/expected_output/autoscaler.yaml b/test/expected_output/autoscaler.yaml
@@ -1,5 +1,5 @@
 ---
-# Source: defaults/templates/microservice.yaml.tpl
+# Source: my-cool-app/templates/microservice.yaml.tpl
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -10,23 +10,23 @@ metadata:
   labels:
     app: web
     app.kubernetes.io/name: dummy
-    chart: defaults
+    chart: my-cool-app
     chartVersion: 1.0.0
     team: cool-team
 spec:
   selector:
     matchLabels:
-      selector: defaults-deployment-web
+      selector: my-cool-app-deployment-web
   template:
     metadata:
       annotations:
         provi.repository: https://github.com/example/repo
         provi.slack: my-cool-team
       labels:
-        selector: defaults-deployment-web
+        selector: my-cool-app-deployment-web
         app: web
         app.kubernetes.io/name: dummy
-        chart: defaults
+        chart: my-cool-app
         chartVersion: 1.0.0
         team: cool-team
     spec:
@@ -91,7 +91,7 @@ spec:
                     values:
                       - karpenter
 ---
-# Source: defaults/templates/microservice.yaml.tpl
+# Source: my-cool-app/templates/microservice.yaml.tpl
 apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:

diff --git a/test/expected_output/clusterexternalsecret-basic.yaml b/test/expected_output/clusterexternalsecret-basic.yaml
@@ -1,6 +1,6 @@
 
 ---
-# Source: defaults/templates/microservice.yaml.tpl
+# Source: my-cool-app/templates/microservice.yaml.tpl
 apiVersion: external-secrets.io/v1beta1
 kind: ClusterExternalSecret
 metadata:
@@ -38,7 +38,7 @@ spec:
         key: rds!cluster-1a123b45-6c78-901d-e234-f5678901a23b
         property: password
 ---
-# Source: defaults/templates/microservice.yaml.tpl
+# Source: my-cool-app/templates/microservice.yaml.tpl
 apiVersion: external-secrets.io/v1beta1
 kind: ClusterExternalSecret
 metadata:

diff --git a/test/expected_output/configmaps.yaml b/test/expected_output/configmaps.yaml
@@ -1,13 +1,13 @@
 ---
-# Source: defaults/templates/microservice.yaml.tpl
+# Source: my-cool-app/templates/microservice.yaml.tpl
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: testmap
   annotations:
     provi.repository: https://github.com/example/repo
   labels:
-    chart: defaults
+    chart: my-cool-app
     chartVersion: 1.0.0
     team: cool-team
 data:

diff --git a/test/expected_output/containers-basic.yaml b/test/expected_output/containers-basic.yaml
@@ -1,5 +1,5 @@
 ---
-# Source: defaults/templates/microservice.yaml.tpl
+# Source: my-cool-app/templates/microservice.yaml.tpl
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -8,22 +8,22 @@ metadata:
     provi.repository: https://github.com/example/repo
   labels:
     app: web
-    chart: defaults
+    chart: my-cool-app
     chartVersion: 1.0.0
     team: cool-team
 spec:
   replicas: 1
   selector:
     matchLabels:
-      selector: defaults-deployment-web
+      selector: my-cool-app-deployment-web
   template:
     metadata:
       annotations:
         provi.repository: https://github.com/example/repo
       labels:
-        selector: defaults-deployment-web
+        selector: my-cool-app-deployment-web
         app: web
-        chart: defaults
+        chart: my-cool-app
         chartVersion: 1.0.0
         team: cool-team
     spec:

diff --git a/test/expected_output/cronjobs-global-serviceaccount.yaml b/test/expected_output/cronjobs-global-serviceaccount.yaml
@@ -1,5 +1,5 @@
 ---
-# Source: defaults/templates/microservice.yaml.tpl
+# Source: my-cool-app/templates/microservice.yaml.tpl
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -9,11 +9,11 @@ metadata:
     eks.amazonaws.com/role-arn: "arn:aws:iam::123456789:role/test-service-account"
     eks.amazonaws.com/sts-regional-endpoints: "true"
   labels:
-    chart: defaults
+    chart: my-cool-app
     chartVersion: 1.0.0
     team: cool-team
 ---
-# Source: defaults/templates/microservice.yaml.tpl
+# Source: my-cool-app/templates/microservice.yaml.tpl
 apiVersion: batch/v1
 kind: CronJob
 metadata:
@@ -22,7 +22,7 @@ metadata:
     provi.repository: https://github.com/example/repo
   labels:
     app: scheduler
-    chart: defaults
+    chart: my-cool-app
     chartVersion: 1.0.0
     team: cool-team
 spec:
@@ -42,9 +42,9 @@ spec:
           annotations:
             provi.repository: https://github.com/example/repo
           labels:
-            selector: defaults-cronjob-scheduler
+            selector: my-cool-app-cronjob-scheduler
             app: scheduler
-            chart: defaults
+            chart: my-cool-app
             chartVersion: 1.0.0
             team: cool-team
         spec:

diff --git a/test/expected_output/cronjobs-serviceaccount.yaml b/test/expected_output/cronjobs-serviceaccount.yaml
@@ -1,5 +1,5 @@
 ---
-# Source: defaults/templates/microservice.yaml.tpl
+# Source: my-cool-app/templates/microservice.yaml.tpl
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -10,11 +10,11 @@ metadata:
     eks.amazonaws.com/role-arn: "arn:aws:iam::123456789:role/test-service-account"
     eks.amazonaws.com/sts-regional-endpoints: "true"
   labels:
-    chart: defaults
+    chart: my-cool-app
     chartVersion: 1.0.0
     team: cool-team
 ---
-# Source: defaults/templates/microservice.yaml.tpl
+# Source: my-cool-app/templates/microservice.yaml.tpl
 apiVersion: batch/v1
 kind: CronJob
 metadata:
@@ -24,7 +24,7 @@ metadata:
     test.annotation: hello-test-world
   labels:
     app: myCoolJob
-    chart: defaults
+    chart: my-cool-app
     chartVersion: 1.0.0
     team: cool-team
 spec:
@@ -45,9 +45,9 @@ spec:
             provi.repository: https://github.com/example/repo
             test.annotation: hello-test-world
           labels:
-            selector: defaults-cronjob-myCoolJob
+            selector: my-cool-app-cronjob-myCoolJob
             app: myCoolJob
-            chart: defaults
+            chart: my-cool-app
             chartVersion: 1.0.0
             team: cool-team
         spec:

diff --git a/test/expected_output/cronjobs.yaml b/test/expected_output/cronjobs.yaml
@@ -1,5 +1,5 @@
 ---
-# Source: defaults/templates/microservice.yaml.tpl
+# Source: my-cool-app/templates/microservice.yaml.tpl
 apiVersion: batch/v1
 kind: CronJob
 metadata:
@@ -10,7 +10,7 @@ metadata:
     test.override.annotation: hello-override-world
   labels:
     app: scheduler
-    chart: defaults
+    chart: my-cool-app
     chartVersion: 1.0.0
     team: cool-team
     testOverrideLabel: hello-override-world
@@ -33,9 +33,9 @@ spec:
             test.annotation: hello-test-world
             test.override.annotation: hello-override-world
           labels:
-            selector: defaults-cronjob-scheduler
+            selector: my-cool-app-cronjob-scheduler
             app: scheduler
-            chart: defaults
+            chart: my-cool-app
             chartVersion: 1.0.0
             team: cool-team
             testOverrideLabel: hello-override-world

diff --git a/test/expected_output/deployments-selector.yaml b/test/expected_output/deployments-selector.yaml
@@ -1,5 +1,5 @@
 ---
-# Source: defaults/templates/microservice.yaml.tpl
+# Source: my-cool-app/templates/microservice.yaml.tpl
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -9,11 +9,11 @@ metadata:
     eks.amazonaws.com/role-arn: "arn:aws:iam::123456789:role/test-deployments"
     eks.amazonaws.com/sts-regional-endpoints: "true"
   labels:
-    chart: defaults
+    chart: my-cool-app
     chartVersion: 1.0.0
     team: cool-team
 ---
-# Source: defaults/templates/microservice.yaml.tpl
+# Source: my-cool-app/templates/microservice.yaml.tpl
 apiVersion: v1
 kind: Service
 metadata:
@@ -22,7 +22,7 @@ metadata:
     provi.repository: https://github.com/example/repo
   labels:
     app: web
-    chart: defaults
+    chart: my-cool-app
     chartVersion: 1.0.0
     team: cool-team
 spec:
@@ -35,7 +35,7 @@ spec:
       protocol: TCP
       targetPort: 8080
 ---
-# Source: defaults/templates/microservice.yaml.tpl
+# Source: my-cool-app/templates/microservice.yaml.tpl
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -44,7 +44,7 @@ metadata:
     provi.repository: https://github.com/example/repo
   labels:
     app: web
-    chart: defaults
+    chart: my-cool-app
     chartVersion: 1.0.0
     team: cool-team
 spec:
@@ -58,7 +58,7 @@ spec:
       labels:
         selector: test-foo-selector
         app: web
-        chart: defaults
+        chart: my-cool-app
         chartVersion: 1.0.0
         team: cool-team
     spec:
@@ -122,7 +122,7 @@ spec:
                     values:
                       - karpenter
 ---
-# Source: defaults/templates/microservice.yaml.tpl
+# Source: my-cool-app/templates/microservice.yaml.tpl
 apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata: