From 24f1f2fd2cc448160eb39559bdade09bed7399b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20J=C3=B6rg?= <moritz.jorg@oceanbox.io>
Date: Fri, 24 Jul 2026 14:21:27 +0200
Subject: [PATCH] proteus/sorcerer: Clean up unused env's

---
 helmfile.d/proteus.yaml.gotmpl                |  1 +
 .../proteus/manifests/workerdeployment.yaml   |  6 +-----
 values/proteus/values/values-staging.yaml     |  3 +++
 .../staging-ekman/deployment_patch.yaml       |  5 -----
 .../kustomize/staging-ekman/kueue-config.yaml |  7 -------
 .../staging-ekman/kustomization.yaml          |  1 -
 .../kustomize/staging-ekman/rbac.yaml         | 19 -------------------
 7 files changed, 5 insertions(+), 37 deletions(-)
 create mode 100644 values/proteus/values/values-staging.yaml
 delete mode 100644 values/sorcerer/kustomize/staging-ekman/kueue-config.yaml

diff --git a/helmfile.d/proteus.yaml.gotmpl b/helmfile.d/proteus.yaml.gotmpl
index 098afdb4..a3bce4d5 100644
--- a/helmfile.d/proteus.yaml.gotmpl
+++ b/helmfile.d/proteus.yaml.gotmpl
@@ -15,6 +15,7 @@ releases:
   - ../values/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml
   - ../values/proteus/env.yaml.gotmpl
   - ../values/proteus/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
+  - ../values/proteus/values/values-staging.yaml
   hooks:
   - events: [ prepare, cleanup ]
     showlogs: true
diff --git a/values/proteus/manifests/workerdeployment.yaml b/values/proteus/manifests/workerdeployment.yaml
index 2437a2ea..586744bb 100644
--- a/values/proteus/manifests/workerdeployment.yaml
+++ b/values/proteus/manifests/workerdeployment.yaml
@@ -129,7 +129,7 @@ spec:
             claimName: proteus-ceph-archives
       containers:
         - name: proteus
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.stagingImage.repository }}:{{ .Values.stagingImage.tag }}"
           resources:
             requests:
               cpu: 500m
@@ -142,10 +142,6 @@ spec:
               value: plume,xtract
             - name: TEMPORAL_NAMESPACE
               value: staging-atlantis
-            - name: APP_ENV
-              value: staging
-            - name: ARCHIVE_PVC
-              value: dev-queue-ceph-archives
             - name: MAX_CONCURRENT_ACTIVITIES
               value: "2"
             - name: OTEL_EXPORTER_OTLP_ENDPOINT
diff --git a/values/proteus/values/values-staging.yaml b/values/proteus/values/values-staging.yaml
new file mode 100644
index 00000000..3b985668
--- /dev/null
+++ b/values/proteus/values/values-staging.yaml
@@ -0,0 +1,3 @@
+stagingImage:
+  repository: git.oceanbox.io/oceanbox/poseidon/proteus
+  tag: v2.17.0
diff --git a/values/sorcerer/kustomize/staging-ekman/deployment_patch.yaml b/values/sorcerer/kustomize/staging-ekman/deployment_patch.yaml
index d51e456b..0b4a529f 100644
--- a/values/sorcerer/kustomize/staging-ekman/deployment_patch.yaml
+++ b/values/sorcerer/kustomize/staging-ekman/deployment_patch.yaml
@@ -22,9 +22,4 @@
   value:
     secretRef:
       name: staging-sorcerer-env
-- op: add
-  path: /spec/template/spec/containers/0/envFrom/-
-  value:
-    configMapRef:
-      name: staging-sorcerer-kueue-config
 
diff --git a/values/sorcerer/kustomize/staging-ekman/kueue-config.yaml b/values/sorcerer/kustomize/staging-ekman/kueue-config.yaml
deleted file mode 100644
index 95a54e4f..00000000
--- a/values/sorcerer/kustomize/staging-ekman/kueue-config.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: staging-sorcerer-kueue-config
-data:
-  KUEUE_NAMESPACE: "dev-queue"
-  KUEUE_ARCHIVE_PVC: "dev-queue-ceph-archives"
diff --git a/values/sorcerer/kustomize/staging-ekman/kustomization.yaml b/values/sorcerer/kustomize/staging-ekman/kustomization.yaml
index 6d642e0e..544b2f92 100644
--- a/values/sorcerer/kustomize/staging-ekman/kustomization.yaml
+++ b/values/sorcerer/kustomize/staging-ekman/kustomization.yaml
@@ -19,7 +19,6 @@ resources:
 - configurations.yaml
 - keyvault.yaml
 - rbac.yaml
-- kueue-config.yaml
 - secretstore.yaml
 - statestore.yaml
 - tracing.yaml
diff --git a/values/sorcerer/kustomize/staging-ekman/rbac.yaml b/values/sorcerer/kustomize/staging-ekman/rbac.yaml
index a9178a5a..1392b9af 100644
--- a/values/sorcerer/kustomize/staging-ekman/rbac.yaml
+++ b/values/sorcerer/kustomize/staging-ekman/rbac.yaml
@@ -8,7 +8,6 @@ rules:
   - ""
   resourceNames:
   - staging-sorcerer-appsettings
-  - staging-sorcerer-kueue-config
   resources:
   - configmaps
   verbs:
@@ -24,24 +23,6 @@ rules:
   verbs:
   - get
   - watch
-- apiGroups:
-  - jobset.x-k8s.io
-  resources:
-  - jobsets
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - pods
-  - pods/log
-  verbs:
-  - get
-  - list
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding