From 5089fb441bb85cf6a546ae7ff212e8b4f8328e39 Mon Sep 17 00:00:00 2001
From: Simen Kirkvik <simen.kirkvik@oceanbox.io>
Date: Thu, 27 Nov 2025 12:44:18 +0100
Subject: [PATCH] Codex: Fix kustomize staging patches

---
 .../kustomize/staging/deployment_patch.yaml   | 75 ++++++++++++++++-
 values/codex/kustomize/staging/env.patch.yaml | 82 -------------------
 .../kustomize/staging/kustomization.yaml      |  3 -
 3 files changed, 71 insertions(+), 89 deletions(-)
 delete mode 100644 values/codex/kustomize/staging/env.patch.yaml

diff --git a/values/codex/kustomize/staging/deployment_patch.yaml b/values/codex/kustomize/staging/deployment_patch.yaml
index a500d768..0762d414 100644
--- a/values/codex/kustomize/staging/deployment_patch.yaml
+++ b/values/codex/kustomize/staging/deployment_patch.yaml
@@ -1,6 +1,73 @@
 - op: add
-  path: /spec/template/spec/containers/0/-
+  path: /spec/template/spec/containers/0/envFrom
   value:
-    envFrom:
-      secretRef:
-        name: azure-keyvault
+    secretRef:
+      name: azure-keyvault
+- op: add
+  path: /spec/template/spec/containers/0/env
+  value:
+    - name: APP_NAME
+      valueFrom:
+        fieldRef:
+          fieldPath: metadata.name
+    - name: APP_NAMESPACE
+      valueFrom:
+        fieldRef:
+          fieldPath: metadata.namespace
+    - name: APP_NAMESPACE
+      value: prod-atlantis
+    - name: DOTNET_ENVIRONMENT
+      value: Development
+    - name: ASPNETCORE_ENVIRONMENT
+      value: Development
+    - name: DB_HOST
+      valueFrom:
+        secretKeyRef:
+          name: staging-atlantis-db-app
+          key: host
+    - name: DB_PORT
+      valueFrom:
+        secretKeyRef:
+          name: staging-atlantis-db-app
+          key: port
+    - name: DB_DATABASE
+      valueFrom:
+        secretKeyRef:
+          name: staging-atlantis-db-app
+          key: dbname
+    - name: DB_USER
+      valueFrom:
+        secretKeyRef:
+          name: staging-atlantis-db-app
+          key: user
+    - name: DB_PASSWORD
+      valueFrom:
+        secretKeyRef:
+          name: staging-atlantis-db-app
+          key: password
+    - name: FGA_DB_HOST
+      valueFrom:
+        secretKeyRef:
+          name: staging-openfga-db-app
+          key: host
+    - name: FGA_DB_PORT
+      valueFrom:
+        secretKeyRef:
+          name: staging-openfga-db-app
+          key: port
+    - name: FGA_DB_DATABASE
+      valueFrom:
+        secretKeyRef:
+          name: staging-openfga-db-app
+          key: dbname
+    - name: FGA_DB_USER
+      valueFrom:
+        secretKeyRef:
+          name: staging-openfga-db-app
+          key: user
+    - name: FGA_DB_PASSWORD
+      valueFrom:
+        secretKeyRef:
+          name: staging-openfga-db-app
+          key: password
+  name: azure-keyvault
diff --git a/values/codex/kustomize/staging/env.patch.yaml b/values/codex/kustomize/staging/env.patch.yaml
deleted file mode 100644
index cbf25b7e..00000000
--- a/values/codex/kustomize/staging/env.patch.yaml
+++ /dev/null
@@ -1,82 +0,0 @@
-# env.patch.yaml
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: staging-codex
-  labels:
-    app.kubernetes.io/name: codex
-    app.kubernetes.io/instance: staging-codex
-spec:
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: codex
-        app.kubernetes.io/instance: staging-codex
-    spec:
-      containers:
-        - name: codex
-          env:
-          - name: APP_NAME
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.name
-          - name: APP_NAMESPACE
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.namespace
-          - name: APP_NAMESPACE
-            value: prod-atlantis
-          - name: DOTNET_ENVIRONMENT
-            value: Development
-          - name: ASPNETCORE_ENVIRONMENT
-            value: Development
-          - name: DB_HOST
-            valueFrom:
-              secretKeyRef:
-                name: staging-atlantis-db-app
-                key: host
-          - name: DB_PORT
-            valueFrom:
-              secretKeyRef:
-                name: staging-atlantis-db-app
-                key: port
-          - name: DB_DATABASE
-            valueFrom:
-              secretKeyRef:
-                name: staging-atlantis-db-app
-                key: dbname
-          - name: DB_USER
-            valueFrom:
-              secretKeyRef:
-                name: staging-atlantis-db-app
-                key: user
-          - name: DB_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: staging-atlantis-db-app
-                key: password
-          - name: FGA_DB_HOST
-            valueFrom:
-              secretKeyRef:
-                name: staging-openfga-db-app
-                key: host
-          - name: FGA_DB_PORT
-            valueFrom:
-              secretKeyRef:
-                name: staging-openfga-db-app
-                key: port
-          - name: FGA_DB_DATABASE
-            valueFrom:
-              secretKeyRef:
-                name: staging-openfga-db-app
-                key: dbname
-          - name: FGA_DB_USER
-            valueFrom:
-              secretKeyRef:
-                name: staging-openfga-db-app
-                key: user
-          - name: FGA_DB_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: staging-openfga-db-app
-                key: password
diff --git a/values/codex/kustomize/staging/kustomization.yaml b/values/codex/kustomize/staging/kustomization.yaml
index d4370f1f..23150bf6 100644
--- a/values/codex/kustomize/staging/kustomization.yaml
+++ b/values/codex/kustomize/staging/kustomization.yaml
@@ -10,8 +10,5 @@ patches:
       version: v1
       kind: Deployment
     path: deployment_patch.yaml
-  - path: env.patch.yaml
-    target:
-      labelSelector: "app.kubernetes.io/name=codex"
 resources:
   - ../base