From db011cfb4dc421b9e8892f2759ba27e5f8ef4f83 Mon Sep 17 00:00:00 2001
From: Jonas Juselius <jonas.juselius@oceanbox.io>
Date: Thu, 12 Dec 2024 13:15:25 +0100
Subject: [PATCH] fix: fix fixes

---
 values/sorcerer/prod/rbac.yaml       |  6 +++---
 values/sorcerer/prod/secrets.yaml    | 18 ++++++++--------
 values/sorcerer/staging/rbac.yaml    |  6 +++---
 values/sorcerer/staging/secrets.yaml | 18 ++++++++--------
 values/sorcerer/values-prod.yaml     | 31 +++++++++++++++++++++++++++-
 5 files changed, 54 insertions(+), 25 deletions(-)

diff --git a/values/sorcerer/prod/rbac.yaml b/values/sorcerer/prod/rbac.yaml
index 1b06262f..86fb2735 100644
--- a/values/sorcerer/prod/rbac.yaml
+++ b/values/sorcerer/prod/rbac.yaml
@@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: prod-sorcerer
-  namespace: prod
+  namespace: prod-sorcerer
 rules:
 - apiGroups:
   - ""
@@ -28,7 +28,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: prod-sorcerer
-  namespace: prod
+  namespace: prod-sorcerer
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -36,4 +36,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: prod-sorcerer
-  namespace: prod
\ No newline at end of file
+  namespace: prod-sorcerer
diff --git a/values/sorcerer/prod/secrets.yaml b/values/sorcerer/prod/secrets.yaml
index c531c4da..6b60d6a2 100644
--- a/values/sorcerer/prod/secrets.yaml
+++ b/values/sorcerer/prod/secrets.yaml
@@ -1,11 +1,11 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  annotations:
-    kyverno/clone: "true"
-  name: prod-sorcerer-env
-type: Opaque
-data:
+# apiVersion: v1
+# kind: Secret
+# metadata:
+#   annotations:
+#     kyverno/clone: "true"
+#   name: prod-sorcerer-env
+# type: Opaque
+# data:
 ---
 apiVersion: v1
 kind: Secret
@@ -14,4 +14,4 @@ metadata:
     kyverno/clone: "true"
   name: azure-keyvault
 type: Opaque
-data:
\ No newline at end of file
+data:
diff --git a/values/sorcerer/staging/rbac.yaml b/values/sorcerer/staging/rbac.yaml
index 8a4affbd..706a2bdb 100644
--- a/values/sorcerer/staging/rbac.yaml
+++ b/values/sorcerer/staging/rbac.yaml
@@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: staging-sorcerer
-  namespace: staging
+  namespace: staging-sorcerer
 rules:
 - apiGroups:
   - ""
@@ -28,7 +28,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: staging-sorcerer
-  namespace: staging
+  namespace: staging-sorcerer
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -36,4 +36,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: staging-sorcerer
-  namespace: staging
\ No newline at end of file
+  namespace: staging-sorcerer
diff --git a/values/sorcerer/staging/secrets.yaml b/values/sorcerer/staging/secrets.yaml
index cff0018a..e0f9d01e 100644
--- a/values/sorcerer/staging/secrets.yaml
+++ b/values/sorcerer/staging/secrets.yaml
@@ -1,11 +1,11 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  annotations:
-    kyverno/clone: "true"
-  name: staging-sorcerer-env
-type: Opaque
-data:
+# apiVersion: v1
+# kind: Secret
+# metadata:
+#   annotations:
+#     kyverno/clone: "true"
+#   name: staging-sorcerer-env
+# type: Opaque
+# data:
 ---
 apiVersion: v1
 kind: Secret
@@ -14,4 +14,4 @@ metadata:
     kyverno/clone: "true"
   name: azure-keyvault
 type: Opaque
-data:
\ No newline at end of file
+data:
diff --git a/values/sorcerer/values-prod.yaml b/values/sorcerer/values-prod.yaml
index 1193a70f..33ef8a20 100644
--- a/values/sorcerer/values-prod.yaml
+++ b/values/sorcerer/values-prod.yaml
@@ -1,6 +1,35 @@
-replicaCount: 2
+replicaCount: 1
+
+image:
+  tag: latest
+
+podAnnotations:
+  dapr.io/app-id: "prod-sorcerer"
+  dapr.io/enabled: "true"
+  dapr.io/app-port: "8085"
+  dapr.io/config: "tracing"
+  dapr.io/app-protocol: "http"
+  dapr.io/log-as-json: "true"
+  dapr.io/sidecar-cpu-request: "10m"
+  dapr.io/sidecar-memory-request: "50Mi"
+  # dapr.io/sidecar-cpu-limit: "300m"
+  # dapr.io/sidecar-memory-limit: "1000Mi"
+
+env:
+  - name: APP_VERSION
+    value: "0.0.0"
+  - name: LOG_LEVEL
+    value: "2"
+  - name: REDIS_USER
+    value: default
+  - name: REDIS_PASSWORD
+    valueFrom:
+      secretKeyRef:
+        name: prod-redis
+        key: redis-password
 
 ingress:
+  enabled: true
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-production
     nginx.ingress.kubernetes.io/affinity: "cookie"