From 381431ee025a1017218cc74c8c76355a5f0ee09d Mon Sep 17 00:00:00 2001
From: Jonas Juselius <jonas.juselius@itpartner.no>
Date: Tue, 13 Feb 2024 12:56:19 +0100
Subject: [PATCH] fix: fix archmeister auxiliart env secrets

---
 .../base/archmeister-env-secret.yaml          |  9 --------
 charts/archmeister/prod/auxiliary.env         |  2 ++
 charts/archmeister/prod/kustomization.yaml    |  3 +++
 charts/archmeister/staging/auxiliary.env      |  2 ++
 charts/archmeister/staging/kustomization.yaml | 21 +++++++++++--------
 5 files changed, 19 insertions(+), 18 deletions(-)
 delete mode 100644 charts/archmeister/base/archmeister-env-secret.yaml
 create mode 100644 charts/archmeister/prod/auxiliary.env
 create mode 100644 charts/archmeister/staging/auxiliary.env

diff --git a/charts/archmeister/base/archmeister-env-secret.yaml b/charts/archmeister/base/archmeister-env-secret.yaml
deleted file mode 100644
index 19b080ff..00000000
--- a/charts/archmeister/base/archmeister-env-secret.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: archmeister-env
-  namespace: atlantis
-stringData:
-  OICD_CLIENT_SECRET: ieK3yak9zoh3yeewee8quahY6seiv7Ro
-  SEQ_APIKEY: bFdYPKLDvnau3fQa1vRV
-type: Opaque
diff --git a/charts/archmeister/prod/auxiliary.env b/charts/archmeister/prod/auxiliary.env
new file mode 100644
index 00000000..1f6bfdf7
--- /dev/null
+++ b/charts/archmeister/prod/auxiliary.env
@@ -0,0 +1,2 @@
+OICD_CLIENT_SECRET=ieK3yak9zoh3yeewee8quahY6seiv7Ro
+SEQ_APIKEY=bFdYPKLDvnau3fQa1vRV
diff --git a/charts/archmeister/prod/kustomization.yaml b/charts/archmeister/prod/kustomization.yaml
index a7581747..c4a86c21 100644
--- a/charts/archmeister/prod/kustomization.yaml
+++ b/charts/archmeister/prod/kustomization.yaml
@@ -4,6 +4,9 @@ secretGenerator:
 - name: prod-archmeister-appsettings
   files:
   - appsettings.json
+- name: prod-archmeister-env
+  envs:
+  - auxiliary.env
 patches:
 - path: deployment_patch.yaml
   target:
diff --git a/charts/archmeister/staging/auxiliary.env b/charts/archmeister/staging/auxiliary.env
new file mode 100644
index 00000000..1f6bfdf7
--- /dev/null
+++ b/charts/archmeister/staging/auxiliary.env
@@ -0,0 +1,2 @@
+OICD_CLIENT_SECRET=ieK3yak9zoh3yeewee8quahY6seiv7Ro
+SEQ_APIKEY=bFdYPKLDvnau3fQa1vRV
diff --git a/charts/archmeister/staging/kustomization.yaml b/charts/archmeister/staging/kustomization.yaml
index 4a4935be..87e0b2c2 100644
--- a/charts/archmeister/staging/kustomization.yaml
+++ b/charts/archmeister/staging/kustomization.yaml
@@ -1,14 +1,17 @@
 generatorOptions:
   disableNameSuffixHash: true
 secretGenerator:
-  - name: staging-archmeister-appsettings
-    files:
-      - appsettings.json
+- name: staging-archmeister-appsettings
+  files:
+    - appsettings.json
+- name: staging-archmeister-env
+  envs:
+  - auxiliary.env
 patches:
-  - target:
-      group: apps
-      version: v1
-      kind: Deployment
-    path: deployment_patch.yaml
+- path: deployment_patch.yaml
+  target:
+    version: v1
+    group: apps
+    kind: Deployment
 resources:
-  - ../base
+- ../base