From 0ce7c637f43c52ec0900d0462b118bc0c51f1cc1 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 23 Feb 2021 17:54:00 +0100
Subject: [PATCH] deployment make sure to restart pods, restart policy

---
 deployment/kubernetes/templates/backend/Deployment.yaml     | 5 +++--
 deployment/kubernetes/templates/maintenance/Deployment.yaml | 5 +++++
 deployment/kubernetes/templates/neo4j/Deployment.yaml       | 5 +++--
 deployment/kubernetes/templates/webapp/Deployment.yaml      | 6 ++++++
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/deployment/kubernetes/templates/backend/Deployment.yaml b/deployment/kubernetes/templates/backend/Deployment.yaml
index 3c606fa85..1d7bcfad4 100644
--- a/deployment/kubernetes/templates/backend/Deployment.yaml
+++ b/deployment/kubernetes/templates/backend/Deployment.yaml
@@ -16,8 +16,7 @@ spec:
   progressDeadlineSeconds: {{ .Values.BACKEND.PROGRESS_DEADLINE_SECONDS }}
   strategy:
     rollingUpdate:
-      maxSurge: 0
-      maxUnavailable: "100%"
+      maxUnavailable: 1
   selector:
     matchLabels:
       app: {{ .Release.Name }}-backend
@@ -25,6 +24,8 @@ spec:
     metadata:
       annotations:
         backup.velero.io/backup-volumes: uploads
+        # make sure the pod is redeployed
+        rollme: {{ randAlphaNum 5 | quote }}
       labels:
         app: {{ .Release.Name }}-backend
     spec:
diff --git a/deployment/kubernetes/templates/maintenance/Deployment.yaml b/deployment/kubernetes/templates/maintenance/Deployment.yaml
index 1094d0833..6c4e7f8dd 100644
--- a/deployment/kubernetes/templates/maintenance/Deployment.yaml
+++ b/deployment/kubernetes/templates/maintenance/Deployment.yaml
@@ -11,6 +11,9 @@ metadata:
     app.kubernetes.io/managed-by: "{{ .Release.Service }}"
     helm.sh/chart:                "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
+  strategy:
+    rollingUpdate:
+      maxUnavailable: 1
   selector:
     matchLabels:
       app: {{ .Release.Name }}-maintenance
@@ -18,6 +21,8 @@ spec:
     metadata:
       labels:
         app: {{ .Release.Name }}-maintenance
+        # make sure the pod is redeployed
+        rollme: {{ randAlphaNum 5 | quote }}
     spec:
       containers:
       - name: maintenance
diff --git a/deployment/kubernetes/templates/neo4j/Deployment.yaml b/deployment/kubernetes/templates/neo4j/Deployment.yaml
index dc3ec902d..2176fb2d9 100644
--- a/deployment/kubernetes/templates/neo4j/Deployment.yaml
+++ b/deployment/kubernetes/templates/neo4j/Deployment.yaml
@@ -14,8 +14,7 @@ spec:
   replicas: 1
   strategy:
     rollingUpdate:
-      maxSurge: 0
-      maxUnavailable: "100%"
+      maxUnavailable: 1
   selector:
     matchLabels:
       app: {{ .Release.Name }}-neo4j
@@ -24,6 +23,8 @@ spec:
       name: neo4j
       annotations:
         backup.velero.io/backup-volumes: neo4j-data
+        # make sure the pod is redeployed
+        rollme: {{ randAlphaNum 5 | quote }}
       labels:
         app: {{ .Release.Name }}-neo4j
     spec:
diff --git a/deployment/kubernetes/templates/webapp/Deployment.yaml b/deployment/kubernetes/templates/webapp/Deployment.yaml
index e418343ed..93d1639d4 100644
--- a/deployment/kubernetes/templates/webapp/Deployment.yaml
+++ b/deployment/kubernetes/templates/webapp/Deployment.yaml
@@ -14,11 +14,17 @@ spec:
   replicas: {{ .Values.WEBAPP.REPLICAS }}
   minReadySeconds: {{ .Values.WEBAPP.MIN_READY_SECONDS }}
   progressDeadlineSeconds: {{ .Values.WEBAPP.PROGRESS_DEADLINE_SECONDS }}
+  strategy:
+    rollingUpdate:
+      maxUnavailable: 1
   selector:
     matchLabels:
       app: {{ .Release.Name }}-webapp
   template:
     metadata:
+      annotations:
+        # make sure the pod is redeployed
+        rollme: {{ randAlphaNum 5 | quote }}
       labels:
         app: {{ .Release.Name }}-webapp
     spec: