From 2563c7ca72a63b3de91b230d3dd90248d492117c Mon Sep 17 00:00:00 2001
From: Sven Ketelsen <sven.ketelsen@netgo.de>
Date: Thu, 2 Jun 2022 14:56:12 +0200
Subject: [PATCH] bugfix: secrets

---
 smardigo/templates/connect/secret.yml       |  3 +--
 smardigo/templates/sepa-exporter/secret.yml |  4 ++--
 smardigo/templates/uba-export/secret.yml    |  4 ++--
 smardigo/templates/wordpress/secret.yml     |  6 ++++++
 smardigo/values.yaml                        | 21 ++++++++++++++++-----
 5 files changed, 27 insertions(+), 11 deletions(-)
 create mode 100644 smardigo/templates/wordpress/secret.yml

diff --git a/smardigo/templates/connect/secret.yml b/smardigo/templates/connect/secret.yml
index 811a5ec..3c3d147 100644
--- a/smardigo/templates/connect/secret.yml
+++ b/smardigo/templates/connect/secret.yml
@@ -3,5 +3,4 @@ kind: Secret
 metadata:
   name: connect-secrets
 data:
-  JWT_SECRET: ZDI3NTJjNjU3NTU4NDg5Yzg3MjEyZTJhMjkyYTcyNjk=
-  AUTH_TOKEN: ZXlKbGJtTWlPaUpCTVRJNFEwSkRMVWhUTWpVMklpd2lZV3huSWpvaVpHbHlJbjAuLm5PV2xhZXRhM0swaHpwZ2dXaWNBeXcuaVc5ZF9tUmhKVm1FRzZGT3plT1BQY2VvNTRIMTBzdkZJWDlya1ZqcnZhUS5kSDNfQVlOOUZ1MV9hamk0MkpMY0h3
+  JWT_SECRET: "{{ .Values.connect.jwt.secret | b64enc }}"
diff --git a/smardigo/templates/sepa-exporter/secret.yml b/smardigo/templates/sepa-exporter/secret.yml
index 9b638d8..7e9bab0 100644
--- a/smardigo/templates/sepa-exporter/secret.yml
+++ b/smardigo/templates/sepa-exporter/secret.yml
@@ -3,5 +3,5 @@ kind: Secret
 metadata:
   name: "sepa-exporter-secrets"
 data:
-  SMA_WORKFLOW_AUTH_TOKEN: "{{ .Values.smardigo.workflow.api_token }}"
-  SMA_DOCUMENT_AUTH_TOKEN: "{{ .Values.smardigo.document.api_token }}"
+  SMA_WORKFLOW_AUTH_TOKEN: "{{ .Values.sepaExporter.workflow.api_token }}"
+  SMA_DOCUMENT_AUTH_TOKEN: "{{ .Values.sepaExporter.document.api_token }}"
diff --git a/smardigo/templates/uba-export/secret.yml b/smardigo/templates/uba-export/secret.yml
index a7d0436..4e4fc49 100644
--- a/smardigo/templates/uba-export/secret.yml
+++ b/smardigo/templates/uba-export/secret.yml
@@ -3,5 +3,5 @@ kind: Secret
 metadata:
   name: "uba-export-secrets"
 data:
-  SMA_WORKFLOW_AUTH_TOKEN: "{{ .Values.smardigo.workflow.api_token }}"
-  SMA_DOCUMENT_AUTH_TOKEN: "{{ .Values.smardigo.document.api_token }}"
+  SMA_WORKFLOW_AUTH_TOKEN: "{{ .Values.ubaExporter.workflow.api_token }}"
+  SMA_DOCUMENT_AUTH_TOKEN: "{{ .Values.ubaExporter.document.api_token }}"
diff --git a/smardigo/templates/wordpress/secret.yml b/smardigo/templates/wordpress/secret.yml
new file mode 100644
index 0000000..a12be82
--- /dev/null
+++ b/smardigo/templates/wordpress/secret.yml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: "wordpress-secrets"
+data:
+  SMA_WORKFLOW_AUTH_TOKEN: "{{ .Values.wordpress.workflow.api_token }}"
diff --git a/smardigo/values.yaml b/smardigo/values.yaml
index b3f1b71..b3e587f 100644
--- a/smardigo/values.yaml
+++ b/smardigo/values.yaml
@@ -1,7 +1,6 @@
 smardigo:
   document:
     host: "connect"
-    api_token: ""
   workflow:
     host: "connect"
     api_token: ""
@@ -42,6 +41,8 @@ connect:
       sender: "noreply-connect@netgo.de"
       sender_alias: "noreply-connect"
   domain: "dev-mobene-nsodev-connect.smardigo.digital"
+  jwt:
+    secret: "1e9bb2d390fa4093a31c0b8f1ff5d5ac"
 
 iam:
   image:
@@ -70,16 +71,26 @@ wordpress:
     username: "buergerportal"
     password: "Buerger?P0rtal."
   domain: "dev-mobene-nsodev-wordpress.smardigo.digital"
+  workflow:
+    api_token: ""
 
-ubaExporter:
+sepaExporter:
   image:
     version: "latest"
-    name: "smardigo/mobene-uba-export-app"
+    name: "smardigo/sepa-exporter-app"
+  workflow:
+    api_token: ""
+  document:
+    api_token: ""
 
-sepaExporter:
+ubaExporter:
   image:
     version: "latest"
-    name: "smardigo/sepa-exporter-app"
+    name: "smardigo/mobene-uba-export-app"
+  workflow:
+    api_token: ""
+  document:
+    api_token: ""
 
 # services which aren't part of the kubernetes cluster
 sharedService: