From 71039a401200e40130918646316fb15fca07e910 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Wed, 2 Oct 2019 22:16:32 +0200
Subject: [PATCH] helm(minor): fix p2 to passbook

---
 helm/passbook/templates/appgw-deployment.yaml  |  6 +++---
 helm/passbook/templates/web-deployment.yaml    | 12 ++++++------
 helm/passbook/templates/worker-deployment.yaml |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/helm/passbook/templates/appgw-deployment.yaml b/helm/passbook/templates/appgw-deployment.yaml
index 7fed4bb99..00fcc43ee 100644
--- a/helm/passbook/templates/appgw-deployment.yaml
+++ b/helm/passbook/templates/appgw-deployment.yaml
@@ -34,15 +34,15 @@ spec:
             - app_gw_web
           envFrom:
             - configMapRef:
-                name: {{ include "p2.fullname" . }}-config
+                name: {{ include "passbook.fullname" . }}-config
               prefix: PASSBOOK_
           env:
-            - name: P2_REDIS__PASSWORD
+            - name: PASSBOOK_REDIS__PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: "{{ .Release.Name }}-redis"
                   key: redis-password
-            - name: P2_POSTGRESQL__PASSWORD
+            - name: PASSBOOK_POSTGRESQL__PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: "{{ .Release.Name }}-postgresql"
diff --git a/helm/passbook/templates/web-deployment.yaml b/helm/passbook/templates/web-deployment.yaml
index fd0d6b13a..ecc571637 100644
--- a/helm/passbook/templates/web-deployment.yaml
+++ b/helm/passbook/templates/web-deployment.yaml
@@ -33,15 +33,15 @@ spec:
             - migrate
           envFrom:
             - configMapRef:
-                name: {{ include "p2.fullname" . }}-config
+                name: {{ include "passbook.fullname" . }}-config
               prefix: PASSBOOK_
           env:
-            - name: P2_REDIS__PASSWORD
+            - name: PASSBOOK_REDIS__PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: "{{ .Release.Name }}-redis"
                   key: redis-password
-            - name: P2_POSTGRESQL__PASSWORD
+            - name: PASSBOOK_POSTGRESQL__PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: "{{ .Release.Name }}-postgresql"
@@ -66,15 +66,15 @@ spec:
             - --stats-http
           envFrom:
             - configMapRef:
-                name: {{ include "p2.fullname" . }}-config
+                name: {{ include "passbook.fullname" . }}-config
               prefix: PASSBOOK_
           env:
-            - name: P2_REDIS__PASSWORD
+            - name: PASSBOOK_REDIS__PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: "{{ .Release.Name }}-redis"
                   key: redis-password
-            - name: P2_POSTGRESQL__PASSWORD
+            - name: PASSBOOK_POSTGRESQL__PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: "{{ .Release.Name }}-postgresql"
diff --git a/helm/passbook/templates/worker-deployment.yaml b/helm/passbook/templates/worker-deployment.yaml
index 0a260d942..1164e65b3 100644
--- a/helm/passbook/templates/worker-deployment.yaml
+++ b/helm/passbook/templates/worker-deployment.yaml
@@ -34,15 +34,15 @@ spec:
             - worker
           envFrom:
             - configMapRef:
-                name: {{ include "p2.fullname" . }}-config
+                name: {{ include "passbook.fullname" . }}-config
               prefix: PASSBOOK_
           env:
-            - name: P2_REDIS__PASSWORD
+            - name: PASSBOOK_REDIS__PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: "{{ .Release.Name }}-redis"
                   key: redis-password
-            - name: P2_POSTGRESQL__PASSWORD
+            - name: PASSBOOK_POSTGRESQL__PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: "{{ .Release.Name }}-postgresql"