From f839448f3a3c88bc9fac8d72b41bf9fb7c1f82ef Mon Sep 17 00:00:00 2001
From: Jakub Kvita <kvitajakub@gmail.com>
Date: Wed, 31 Jan 2018 17:09:13 +0100
Subject: [PATCH] [stable/kubernetes-dashboard] Fix labels and fullname
 template (#3475)

* [BUGFIX] Forgotten dashboard pod label.

* version number incremented

* Fix labels and fullname template
---
 stable/kubernetes-dashboard/Chart.yaml            |  2 +-
 .../kubernetes-dashboard/templates/_helpers.tpl   | 15 ++++++++-------
 .../templates/deployment.yaml                     |  6 ++----
 stable/kubernetes-dashboard/templates/svc.yaml    |  6 +++---
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/stable/kubernetes-dashboard/Chart.yaml b/stable/kubernetes-dashboard/Chart.yaml
index 0f96651b82..cbd50b50f9 100644
--- a/stable/kubernetes-dashboard/Chart.yaml
+++ b/stable/kubernetes-dashboard/Chart.yaml
@@ -1,5 +1,5 @@
 name: kubernetes-dashboard
-version: 0.5.0
+version: 0.5.1
 appVersion: 1.8.1
 description: General-purpose web UI for Kubernetes clusters
 keywords:
diff --git a/stable/kubernetes-dashboard/templates/_helpers.tpl b/stable/kubernetes-dashboard/templates/_helpers.tpl
index dfda34d9e5..1848820b9d 100644
--- a/stable/kubernetes-dashboard/templates/_helpers.tpl
+++ b/stable/kubernetes-dashboard/templates/_helpers.tpl
@@ -9,16 +9,17 @@ 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).
+If release name contains chart name it will be used as a full name.
 */}}
 {{- define "kubernetes-dashboard.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
-
-{{/*
-Create a service name that defaults to app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "kubernetes-dashboard.service.fullname" -}}
-{{- .Values.service.nameOverride | default .Chart.Name }}
+{{- end -}}
 {{- end -}}
diff --git a/stable/kubernetes-dashboard/templates/deployment.yaml b/stable/kubernetes-dashboard/templates/deployment.yaml
index bdea9c0896..9e22588048 100644
--- a/stable/kubernetes-dashboard/templates/deployment.yaml
+++ b/stable/kubernetes-dashboard/templates/deployment.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   name: {{ template "kubernetes-dashboard.fullname" . }}
   labels:
-    app: {{ template "kubernetes-dashboard.fullname" . }}
+    app: {{ template "kubernetes-dashboard.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -22,9 +22,7 @@ spec:
     metadata:
       labels:
         app: {{ template "kubernetes-dashboard.name" . }}
-        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-        heritage: "{{ .Release.Service }}"
-        release: "{{ .Release.Name }}"
+        release: {{ .Release.Name }}
         kubernetes.io/cluster-service: "true"
     spec:
       serviceAccountName: {{ if .Values.rbac.create }}{{ template "kubernetes-dashboard.fullname" . }}{{ else }}"{{ .Values.rbac.serviceAccountName }}"{{ end }}
diff --git a/stable/kubernetes-dashboard/templates/svc.yaml b/stable/kubernetes-dashboard/templates/svc.yaml
index 550c43ed48..bc99ab385f 100644
--- a/stable/kubernetes-dashboard/templates/svc.yaml
+++ b/stable/kubernetes-dashboard/templates/svc.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "kubernetes-dashboard.service.fullname" . }}
+  name: {{ template "kubernetes-dashboard.fullname" . }}
   labels:
-    app: {{ template "kubernetes-dashboard.fullname" . }}
+    app: {{ template "kubernetes-dashboard.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -24,5 +24,5 @@ spec:
     nodePort: {{ .Values.service.nodePort }}
 {{- end }}
   selector:
-    app: {{ template "kubernetes-dashboard.fullname" . }}
+    app: {{ template "kubernetes-dashboard.name" . }}
     release: {{ .Release.Name }}