From 410325b2b4a734f2cea29a2e8043f1c12e280062 Mon Sep 17 00:00:00 2001
From: Atsushi Kawamura <atushi.k@gmail.com>
Date: Mon, 18 Jun 2018 05:47:29 +0900
Subject: [PATCH] modify helpers to apply popular rule to decide fullname
 (#6126)

* modify helpers to apply popular rule to decide fullname

* bump up chart version up to 0.7.2

* replace author name to github-account
---
 stable/kube-state-metrics/Chart.yaml           |  2 +-
 .../kube-state-metrics/templates/_helpers.tpl  | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/stable/kube-state-metrics/Chart.yaml b/stable/kube-state-metrics/Chart.yaml
index 14a0ee36d1..849c65d91e 100644
--- a/stable/kube-state-metrics/Chart.yaml
+++ b/stable/kube-state-metrics/Chart.yaml
@@ -5,7 +5,7 @@ keywords:
 - metric
 - monitoring
 - prometheus
-version: 0.7.2
+version: 0.8.0
 appVersion: 1.3.1
 home: https://github.com/kubernetes/kube-state-metrics/
 sources:
diff --git a/stable/kube-state-metrics/templates/_helpers.tpl b/stable/kube-state-metrics/templates/_helpers.tpl
index 2e47c589f9..787d0c283b 100644
--- a/stable/kube-state-metrics/templates/_helpers.tpl
+++ b/stable/kube-state-metrics/templates/_helpers.tpl
@@ -8,10 +8,18 @@ Expand the name of the chart.
 
 {{/*
 Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this
-(by the DNS naming spec).
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
 */}}
-{{define "kube-state-metrics.fullname"}}
+{{- define "kube-state-metrics.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
-{{printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{end}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}