From fd642c8ab4ad2f4833a4073cc6c40fbc085eaed6 Mon Sep 17 00:00:00 2001
From: Johannes Wicovsky <johannes.wicovsky@gmail.com>
Date: Thu, 21 Sep 2023 10:43:13 +0200
Subject: [PATCH] fix stage-name

---
 templates/pgadmin/config.yaml      |  2 +-
 templates/pgadmin/secret.yml       |  2 +-
 templates/pgadmin/service.yaml     |  4 ++--
 templates/pgadmin/statefulset.yaml | 18 +++++++++---------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/templates/pgadmin/config.yaml b/templates/pgadmin/config.yaml
index 0782dd5..d2778c8 100644
--- a/templates/pgadmin/config.yaml
+++ b/templates/pgadmin/config.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: '{{.Release.Name}}-pgadmin-config'
+  name: '{{ .Values.stage }}-pgadmin-config'
 data:
   servers.json: |
     {
diff --git a/templates/pgadmin/secret.yml b/templates/pgadmin/secret.yml
index 97392e4..07c6c61 100644
--- a/templates/pgadmin/secret.yml
+++ b/templates/pgadmin/secret.yml
@@ -3,6 +3,6 @@ apiVersion: v1
 kind: Secret
 type: Opaque
 metadata:
-  name: '{{.Release.Name}}-pgadmin-secret'
+  name: '{{ .Values.stage }}-pgadmin-secret'
 data:
   password: {{.Values.pgadmin.env.password | b64enc | quote}}
\ No newline at end of file
diff --git a/templates/pgadmin/service.yaml b/templates/pgadmin/service.yaml
index 5154615..298c3e5 100644
--- a/templates/pgadmin/service.yaml
+++ b/templates/pgadmin/service.yaml
@@ -2,12 +2,12 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: '{{.Release.Name}}-pgadmin-service'
+  name: '{{ .Values.stage }}-pgadmin-service'
 spec:
   ports:
     - protocol: TCP
       port: 80
       targetPort: http
   selector:
-    app: '{{.Release.Name}}-pgadmin'
+    app: '{{ .Values.stage }}-pgadmin'
   type: NodePort
diff --git a/templates/pgadmin/statefulset.yaml b/templates/pgadmin/statefulset.yaml
index 009658d..66c3f27 100644
--- a/templates/pgadmin/statefulset.yaml
+++ b/templates/pgadmin/statefulset.yaml
@@ -2,23 +2,23 @@
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: '{{.Release.Name}}-pgadmin'
+  name: '{{ .Values.stage }}-pgadmin'
 spec:
-  serviceName: '{{.Release.Name}}-pgadmin-service'
+  serviceName: '{{ .Values.stage }}-pgadmin-service'
   podManagementPolicy: Parallel
   replicas: 1
   selector:
     matchLabels:
-      app: '{{.Release.Name}}-pgadmin'
+      app: '{{ .Values.stage }}-pgadmin'
       type: pgadmin
   template:
     metadata:
       labels:
-        app: '{{.Release.Name}}-pgadmin'
+        app: '{{ .Values.stage }}-pgadmin'
     spec:
       terminationGracePeriodSeconds: 10
       containers:
-        - name: '{{.Release.Name}}-pgadmin'
+        - name: '{{ .Values.stage }}-pgadmin'
           image: '{{.Values.pgadmin.image.name}}:{{.Values.pgadmin.image.tag}}'
           imagePullPolicy: Always
           env:
@@ -27,7 +27,7 @@ spec:
             - name: PGADMIN_DEFAULT_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: '{{.Release.Name}}-pgadmin-secret'
+                  name: '{{ .Values.stage }}-pgadmin-secret'
                   key: password
           resources:
             limits:
@@ -41,11 +41,11 @@ spec:
               containerPort: 80
               protocol: TCP
           volumeMounts:
-            - name: '{{.Release.Name}}-pgadmin-config'
+            - name: '{{ .Values.stage }}-pgadmin-config'
               mountPath: /pgadmin4/servers.json
               subPath: servers.json
               readOnly: true
       volumes:
-        - name: '{{.Release.Name}}-pgadmin-config'
+        - name: '{{ .Values.stage }}-pgadmin-config'
           configMap:
-            name: '{{.Release.Name}}-pgadmin-config'
\ No newline at end of file
+            name: '{{ .Values.stage }}-pgadmin-config'
\ No newline at end of file