From 81297e0a15877e4eea80133bc775b8cd427d9504 Mon Sep 17 00:00:00 2001
From: Jonas Juselius <jonas.juselius@oceanbox.io>
Date: Wed, 20 Nov 2024 20:08:47 +0100
Subject: [PATCH] devel: fix (kyverno) secret setup

---
 components/local/keyvault.yaml | 16 ----------------
 shell.nix                      |  2 +-
 tilt/tilt/appsettings.json     |  2 +-
 tilt/tilt/default.env          |  4 ----
 tilt/tilt/kustomization.yaml   |  4 ----
 tilt/tilt/secrets.yaml         | 18 ++++++++++++++++++
 6 files changed, 20 insertions(+), 26 deletions(-)
 delete mode 100644 components/local/keyvault.yaml
 delete mode 100644 tilt/tilt/default.env

diff --git a/components/local/keyvault.yaml b/components/local/keyvault.yaml
deleted file mode 100644
index 3b9600c5..00000000
--- a/components/local/keyvault.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-apiVersion: dapr.io/v1alpha1
-kind: Component
-metadata:
-  name: azure-keyvault
-spec:
-  type: secretstores.azure.keyvault
-  version: v1
-  metadata:
-  - name: vaultName
-    value: atlantisvault
-  - name: azureTenantId
-    value: 3f737008-e9a0-4485-9d27-40329d288089
-  - name: azureClientId
-    value: abe60921-8039-4112-9533-f40935906c65
-  - name: azureClientSecret
-    value: secret
\ No newline at end of file
diff --git a/shell.nix b/shell.nix
index 37f9f628..4bc06ccb 100644
--- a/shell.nix
+++ b/shell.nix
@@ -27,7 +27,7 @@ pkgs.mkShell {
   shellHook = ''
     export BARENTSWATCH_SECRET=$USER-atlantis-barentswatch
     export APP_NAME=$USER-atlantis
-    export APP_NAMESPACE=$USER
+    export APP_NAMESPACE=$USER-atlantis
     export TILT_ENV=$USER
     export TILT_NAMESPACE=$USER
   '';
diff --git a/tilt/tilt/appsettings.json b/tilt/tilt/appsettings.json
index 80914349..c8000481 100644
--- a/tilt/tilt/appsettings.json
+++ b/tilt/tilt/appsettings.json
@@ -29,7 +29,7 @@
     "sorcerer" : "https://sorcerer.ekman.oceanbox.io",
     "allowedOrigins": [
         "https://atlantis.beta.oceanbox.io",
-        "https://jonas-atlantis.dev.oceanbox.io",
+        "https://<x>-atlantis.dev.oceanbox.io",
         "https://atlantis.local.oceanbox.io:8080"
     ],
     "appName": "atlantis",
diff --git a/tilt/tilt/default.env b/tilt/tilt/default.env
deleted file mode 100644
index 7fc94d02..00000000
--- a/tilt/tilt/default.env
+++ /dev/null
@@ -1,4 +0,0 @@
-DATA_PROTECTION_TOKEN=""
-OIDC_CLIENT_SECRET="3QjfSPmAemjn34XVA2o1fvoS7I4gKvOR"
-BARENTSWATCH_CLIENT_ID="simen.kirkvik@tromso.serit.no:simkir-tilt-atlantis"
-BARENTSWATCH_SECRET="d9tInZ1XpeDAxD.DySv'*SB=P"
\ No newline at end of file
diff --git a/tilt/tilt/kustomization.yaml b/tilt/tilt/kustomization.yaml
index b97276ab..850b0e6e 100644
--- a/tilt/tilt/kustomization.yaml
+++ b/tilt/tilt/kustomization.yaml
@@ -4,10 +4,6 @@ configMapGenerator:
 - name: <x>-atlantis-appsettings
   files:
     - appsettings.json
-secretGenerator:
-- name: <x>-atlantis-env
-  envs:
-  - default.env
 patches:
   - target:
       group: apps
diff --git a/tilt/tilt/secrets.yaml b/tilt/tilt/secrets.yaml
index 8066d7f5..6d81b663 100644
--- a/tilt/tilt/secrets.yaml
+++ b/tilt/tilt/secrets.yaml
@@ -5,4 +5,22 @@ metadata:
     kyverno/clone: "true"
   name: staging-rabbitmq
 type: Opaque
+data:
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  annotations:
+    kyverno/clone: "true"
+  name: jonas-atlantis-env
+type: Opaque
+data:
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  annotations:
+    kyverno/clone: "true"
+  name: azure-keyvault
+type: Opaque
 data:
\ No newline at end of file