Stop creating namespaces

chart/templates/namespace.yaml

@@ -1,16 +0,0 @@
-{{- if .Values.istio.enabled -}}
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: {{ .Values.namespace.name }}
-  labels:
-    {{- include "badhouseplants-net.labels" . | nindent 4 }}
-    {{- range $key, $value := .Values.namespace.labels}}
-    {{ $key }}: {{ $value }}
-    {{- end }}
-  {{- with .Values.namespace.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-
-{{- end }}

chart/values.yaml

@@ -1,12 +1,5 @@
 replicaCount: 1
 
-namespace:
-  annotations: {}
-  labels:
-    istio-injection: enabled
-  enabled: true
-  name: badhouseplants-main
-
 nginx:
   container:
     name: nginx
@@ -37,7 +30,7 @@ hugo:
   container:
     name: badhouseplants-net
     resources: {}
-  image: 
+  image:
     repository: git.badhouseplants.net/badhouseplants/badhouseplants-net
     pullPolicy: Always
     tag: latest
@@ -56,17 +49,17 @@ istio:
 
 volumes:
   # ----------------------------------------------
-  # -- An emptydir volume where hugo should 
+  # -- An emptydir volume where hugo should
   # --  put the static content
   # ----------------------------------------------
   public:
     name: public-content
-    sizeLimit: 1Gi 
+    sizeLimit: 1Gi
   # ----------------------------------------------
-  # -- An emptydir volume where rclone should 
+  # -- An emptydir volume where rclone should
   # --  download pictures
   # ----------------------------------------------
-  rclone: 
+  rclone:
     name: s3-data
     sizeLimit: 1Gi
 

kube/application.yaml

@@ -9,7 +9,7 @@ metadata:
   namespace: argo-system
 spec:
   destination:
-    namespace: badhouseplants-$ARGO_APP_BRANCH
+    namespace: badhouseplants-$ARGO_APP_NAMESPACE
     server: https://kubernetes.default.svc
   project: badhouseplants
   source:

kube/values-preview.yaml

@@ -1,9 +1,5 @@
 ---
 values: |
-  namespace:
-    name: badhouseplants-$ARGO_APP_BRANCH
-    labels:
-      istio-injection: disabled
   istio:
     hosts:
       - $ARGO_APP_HOSTNAME

scripts/deploy-app.pl

@@ -17,6 +17,11 @@ 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;
+} else {
+	$ENV{'ARGO_APP_NAMESPACE'} = "preview"
+}
 $ENV{'ARGO_APP_HOSTNAME'} = "$git_branch-dev.badhouseplants.net";
 $ENV{'ARGO_APP_IMAGE_TAG'} = $git_commit_sha;
 $ENV{'ARGO_REMARK_SECRET'} = $remark_secret;