From da9ce1dfb292e6f527c3441bc95d1d69407ffacb Mon Sep 17 00:00:00 2001
From: Jonas Juselius <jonas.juselius@itpartner.no>
Date: Wed, 13 Mar 2024 09:26:27 +0100
Subject: [PATCH] fix: fix database service and secret naming

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

diff --git a/vcluster/chart/templates/cnpg.yaml b/vcluster/chart/templates/cnpg.yaml
index b542063f..338d52bf 100644
--- a/vcluster/chart/templates/cnpg.yaml
+++ b/vcluster/chart/templates/cnpg.yaml
@@ -1,6 +1,6 @@
-{{- if .Values.persistence -}}
 {{- $fullname := include "vCluster.fullname" . -}}
 {{- $name := include "vCluster.releaseName" . -}}
+{{- if .Values.persistence -}}
 apiVersion: postgresql.cnpg.io/v1
 kind: Cluster
 metadata:
@@ -19,6 +19,7 @@ spec:
     retentionPolicy: "7d"
   storage:
     size: "5Gi"
+{{- end -}}
 ---
 apiVersion: postgresql.cnpg.io/v1
 kind: Cluster
@@ -65,5 +66,4 @@ spec:
     sslRootCert:
       name: prod-archmeister-ca
       key: ca.crt
-{{- end -}}
 
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 232699db..49d23164 100644
--- a/vcluster/chart/templates/kyverno-policies/sync-vcluster-atlantis-secrets.yaml
+++ b/vcluster/chart/templates/kyverno-policies/sync-vcluster-atlantis-secrets.yaml
@@ -49,7 +49,7 @@ spec:
     generate:
       apiVersion: v1
       kind: Secret
-      name: '{{ $name }}-archmeister-app'
+      name: staging-archmeister-app
       namespace: {{ printf "{{request.object.metadata.name}}" | quote }}
       synchronize: false
       clone:
diff --git a/vcluster/chart/templates/vcluster.yaml b/vcluster/chart/templates/vcluster.yaml
index c2e023b8..2c86ea11 100644
--- a/vcluster/chart/templates/vcluster.yaml
+++ b/vcluster/chart/templates/vcluster.yaml
@@ -64,7 +64,7 @@ spec:
             - from: "rabbitmq/{{ .Values.environment }}-rabbitmq"
               to: "rabbitmq/{{ .Values.environment }}-rabbitmq"
             - from: "{{ .Release.Namespace }}/{{ $name }}-archmeister-rw"
-              to: "atlantis/{{ $name }}-archmeister-rw"
+              to: "atlantis/staging-archmeister-rw"
             - from: "{{ .Release.Namespace }}/jaeger-collector"
               to: "atlantis/jaeger-collector"
           sync: