From 1ea138ab80ff73b73a6bb6e9da2d65e29cfcb4bc Mon Sep 17 00:00:00 2001
From: Sven Ketelsen <sven.ketelsen@netgo.de>
Date: Sun, 5 Jun 2022 13:59:19 +0200
Subject: [PATCH] feat: secrets 3

---
 smardigo/templates/connect/secret.yml       |  6 +++---
 smardigo/templates/wordpress/deployment.yml | 14 ++++++++------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/smardigo/templates/connect/secret.yml b/smardigo/templates/connect/secret.yml
index c6fc384..8eb4075 100644
--- a/smardigo/templates/connect/secret.yml
+++ b/smardigo/templates/connect/secret.yml
@@ -11,10 +11,10 @@ data:
   # try to get the old secret
   # keep in mind, that a dry-run only returns an empty map 
   {{- $old_sec := lookup "v1" "Secret" .Release.Namespace $secret_name | default dict }}
-  {{- $old_sec_data := (get $old_sec "data") | default dict }}
+#  {{- $old_sec_data := (get $old_sec "data") | default dict }}
 
-  {{- $jwtSecret := (get $old_sec_data "JWT_SECRET") | default (randAlphaNum 32 | b64enc) }}
-  JWT_SECRET: {{ $jwtSecret | quote }}
+#  {{- $jwtSecret := (get $old_sec_data "JWT_SECRET") | default (randAlphaNum 32 | b64enc) }}
+  JWT_SECRET: {{ default (randAlphaNum 32 | b64enc }}
 
   ADMIN_PASSWORD: "{{ .Values.connect.database.password | b64enc}}"
   DATASOURCE_USERNAME: "{{ .Values.connect.database.username | b64enc }}"
diff --git a/smardigo/templates/wordpress/deployment.yml b/smardigo/templates/wordpress/deployment.yml
index fcea139..c2824fc 100644
--- a/smardigo/templates/wordpress/deployment.yml
+++ b/smardigo/templates/wordpress/deployment.yml
@@ -8,6 +8,8 @@ spec:
   selector:
     matchLabels:
       app: "wordpress"
+  strategy:
+    type: Recreate
   template:
     metadata:
       labels:
@@ -29,12 +31,6 @@ spec:
         hostnames:
         - "{{ .Values.sharedService.maria.host.name }}"
       containers:
-#      - name: "ubuntu"
-#        image: "ubuntu:20.04"
-#        command:
-#        - sleep
-#        args:
-#        - "3600"
       - name: "wordpress"
         image: "{{ .Values.harbor.host.name }}/{{ .Values.wordpress.image.name }}:{{ .Values.wordpress.image.version }}"
         imagePullPolicy: Always
@@ -89,6 +85,12 @@ spec:
               key: SMA_WORKFLOW_AUTH_TOKEN
         ports:
         - containerPort: 80
+#      - name: "ubuntu"
+#        image: "ubuntu:20.04"
+#        command:
+#        - sleep
+#        args:
+#        - "3600"
       initContainers:
       - name: init-maria
         image: busybox:1.28