proteus/sorcerer: Clean up unused env's

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

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

values/proteus/values/values-staging.yaml

@@ -0,0 +1,3 @@
+stagingImage:
+  repository: git.oceanbox.io/oceanbox/poseidon/proteus
+  tag: v2.17.0

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
 

values/sorcerer/kustomize/staging-ekman/kueue-config.yaml

@@ -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"

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

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