From 5d751f32fbaffd280273f0b17f65a2eee23fdf04 Mon Sep 17 00:00:00 2001
From: Chris Lovering <chris.lovering.95@gmail.com>
Date: Wed, 13 Sep 2023 00:24:21 +0100
Subject: [PATCH] Move from toml based configmap to env based configmap

---
 .../namespaces/default/olli/config.yaml       | 34 -------------------
 .../namespaces/default/olli/configmap.yaml    |  9 +++++
 2 files changed, 9 insertions(+), 34 deletions(-)
 delete mode 100644 kubernetes/namespaces/default/olli/config.yaml
 create mode 100644 kubernetes/namespaces/default/olli/configmap.yaml

diff --git a/kubernetes/namespaces/default/olli/config.yaml b/kubernetes/namespaces/default/olli/config.yaml
deleted file mode 100644
index 3b32cabe..00000000
--- a/kubernetes/namespaces/default/olli/config.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: olli-config
-data:
-  olli.toml: |
-    [olli]
-    interval_minutes = 30
-
-    [loki]
-    api_url = "http://loki.loki.svc.cluster.local:3100"
-    jobs = [
-        "default/bot",
-        "default/site",
-        "default/sir-lancebot",
-        "default/metricity",
-        "default/snekbox",
-        "default/quackstack",
-        "default/thread-bot",
-        "default/black-knight"
-    ]
-
-    [[olli.tokens]]
-    token = "ERROR"
-    color = "#ff5f5f"
-
-    [[olli.tokens]]
-    token = "CRITICAL"
-    color = "#ff5f5f"
-
-    [[olli.tokens]]
-    token = "WARN"
-    color = "#ffe24d"
-    case_sensitive = true
diff --git a/kubernetes/namespaces/default/olli/configmap.yaml b/kubernetes/namespaces/default/olli/configmap.yaml
new file mode 100644
index 00000000..cf1e7fd9
--- /dev/null
+++ b/kubernetes/namespaces/default/olli/configmap.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: olli-config-env
+data:
+  LOKI_API_URL: http://loki.loki.svc.cluster.local:3100
+  LOKI_JOBS: default/bot,default/site,default/sir-lancebot,default/sir-robin,default/metricity,default/snekbox,default/quackstack,default/black-knight
+  SERVICE_INTERVAL_MINUTES: '30'
+  SERVICE_TOKENS: '[{"token":"CRITICAL","color":"#ff5f5f"},{"token":"ERROR","color":"#ff5f5f"},{"token":"WARN","color":"#ffe24d","case_sensitive":true}]'