From fa0d15ea34c51c37b65f7992c74242430f87b1cb Mon Sep 17 00:00:00 2001
From: Aaron Riedel <git@ar21.de>
Date: Thu, 13 Feb 2025 20:15:43 +0100
Subject: [PATCH] A

---
 .sops.yaml                                  |  8 ++++----
 app-files/apps.yaml                         | 14 +++++++-------
 drone/secret.yaml                           |  1 -
 hoylogo/overlays/prod/kustomization.yaml    |  2 +-
 hoylogo/overlays/staging/kustomization.yaml |  2 +-
 openproject/db.yaml                         |  1 -
 openproject/secret.yaml                     |  1 -
 surveybot/secret.yaml                       |  1 -
 surveybot/surveybot.yaml                    |  1 -
 9 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/.sops.yaml b/.sops.yaml
index 964334c..ad0b75f 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -1,13 +1,13 @@
 ---
 keys:
-  - &argo age14uxgmvw26e7f82gkvxl0zwnfc5l75rdn5sms4zj0xrtrnlgn4qlsqh3kkt
+  - &argo-aaron age14uxgmvw26e7f82gkvxl0zwnfc5l75rdn5sms4zj0xrtrnlgn4qlsqh3kkt
   - &aaron age1z5wtjmk0jw0j9qz9k5rrnp30nzqxrl3v6wgl7eryvqus28zekp4qpx9jc2
-  - &argo-yolokube age1mraede6gqxkh2rkeq5fjrcflp7emenl2qn885asxvtx5erga2pdqujuexz
+  - &argo age1mraede6gqxkh2rkeq5fjrcflp7emenl2qn885asxvtx5erga2pdqujuexz
 creation_rules:
   - path_regex: .*
     encrypted_regex: ^(data|stringData)$
     key_groups:
       - age:
-          - *argo
+          - *argo-aaron
           - *aaron
-          - *argo-yolokube
+          - *argo
diff --git a/app-files/apps.yaml b/app-files/apps.yaml
index fd12971..22d1836 100644
--- a/app-files/apps.yaml
+++ b/app-files/apps.yaml
@@ -66,7 +66,7 @@ spec:
             - drone-secrets
           rbac:
             buildNamespaces:
-              - drone
+              - aaron-drone
           env:
             DRONE_RPC_HOST: drone.ar21.de
             DRONE_RPC_PROTO: https
@@ -76,7 +76,7 @@ spec:
       path: drone
   destination:
     server: https://kubernetes.default.svc
-    namespace: drone
+    namespace: aaron-drone
   syncPolicy:
     syncOptions:
     - CreateNamespace=true
@@ -96,7 +96,7 @@ spec:
     path: hoylogo/overlays/prod
   destination:
     server: https://kubernetes.default.svc
-    namespace: hoylogo
+    namespace: aaron-hoylogo
   syncPolicy:
     syncOptions:
     - CreateNamespace=true
@@ -116,7 +116,7 @@ spec:
     path: hoylogo/overlays/staging
   destination:
     server: https://kubernetes.default.svc
-    namespace: hoylogo-staging
+    namespace: aaron-hoylogo-staging
   syncPolicy:
     syncOptions:
     - CreateNamespace=true
@@ -136,7 +136,7 @@ spec:
     path: surveybot
   destination:
     server: https://kubernetes.default.svc
-    namespace: surveybot
+    namespace: aaron-surveybot
   syncPolicy:
     syncOptions:
     - CreateNamespace=true
@@ -158,7 +158,7 @@ spec:
         releaseName: cloudnative-pg
   destination:
     server: https://kubernetes.default.svc
-    namespace: cnpg
+    namespace: aaron-cnpg
   syncPolicy:
     syncOptions:
     - CreateNamespace=true
@@ -188,7 +188,7 @@ spec:
       path: openproject
   destination:
     server: https://kubernetes.default.svc
-    namespace: openproject
+    namespace: aaron-openproject
   syncPolicy:
     syncOptions:
       - CreateNamespace=true
diff --git a/drone/secret.yaml b/drone/secret.yaml
index 817abd8..69bfec7 100644
--- a/drone/secret.yaml
+++ b/drone/secret.yaml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Secret
 metadata:
     name: drone-secrets
-    namespace: drone
 type: Opaque
 data:
     DRONE_RPC_SECRET: ENC[AES256_GCM,data:9wEps0DmvV8Qqx2dARB6M1stwAdf547n5rbVBEiaa4lL5GPAbHMgOI7bYIo=,iv:3SAA0PNJT1ajUx1SJWNpX2AiJnmcFf8tJCrvOW3fJqk=,tag:Z3yuE/jfyAldVjrdIcPlFg==,type:str]
diff --git a/hoylogo/overlays/prod/kustomization.yaml b/hoylogo/overlays/prod/kustomization.yaml
index b90fc70..dc2e319 100644
--- a/hoylogo/overlays/prod/kustomization.yaml
+++ b/hoylogo/overlays/prod/kustomization.yaml
@@ -6,7 +6,7 @@ images:
 - name: git.ar21.de/aaron/hoylogo
   newName: git.ar21.de/aaron/hoylogo
   newTag: "4"
-namespace: hoylogo
+namespace: aaron-hoylogo
 patches:
 - patch: |-
     - op: replace
diff --git a/hoylogo/overlays/staging/kustomization.yaml b/hoylogo/overlays/staging/kustomization.yaml
index 6934a6d..272b235 100644
--- a/hoylogo/overlays/staging/kustomization.yaml
+++ b/hoylogo/overlays/staging/kustomization.yaml
@@ -6,7 +6,7 @@ images:
 - name: git.ar21.de/aaron/hoylogo
   newName: git.ar21.de/aaron/hoylogo
   newTag: staging-1
-namespace: hoylogo-staging
+namespace: aaron-hoylogo-staging
 patches:
 - patch: |-
     - op: replace
diff --git a/openproject/db.yaml b/openproject/db.yaml
index 42a7d89..a8c2fa0 100644
--- a/openproject/db.yaml
+++ b/openproject/db.yaml
@@ -2,7 +2,6 @@ apiVersion: postgresql.cnpg.io/v1
 kind: Cluster
 metadata:
   name: openproject
-  namespace: openproject
 spec:
   instances: 3
   storage:
diff --git a/openproject/secret.yaml b/openproject/secret.yaml
index 038aef8..f08b681 100644
--- a/openproject/secret.yaml
+++ b/openproject/secret.yaml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Secret
 metadata:
     name: openproject-secret
-    namespace: openproject
     labels:
         app.kubernetes.io/name: openproject-secret
         app.kubernetes.io/part-of: openproject
diff --git a/surveybot/secret.yaml b/surveybot/secret.yaml
index 336b522..6634dc3 100644
--- a/surveybot/secret.yaml
+++ b/surveybot/secret.yaml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Secret
 metadata:
     name: surveybot-token
-    namespace: surveybot
 type: Opaque
 data:
     TOKEN: ENC[AES256_GCM,data:HZpvxzlqgtHIXstqo+wH5h1SVfBBS7aV7fPEIGO3gq0Hu8wbqMDq8nzBnGHQik+5jR0AoYQvRKLqD+VyIPgHQX8Nc/15er+pyCxa2kLXXPg=,iv:3dcWIVEU7HzkBCA8IT6lHPzsywmW3nCM0HK3Wr8r5eA=,tag:QplCTrlD08dpZvZjBdvlbQ==,type:str]
diff --git a/surveybot/surveybot.yaml b/surveybot/surveybot.yaml
index 1fcfa9d..9378868 100644
--- a/surveybot/surveybot.yaml
+++ b/surveybot/surveybot.yaml
@@ -7,7 +7,6 @@ apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: surveybot
-  namespace: surveybot
 spec:
   schedule: "00 16 * * 5"
   successfulJobsHistoryLimit: 1