From d095f272fd46eb28c48eadb50fa280911286e448 Mon Sep 17 00:00:00 2001 From: Ash Caire Date: Thu, 9 May 2019 00:58:36 +0800 Subject: [PATCH] [stable/magic-namespace] Fix secret bug (#13041) This commit fixes a bug that erroneosly named the secret based on the chart name, not the release fullname. Also, removes the quote function from the storage param passed to tiller, currently causing memory storage to be used by default Signed-off-by: Ash Caire --- stable/magic-namespace/Chart.yaml | 2 +- stable/magic-namespace/templates/_helpers.tpl | 2 +- stable/magic-namespace/templates/tiller-deployment.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stable/magic-namespace/Chart.yaml b/stable/magic-namespace/Chart.yaml index 6bcda7cb8d..dc6cac6eba 100644 --- a/stable/magic-namespace/Chart.yaml +++ b/stable/magic-namespace/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: magic-namespace -version: 0.5.0 +version: 0.5.1 appVersion: 2.8.1 home: https://github.com/kubernetes/charts/tree/master/stable/magic-namespace description: Elegantly enables a Tiller per namespace in RBAC-enabled clusters diff --git a/stable/magic-namespace/templates/_helpers.tpl b/stable/magic-namespace/templates/_helpers.tpl index 072c82d2a3..db7c4f3c69 100644 --- a/stable/magic-namespace/templates/_helpers.tpl +++ b/stable/magic-namespace/templates/_helpers.tpl @@ -38,6 +38,6 @@ Allow a custom secretName to be defined {{- if .Values.tiller.tls.secretName -}} {{- .Values.tiller.tls.secretName }} {{- else -}} -{{- template "magic-namespace.chart" . }}-tiller-secret +{{- template "magic-namespace.fullname" . }}-tiller-secret {{- end -}} {{- end -}} diff --git a/stable/magic-namespace/templates/tiller-deployment.yaml b/stable/magic-namespace/templates/tiller-deployment.yaml index a4eb6a9144..bd0e686015 100644 --- a/stable/magic-namespace/templates/tiller-deployment.yaml +++ b/stable/magic-namespace/templates/tiller-deployment.yaml @@ -56,7 +56,7 @@ spec: command: - "/tiller" {{- if .Values.tiller.storage }} - - --storage={{ .Values.tiller.storage | quote }} + - --storage={{ .Values.tiller.storage }} {{- end }} args: ["--listen=127.0.0.1:44134"] {{- else }}