github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-23 22:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[stable/kubernetes-dashboard] Fix labels and fullname template (#3475)

Browse Source 
* [BUGFIX] Forgotten dashboard pod label.

* version number incremented

* Fix labels and fullname template
This commit is contained in:
Jakub Kvita
2018-01-31 08:09:13 -08:00
committed by k8s-ci-robot
parent 09d514a953
commit f839448f3a
4 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/kubernetes-dashboard/Chart.yaml
+1 -1
View File
@@ -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:
stable/kubernetes-dashboard/templates/_helpers.tpl
+8 -7
View File
@@ -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 -}}
stable/kubernetes-dashboard/templates/deployment.yaml
+2 -4
View File
@@ -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 }}
stable/kubernetes-dashboard/templates/svc.yaml
+3 -3
View File
@@ -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 }}