From 9ea8ce6315a91f4075a26710e57da6435994fe0d Mon Sep 17 00:00:00 2001
From: Jonas Juselius <jonas.juselius@itpartner.no>
Date: Wed, 13 Mar 2024 10:23:01 +0100
Subject: [PATCH] fix: rename archmeister db names and secrets to staging for
 consistency

---
 vcluster/chart/templates/cnpg.yaml                            | 2 +-
 .../kyverno-policies/sync-vcluster-atlantis-secrets.yaml      | 4 ++--
 vcluster/chart/templates/vcluster.yaml                        | 2 +-
 vcluster/update-kubeconfig.sh                                 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/vcluster/chart/templates/cnpg.yaml b/vcluster/chart/templates/cnpg.yaml
index 338d52bf..47a81ca7 100644
--- a/vcluster/chart/templates/cnpg.yaml
+++ b/vcluster/chart/templates/cnpg.yaml
@@ -24,7 +24,7 @@ spec:
 apiVersion: postgresql.cnpg.io/v1
 kind: Cluster
 metadata:
-  name: {{ $name }}-archmeister
+  name: staging-archmeister
   namespace: {{ .Release.Namespace }}
   annotations:
     linkerd.io/inject: disabled
diff --git a/vcluster/chart/templates/kyverno-policies/sync-vcluster-atlantis-secrets.yaml b/vcluster/chart/templates/kyverno-policies/sync-vcluster-atlantis-secrets.yaml
index 49d23164..d8e17da8 100644
--- a/vcluster/chart/templates/kyverno-policies/sync-vcluster-atlantis-secrets.yaml
+++ b/vcluster/chart/templates/kyverno-policies/sync-vcluster-atlantis-secrets.yaml
@@ -45,7 +45,7 @@ spec:
         selector:
           matchLabels:
             vcluster.loft.sh/vcluster-namespace: '{{ .Release.Namespace }}'
-  - name: sync-archmeister-superuser
+  - name: sync-archmeister-app-secret
     generate:
       apiVersion: v1
       kind: Secret
@@ -54,7 +54,7 @@ spec:
       synchronize: false
       clone:
         namespace: '{{ .Release.Namespace }}'
-        name: '{{ $name }}-archmeister-superuser'
+        name: staging-archmeister-superuser
     match:
       resources:
         kinds:
diff --git a/vcluster/chart/templates/vcluster.yaml b/vcluster/chart/templates/vcluster.yaml
index 2c86ea11..38340d76 100644
--- a/vcluster/chart/templates/vcluster.yaml
+++ b/vcluster/chart/templates/vcluster.yaml
@@ -63,7 +63,7 @@ spec:
               to: "redis/{{ .Values.environment }}-redis-master"
             - from: "rabbitmq/{{ .Values.environment }}-rabbitmq"
               to: "rabbitmq/{{ .Values.environment }}-rabbitmq"
-            - from: "{{ .Release.Namespace }}/{{ $name }}-archmeister-rw"
+            - from: "{{ .Release.Namespace }}/staging-archmeister-rw"
               to: "atlantis/staging-archmeister-rw"
             - from: "{{ .Release.Namespace }}/jaeger-collector"
               to: "atlantis/jaeger-collector"
diff --git a/vcluster/update-kubeconfig.sh b/vcluster/update-kubeconfig.sh
index 98ee7074..7001a0a5 100755
--- a/vcluster/update-kubeconfig.sh
+++ b/vcluster/update-kubeconfig.sh
@@ -3,8 +3,8 @@
 vcluster connect $1-vcluster -n $1-vcluster \
     --context oceanbox \
     --update-current=true \
+    --kube-config-context-name $1-vcluster \
     --insecure --cluster-role cluster-admin \
     --service-account kube-system/admin \
-    --kube-config-context-name $1-vcluster \
     --server https://$1-vcluster.beta.oceanbox.io