From 000510202ec3a2da4681ed3ed79505ae9038e946 Mon Sep 17 00:00:00 2001
From: Wolfgang Hottgenroth <wolfgang.hottgenroth@icloud.com>
Date: Wed, 6 Nov 2024 17:47:00 +0100
Subject: [PATCH] separate configmap and deployment, add reloader

---
 deployment/configmap.yml   | 46 +++++++++++++++++++++++++++++++++++++
 deployment/deploy-yml.tmpl | 47 ++------------------------------------
 deployment/deploy.sh       |  2 ++
 3 files changed, 50 insertions(+), 45 deletions(-)
 create mode 100644 deployment/configmap.yml

diff --git a/deployment/configmap.yml b/deployment/configmap.yml
new file mode 100644
index 0000000..097684d
--- /dev/null
+++ b/deployment/configmap.yml
@@ -0,0 +1,46 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: heating-controller-config
+  namespace: homea
+data:
+  MQTT_BROKER: "emqx01-anonymous-cluster-internal.broker.svc.cluster.local"
+  MQTT_PORT: "1883"
+  MQTT_CLIENT_PREFIX: "HeatingController"
+  MQTT_BOX_TOPIC_PREFIXES: |
+    {
+      "high_temp": "heating/config/high_temp/",
+      "cmd": "heating/command/"
+    }
+  MQTT_CENTRAL_TOPICS: |
+    {
+      "general_off": "heating/system/general_off",
+      "maintenance_mode": "heating/system/maintenance_mode",
+      "status": "heating/system/status"
+    }
+  MQTT_STATUS_TOPIC: "heating/status"
+  OFF_TEMPERATURE: "5.0"
+  LOW_TEMPERATURE: "15.0"
+  DEFAULT_HIGH_TEMPERATURE: "21.0"
+  MAINTENANCE_TEMPERATURE: "30.0"
+  BOXES: |
+    {
+      "box1": {
+        "label": "living_room",
+        "windows": [ 
+          { "topic": "window/living_room/street_side", "label": "street_side" },
+          { "topic": "window/living_room/garden_side", "label": "garden_side" }
+        ],
+        "output_topic": "output/living_room"
+      },
+      "box2": {
+        "label": "kitchen",
+        "windows": [ 
+          { "topic": "window/kitchen/street_side", "label": "street_side" },
+          { "topic": "window/kitchen/garden_side", "label": "garden_side" },
+          { "topic": "window/kitchen/garden_door", "label": "garden_door" }
+        ],
+        "output_topic": "output/kitchen"
+      }
+    }
+
diff --git a/deployment/deploy-yml.tmpl b/deployment/deploy-yml.tmpl
index be044c3..bc7957f 100644
--- a/deployment/deploy-yml.tmpl
+++ b/deployment/deploy-yml.tmpl
@@ -1,52 +1,9 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: heating-controller-config
-data:
-  MQTT_BROKER: "emqx01-anonymous-cluster-internal.broker.svc.cluster.local"
-  MQTT_PORT: "1883"
-  MQTT_CLIENT_PREFIX: "HeatingController"
-  MQTT_BOX_TOPIC_PREFIXES: |
-    {
-      "high_temp": "heating/config/high_temp/",
-      "cmd": "heating/command/"
-    }
-  MQTT_CENTRAL_TOPICS: |
-    {
-      "general_off": "heating/system/general_off",
-      "maintenance_mode": "heating/system/maintenance_mode",
-      "status": "heating/system/status"
-    }
-  MQTT_STATUS_TOPIC: "heating/status"
-  OFF_TEMPERATURE: "5.0"
-  LOW_TEMPERATURE: "15.0"
-  DEFAULT_HIGH_TEMPERATURE: "21.0"
-  MAINTENANCE_TEMPERATURE: "30.0"
-  BOXES: |
-    {
-      "box1": {
-        "label": "living_room",
-        "windows": [ 
-          { "topic": "window/living_room/street_side", "label": "street_side" },
-          { "topic": "window/living_room/garden_side", "label": "garden_side" }
-        ],
-        "output_topic": "output/living_room"
-      },
-      "box2": {
-        "label": "kitchen",
-        "windows": [ 
-          { "topic": "window/kitchen/street_side", "label": "street_side" },
-          { "topic": "window/kitchen/garden_side", "label": "garden_side" },
-          { "topic": "window/kitchen/garden_door", "label": "garden_door" }
-        ],
-        "output_topic": "output/kitchen"
-      }
-    }
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: heating-controller
+  annotations:
+    secret.reloader.stakater.com/reload: "heating-controller-config"
 spec:
   replicas: 1
   selector:
diff --git a/deployment/deploy.sh b/deployment/deploy.sh
index 2bb4f27..33218bc 100755
--- a/deployment/deploy.sh
+++ b/deployment/deploy.sh
@@ -16,6 +16,8 @@ kubectl create namespace $NAMESPACE \
   -o yaml | \
   kubectl -f - apply
 
+kubectl apply -f $DEPLOYMENT_DIR/configmap.yml -n $NAMESPACE
+
 cat $DEPLOYMENT_DIR/deploy-yml.tmpl | \
   sed -e 's,%IMAGE%,'$IMAGE_NAME':'$IMAGE_TAG','g | \
   kubectl apply -f - -n $NAMESPACE