From 985d05b0a0ef07ce03c12f0f413a4cafcbb9f40e Mon Sep 17 00:00:00 2001
From: Wolfgang Hottgenroth <wolfgang.hottgenroth@icloud.com>
Date: Thu, 14 Dec 2023 11:14:50 +0100
Subject: [PATCH] fix deploy

---
 .woodpecker.yml                |  4 +++-
 deployment/deploy-yml.tmpl     | 14 +++++---------
 deployment/load-config.sh      | 24 ++++++++++++++++--------
 src/udi/config-pg-cluster.json | 23 +++++++++++++++++++++++
 4 files changed, 47 insertions(+), 18 deletions(-)
 create mode 100644 src/udi/config-pg-cluster.json

diff --git a/.woodpecker.yml b/.woodpecker.yml
index e12322d..df4084c 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -25,6 +25,8 @@ steps:
     commands:
       - printf "$KUBE_CONFIG_CONTENT" > /tmp/kubeconfig
       - export KUBECONFIG=/tmp/kubeconfig
-      - cat $CI_WORKSPACE/deployment/deploy-yml.tmpl | sed -e 's,%IMAGE%,'$IMAGE_NAME':'$CI_COMMIT_TAG',' | kubectl apply -f - 
+      - for N in "udi udi-pg"; do
+          cat $CI_WORKSPACE/deployment/deploy-yml.tmpl | sed -e 's,%IMAGE%,'$IMAGE_NAME':'$CI_COMMIT_TAG',' | kubectl apply -n $N -f - 
+        done
     when:
       - event: tag
diff --git a/deployment/deploy-yml.tmpl b/deployment/deploy-yml.tmpl
index 3775cd6..f1a9dbd 100644
--- a/deployment/deploy-yml.tmpl
+++ b/deployment/deploy-yml.tmpl
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: udi-archive
-  namespace: udi
 spec:
   accessModes:
     - ReadWriteOnce
@@ -15,11 +14,10 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: udi
-  namespace: udi
   labels:
     app: udi
   annotations:
-    secret.reloader.stakater.com/reload: "udi-conf,udi-db-cred"
+    secret.reloader.stakater.com/reload: "udi-conf,udi-db-cred,mqtt-password"
 spec:
   replicas: 1
   selector:
@@ -33,15 +31,13 @@ spec:
       containers:
         - name: udi
           image: %IMAGE%
-          env:
-            - name: UDI_CONF
-              valueFrom:
-                secretKeyRef:
-                  name: udi-conf
-                  key: UDI_CONF
           envFrom:
             - secretRef: 
                 name: udi-db-cred
+            - secretRef:
+                name: mqtt-password
+            - secretRef:
+                name: udi-conf
           volumeMounts:
             - mountPath: /archive
               name: udi-archive
diff --git a/deployment/load-config.sh b/deployment/load-config.sh
index 7acae53..dedb27b 100755
--- a/deployment/load-config.sh
+++ b/deployment/load-config.sh
@@ -5,9 +5,9 @@ if [ "$FILE" = "" ]; then
   echo "give config file to load as first argument"
   exit 1
 fi
-SECRET_NAME=$2
-if [ "$SECRET_NAME" = "" ]; then
-  echo "give secret name to create/modify as second argument"
+MQTT_PASSWORD=$2
+if [ "$MQTT_PASSWORD" = "" ]; then
+  echo "give mqtt password as second argument"
   exit 1
 fi
 NAMESPACE=$3
@@ -16,7 +16,7 @@ if [ "$NAMESPACE" = "" ]; then
   exit 1
 fi
 
-kubectl create secret generic $SECRET_NAME \
+kubectl create secret generic udi-conf \
   --from-literal=UDI_CONF="`cat $FILE`" \
   -n $NAMESPACE \
   --dry-run=client \
@@ -24,13 +24,21 @@ kubectl create secret generic $SECRET_NAME \
   --save-config | \
 kubectl apply -f -
 
+kubectl create secret generic mqtt-password \
+  --from-literal=MQTT_PASSWORD="$MQTT_PASSWORD" \
+  -n $NAMESPACE \
+  --dry-run=client \
+  -o yaml \
+  --save-config | \
+kubectl apply -f -
+
 . ~/Workspace/MyKubernetesEnv/ENVDB
-DATABASE=udi
-LOGIN=udi
+DATABASE="udi-$NAMESPACE"
+LOGIN="udi-$NAMESPACE"
 PASSWORD=`openssl rand -base64 24` 
 psql <<EOF
-ALTER USER $LOGIN WITH PASSWORD '$PASSWORD';
-GRANT ALL PRIVILEGES ON DATABASE $DATABASE TO $LOGIN;
+ALTER USER "$LOGIN" WITH PASSWORD '$PASSWORD';
+GRANT ALL PRIVILEGES ON DATABASE "$DATABASE" TO "$LOGIN";
 COMMIT;
 EOF
 
diff --git a/src/udi/config-pg-cluster.json b/src/udi/config-pg-cluster.json
new file mode 100644
index 0000000..0bbf5cb
--- /dev/null
+++ b/src/udi/config-pg-cluster.json
@@ -0,0 +1,23 @@
+{
+  "mqtt": {
+    "broker": "ssl://eu1.cloud.thethings.network:8883",
+    "username": "com-passavant-geiger-poc@ttn",
+    "password": "ENV",
+    "tlsEnable": "true"
+  },
+  "topicMappings": [
+    {
+      "topics": [ "v3/com-passavant-geiger-poc@ttn/devices/#" ],
+      "handler": "TTN",
+      "id": "TTN0",
+      "config": {
+        "databaseConnStr": "",
+        "attributes": {
+        }
+      }
+    }
+  ],
+  "archiver": {
+    "dir": "/archive"
+  }
+}