From 1b2ad923ae111bdff761d85c14da7f62a91cea6f Mon Sep 17 00:00:00 2001 From: Michael Goodness Date: Mon, 31 Jul 2017 17:38:36 -0500 Subject: [PATCH] Support Helm release name = chart name (#1588) --- stable/kube2iam/Chart.yaml | 2 +- stable/kube2iam/templates/_helpers.tpl | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/stable/kube2iam/Chart.yaml b/stable/kube2iam/Chart.yaml index b0118c458d..a74f35928c 100644 --- a/stable/kube2iam/Chart.yaml +++ b/stable/kube2iam/Chart.yaml @@ -1,5 +1,5 @@ name: kube2iam -version: 0.5.0 +version: 0.5.1 description: Provide IAM credentials to pods based on annotations. keywords: - kube2iam diff --git a/stable/kube2iam/templates/_helpers.tpl b/stable/kube2iam/templates/_helpers.tpl index f0d83d2edb..59d6e989d3 100644 --- a/stable/kube2iam/templates/_helpers.tpl +++ b/stable/kube2iam/templates/_helpers.tpl @@ -12,5 +12,9 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this */}} {{- define "fullname" -}} {{- $name := default .Chart.Name .Values.nameOverride -}} +{{- if ne $name .Release.Name -}} {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- printf "%s" $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} {{- end -}}