From 758af5cfa63dbf9e94dbbd2cc9bef5eb063226da Mon Sep 17 00:00:00 2001
From: "Casper V. Kristensen" <vk@magenta.dk>
Date: Wed, 28 Jun 2023 13:44:24 +0200
Subject: [PATCH] feat(orgviewer adm): [#48311] template environment variables
 directly

Previously, environment variables were templated into a ConfigMap which
was referenced through an `envFrom` in the deployment. Unfortunately,
Kubernetes does not restart deployments on changes to their referenced
ConfigMaps[1], so this indirection means that deployments have to be
restarted manually every time a change is made - something that is very
easy to forget in an otherwise GitOpsy workflow.

[1] https://github.com/kubernetes/kubernetes/issues/22368
---
 os2mo/templates/orgviewer/adm/configmap.yaml  | 15 ---------------
 os2mo/templates/orgviewer/adm/deployment.yaml |  8 +++++---
 2 files changed, 5 insertions(+), 18 deletions(-)
 delete mode 100644 os2mo/templates/orgviewer/adm/configmap.yaml

diff --git a/os2mo/templates/orgviewer/adm/configmap.yaml b/os2mo/templates/orgviewer/adm/configmap.yaml
deleted file mode 100644
index 857e87f..0000000
--- a/os2mo/templates/orgviewer/adm/configmap.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-# SPDX-FileCopyrightText: Magenta ApS
-#
-# SPDX-License-Identifier: MPL-2.0
----
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: orgviewer-adm-config
-  {{- with .Values.annotations }}
-  annotations:
-  {{- toYaml . | nindent 4 }}
-  {{- end }}
-data:
-{{ toYaml .Values.orgviewer.adm.environment | indent 2 }}
diff --git a/os2mo/templates/orgviewer/adm/deployment.yaml b/os2mo/templates/orgviewer/adm/deployment.yaml
index 7aeee41..2933e71 100644
--- a/os2mo/templates/orgviewer/adm/deployment.yaml
+++ b/os2mo/templates/orgviewer/adm/deployment.yaml
@@ -64,9 +64,11 @@ spec:
               value: {{ $value | quote }}
             {{- end }}
 
-          envFrom:
-            - configMapRef:
-                name: orgviewer-adm-config
+            {{- range $name, $value := .Values.orgviewer.adm.environment }}
+            - name: {{ $name }}
+              value: {{ $value | quote }}
+            {{- end }}
+
           ports:
             - containerPort: 80
           resources: