From 2ea57b4f56a302f75c5c4a204498b7372ea85660 Mon Sep 17 00:00:00 2001
From: Daniel Lohse <info@asapdesign.de>
Date: Tue, 2 Jul 2019 19:28:13 +0200
Subject: [PATCH] Fix secret key name references in StatefulSet (#24)

* Fix PostgreSQL password secret key name references

One instance already used the correct name (line 87) but the other three
were not.

* Fix autowizard JSON secret key name references

* Raise chart version to 1.1.2
---
 zammad/Chart.yaml                 |  2 +-
 zammad/templates/statefulset.yaml | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/zammad/Chart.yaml b/zammad/Chart.yaml
index d58b572b..273ebfec 100644
--- a/zammad/Chart.yaml
+++ b/zammad/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: zammad
-version: 1.1.1
+version: 1.1.2
 appVersion: 3.0.0
 description: Zammad is a web based open source helpdesk/customer support system with many features to manage customer communication via several channels like telephone, facebook, twitter, chat and e-mails.
 home: https://zammad.org
diff --git a/zammad/templates/statefulset.yaml b/zammad/templates/statefulset.yaml
index 9ae228dc..684b1fda 100644
--- a/zammad/templates/statefulset.yaml
+++ b/zammad/templates/statefulset.yaml
@@ -41,7 +41,7 @@ spec:
         - name: "POSTGRESQL_PASS"
           valueFrom:
             secretKeyRef:
-              name: "{{ .Release.Name }}-postgresql-pass"
+              name: "{{ template "zammad.fullname" . }}-postgresql-pass"
               key: "postgresql-pass"
         - name: "POSTGRESQL_DB"
           value: "{{ .Values.envConfig.postgresql.db }}"
@@ -51,7 +51,7 @@ spec:
         - name: "AUTOWIZARD_JSON"
           valueFrom:
             secretKeyRef:
-              name: "{{ .Release.Name }}-autowizard"
+              name: "{{ template "zammad.fullname" . }}-autowizard"
               key: "autowizard"
         {{ end }}
         {{- range $key, $value := .Values.extraEnv }}
@@ -94,7 +94,7 @@ spec:
         - name: "AUTOWIZARD_JSON"
           valueFrom:
             secretKeyRef:
-              name: "{{ .Release.Name }}-autowizard"
+              name: "{{ template "zammad.fullname" . }}-autowizard"
               key: "autowizard"
         {{ end }}
         {{- range $key, $value := .Values.extraEnv }}
@@ -174,7 +174,7 @@ spec:
         - name: "POSTGRESQL_PASS"
           valueFrom:
             secretKeyRef:
-              name: "{{ .Release.Name }}-postgresql-pass"
+              name: "{{ template "zammad.fullname" . }}-postgresql-pass"
               key: "postgresql-pass"
         - name: "POSTGRESQL_DB"
           value: "{{ .Values.envConfig.postgresql.db }}"
@@ -184,7 +184,7 @@ spec:
         - name: "AUTOWIZARD_JSON"
           valueFrom:
             secretKeyRef:
-              name: "{{ .Release.Name }}-autowizard"
+              name: "{{ template "zammad.fullname" . }}-autowizard"
               key: "autowizard"
         {{ end }}
         {{- range $key, $value := .Values.extraEnv }}
@@ -218,7 +218,7 @@ spec:
         - name: "POSTGRESQL_PASS"
           valueFrom:
             secretKeyRef:
-              name: "{{ .Release.Name }}-postgresql-pass"
+              name: "{{ template "zammad.fullname" . }}-postgresql-pass"
               key: "postgresql-pass"
         - name: "POSTGRESQL_DB"
           value: "{{ .Values.envConfig.postgresql.db }}"
@@ -228,7 +228,7 @@ spec:
         - name: "AUTOWIZARD_JSON"
           valueFrom:
             secretKeyRef:
-              name: "{{ .Release.Name }}-autowizard"
+              name: "{{ template "zammad.fullname" . }}-autowizard"
               key: "autowizard"
         {{ end }}
         {{- range $key, $value := .Values.extraEnv }}