From e031f5a735b95ba859656ed8bc754e753d69d953 Mon Sep 17 00:00:00 2001
From: Jonas Juselius <jonas.juselius@oceanbox.io>
Date: Mon, 12 Feb 2024 18:46:03 +0100
Subject: [PATCH] fix: fix namespacing in hipster kustomizations

---
 .../archmeister/resources/archmeister-env-secret.yaml  |  2 ++
 charts/hipster/base/kustomization.yaml                 |  3 +--
 charts/hipster/prod/kustomization.yaml                 |  3 +--
 charts/hipster/resources/hipster-env-secret.yaml       | 10 ++++++++++
 charts/hipster/staging/kustomization.yaml              |  3 +--
 .../templates/sync-vcluster-atlantis-secrets.yaml      |  2 +-
 6 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 charts/hipster/resources/hipster-env-secret.yaml

diff --git a/charts/archmeister/resources/archmeister-env-secret.yaml b/charts/archmeister/resources/archmeister-env-secret.yaml
index 19b080ff..220f770e 100644
--- a/charts/archmeister/resources/archmeister-env-secret.yaml
+++ b/charts/archmeister/resources/archmeister-env-secret.yaml
@@ -3,6 +3,8 @@ kind: Secret
 metadata:
   name: archmeister-env
   namespace: atlantis
+  labels:
+    oceanbox.io/atlantis-env: sync
 stringData:
   OICD_CLIENT_SECRET: ieK3yak9zoh3yeewee8quahY6seiv7Ro
   SEQ_APIKEY: bFdYPKLDvnau3fQa1vRV
diff --git a/charts/hipster/base/kustomization.yaml b/charts/hipster/base/kustomization.yaml
index bc578016..cfc8c8d9 100644
--- a/charts/hipster/base/kustomization.yaml
+++ b/charts/hipster/base/kustomization.yaml
@@ -1,6 +1,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: oceanbox
 patches:
   - target:
       version: v1
@@ -14,4 +13,4 @@ patches:
       name: hipster
     path: service_patch.yaml
 resources:
-  - _manifest.yaml
\ No newline at end of file
+  - _manifest.yaml
diff --git a/charts/hipster/prod/kustomization.yaml b/charts/hipster/prod/kustomization.yaml
index 6edd6307..20df177d 100644
--- a/charts/hipster/prod/kustomization.yaml
+++ b/charts/hipster/prod/kustomization.yaml
@@ -1,5 +1,4 @@
 namePrefix: production-
-namespace: oceanbox
 generatorOptions:
   disableNameSuffixHash: true
 secretGenerator:
@@ -14,4 +13,4 @@ patches:
       name: hipster
     path: deployment_patch.yaml
 resources:
-  - ../base
\ No newline at end of file
+  - ../base
diff --git a/charts/hipster/resources/hipster-env-secret.yaml b/charts/hipster/resources/hipster-env-secret.yaml
new file mode 100644
index 00000000..e025ab84
--- /dev/null
+++ b/charts/hipster/resources/hipster-env-secret.yaml
@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: hipster-env
+  namespace: atlantis
+  labels:
+    oceanbox.io/atlantis-env: sync
+stringData:
+  SEQ_APIKEY: bFdYPKLDvnau3fQa1vRV
+type: Opaque
diff --git a/charts/hipster/staging/kustomization.yaml b/charts/hipster/staging/kustomization.yaml
index 56d094d0..a9d6a069 100644
--- a/charts/hipster/staging/kustomization.yaml
+++ b/charts/hipster/staging/kustomization.yaml
@@ -1,5 +1,4 @@
 namePrefix: staging-
-namespace: oceanbox
 generatorOptions:
   disableNameSuffixHash: true
 secretGenerator:
@@ -14,4 +13,4 @@ patches:
       name: hipster
     path: deployment_patch.yaml
 resources:
-  - ../base
\ No newline at end of file
+  - ../base
diff --git a/vcluster/chart/templates/sync-vcluster-atlantis-secrets.yaml b/vcluster/chart/templates/sync-vcluster-atlantis-secrets.yaml
index 83ec8a5b..db6ac5ba 100644
--- a/vcluster/chart/templates/sync-vcluster-atlantis-secrets.yaml
+++ b/vcluster/chart/templates/sync-vcluster-atlantis-secrets.yaml
@@ -77,7 +77,7 @@ spec:
           - Secret
         selector:
           matchLabels:
-            oceanbox.io/atlantis-env: clone
+            oceanbox.io/atlantis-env: sync
     match:
       resources:
         kinds: