From 2ba10d763d1d7666997a190b5cc321dfb87e0a03 Mon Sep 17 00:00:00 2001
From: Joakim Olsson <joakim@unbound.se>
Date: Tue, 8 Apr 2025 07:49:54 +0200
Subject: [PATCH] feat(k8s): add RabbitMQ configurations and update secrets

Add a new extract for RabbitMQ in the secrets and include
AMQP_URL in local secrets. Update the merge policy and
engine version in the deployment template. Remove unused
RabbitMQ secret reference from the deployment. These changes
improve configuration management and ensure consistency
between environments.
---
 k8s/deploy.yaml        | 2 --
 k8s/secrets-local.yaml | 1 +
 k8s/secrets.yaml       | 4 ++++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/k8s/deploy.yaml b/k8s/deploy.yaml
index 8c33b5b..9dbd611 100644
--- a/k8s/deploy.yaml
+++ b/k8s/deploy.yaml
@@ -62,8 +62,6 @@ spec:
         envFrom:
         - secretRef:
             name: schemas
-        - secretRef:
-            name: rabbitmq
       restartPolicy: Always
       serviceAccountName: schemas
 ---
diff --git a/k8s/secrets-local.yaml b/k8s/secrets-local.yaml
index 7c26e30..69bedc8 100644
--- a/k8s/secrets-local.yaml
+++ b/k8s/secrets-local.yaml
@@ -5,3 +5,4 @@ metadata:
 stringData:
   API_KEY: supersecret123!
   POSTGRES_URL: "postgres://postgres:postgres@postgres:5432/schemas?sslmode=disable"
+  AMQP_URL: "amqp://user:password@rabbitmq:5672/"
diff --git a/k8s/secrets.yaml b/k8s/secrets.yaml
index 1b8fb66..2b55cd7 100644
--- a/k8s/secrets.yaml
+++ b/k8s/secrets.yaml
@@ -11,6 +11,8 @@ spec:
   target:
     creationPolicy: Owner
     template:
+      mergePolicy: Merge
+      engineVersion: 'v2'
       data:
         POSTGRES_URL: "postgres://{{ .DB_USERNAME }}:{{ .DB_PASSWORD }}@{{ .DB_HOST }}:{{ .DB_PORT }}/schemas?sslmode=disable"
         API_KEY: "{{ .API_KEY }}"
@@ -21,3 +23,5 @@ spec:
       key: services/schemas
   - extract:
       key: rds/postgres/prod-psql
+  - extract:
+      key: mq/rabbit/prod