From 3f5c97bf357ec902a1c5f25728ffa028bbc2034d Mon Sep 17 00:00:00 2001
From: Nikolai Rodionov <allanger@badhouseplants.net>
Date: Wed, 24 Jul 2024 17:58:07 +0200
Subject: [PATCH] Fix deployment

---
 kube/application.yaml |  2 +-
 kube/project.yaml     | 10 ++++------
 scripts/deploy-app.pl |  5 ++---
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/kube/application.yaml b/kube/application.yaml
index e2b8240..cc41ea1 100644
--- a/kube/application.yaml
+++ b/kube/application.yaml
@@ -9,7 +9,7 @@ metadata:
   namespace: platform
 spec:
   destination:
-    namespace: badhouseplants-$ARGO_APP_NAMESPACE
+    namespace: $ARGO_APP_NAMESPACE
     server: https://kubernetes.default.svc
   project: badhouseplants
   source:
diff --git a/kube/project.yaml b/kube/project.yaml
index 4b514fb..f302767 100644
--- a/kube/project.yaml
+++ b/kube/project.yaml
@@ -11,14 +11,12 @@ spec:
   - '*'
 
   destinations:
-  - namespace: badhouseplants-*
+  - namespace: development
+    server: https://kubernetes.default.svc
+    name: in-cluster
+  - namespace: production
     server: https://kubernetes.default.svc
     name: in-cluster
-
-  # Deny all cluster-scoped resources from being created, except for Namespace
-  clusterResourceWhitelist:
-  - group: ''
-    kind: Namespace
 
   # Allow all namespaced-scoped resources to be created, except for ResourceQuota, LimitRange, NetworkPolicy
   namespaceResourceBlacklist:
diff --git a/scripts/deploy-app.pl b/scripts/deploy-app.pl
index 4a6602b..7e53405 100755
--- a/scripts/deploy-app.pl
+++ b/scripts/deploy-app.pl
@@ -18,9 +18,9 @@ chomp($remark_secret);
 $ENV{'ARGO_APP_CHART_VERSION'} = $chart_version;
 $ENV{'ARGO_APP_BRANCH'} = $git_branch;
 if ($git_branch eq $main_branch) {
-	$ENV{'ARGO_APP_NAMESPACE'} = $git_branch;
+	$ENV{'ARGO_APP_NAMESPACE'} = "production";
 } else {
-	$ENV{'ARGO_APP_NAMESPACE'} = "preview"
+	$ENV{'ARGO_APP_NAMESPACE'} = "development"
 }
 $ENV{'ARGO_APP_HOSTNAME'} = "$git_branch-dev.badhouseplants.net";
 $ENV{'ARGO_APP_IMAGE_TAG'} = $git_commit_sha;
@@ -72,4 +72,3 @@ foreach my $app (@all_applications) {
 		}
 	}
 }
-