feat(account-app): adding a PodDisruptionBudget

charts/accountapp/Chart.yaml

@@ -3,4 +3,4 @@ description: A Helm chart for accounts.jenkins.io
 maintainers:
 - name: timja
 name: accountapp
-version: 0.7.3
+version: 0.8.0

charts/accountapp/templates/_helpers.tpl

@@ -31,13 +31,20 @@ Create chart name and version as used by the chart label.
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
+{{/*
+Selector labels
+*/}}
+{{- define "accountapp.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "accountapp.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
 {{/*
 Common labels
 */}}
 {{- define "accountapp.labels" -}}
-app.kubernetes.io/name: {{ include "accountapp.name" . }}
+{{ include "accountapp.selectorLabels" . }}
 helm.sh/chart: {{ include "accountapp.chart" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}

charts/accountapp/templates/pdb.yaml

@@ -0,0 +1,18 @@
+{{- if (gt (int .Values.replicaCount) 1) }}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "accountapp.fullname" . }}
+  labels:
+    {{- include "accountapp.labels" . | nindent 4 }}
+spec:
+  {{- with .Values.poddisruptionbudget.minAvailable }}
+  minAvailable: {{ . }}
+  {{- end }}
+  {{- with .Values.poddisruptionbudget.maxUnavailable }}
+  maxUnavailable: {{ . }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "accountapp.selectorLabels" . | nindent 6 }}
+{{- end }}

charts/accountapp/tests/custom_values_test.yaml

@@ -3,6 +3,7 @@ templates:
   - deployment.yaml
   - ingress.yaml
   - secret.yaml # Direct dependency of deployment.yaml
+  - pdb.yaml
 tests:
   - it: should create a Secret with the correct value
     set:
@@ -51,3 +52,18 @@ tests:
       - equal:
           path: spec.template.spec.containers[0].resources.requests.cpu
           value: 500m
+  - it: should ensure the pdb has correct spec
+    template: pdb.yaml
+    set:
+      replicaCount: 2
+      poddisruptionbudget.minAvailable: 2
+      poddisruptionbudget.maxUnavailable: 1
+    asserts:
+      - isKind:
+          of: PodDisruptionBudget
+      - equal:
+          path: spec.minAvailable
+          value: 2
+      - equal:
+          path: spec.selector.matchLabels['app.kubernetes.io/name']
+          value: "accountapp"

charts/accountapp/tests/defaults_test.yaml

@@ -3,6 +3,7 @@ templates:
   - deployment.yaml
   - ingress.yaml
   - secret.yaml # Direct dependency of deployment.yaml
+  - pdb.yaml
 tests:
   - it: should create an ingress by default
     template: ingress.yaml
@@ -21,3 +22,14 @@ tests:
           value: IfNotPresent
       - notExists:
           path: spec.template.spec.containers[0].resources
+      - equal:
+          path: metadata.labels["app.kubernetes.io/name"]
+          value: accountapp
+      - equal:
+          path: metadata.labels["app.kubernetes.io/managed-by"]
+          value: Helm
+  - it: should not generate any pdb with default values
+    template: pdb.yaml
+    asserts:
+      - hasDocuments:
+          count: 0

charts/accountapp/values.yaml

@@ -66,3 +66,5 @@ election:
   close: 1970-01-02
   logDir: /var/log/accountapp/elections
   candidates: bob,alice
+poddisruptionbudget:
+  minAvailable: 1