[stable/kube-state-metrics] #1785 namespace defined templates with chart name (#2133)

stable/kube-state-metrics/Chart.yaml

@@ -5,7 +5,7 @@ keywords:
 - metric
 - monitoring
 - prometheus
-version: 0.2.4
+version: 0.3.0
 appVersion: 1.0.1
 home: https://github.com/kubernetes/kube-state-metrics/
 sources:

stable/kube-state-metrics/templates/NOTES.txt

@@ -2,7 +2,7 @@ kube-state-metrics is a simple service that listens to the Kubernetes API server
 The exposed metrics can be found here: https://github.com/kubernetes/kube-state-metrics/#node-metrics.
 
 The metrics are exported on the HTTP endpoint /metrics on the listening port.
-In your case, {{ template "fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.service.port }}/metrics
+In your case, {{ template "kube-state-metrics.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.service.port }}/metrics
 
 They are served either as plaintext or protobuf depending on the Accept header.
 They are designed to be consumed either by Prometheus itself or by a scraper that is compatible with scraping a Prometheus client endpoint.

stable/kube-state-metrics/templates/_helpers.tpl

@@ -2,14 +2,16 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{define "name"}}{{default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}{{end}}
+{{- define "kube-state-metrics.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
 
 {{/*
 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).
 */}}
-{{define "fullname"}}
+{{define "kube-state-metrics.fullname"}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{end}}

stable/kube-state-metrics/templates/clusterrole.yaml

@@ -3,11 +3,11 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
 metadata:
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "kube-state-metrics.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
-  name: {{ template "fullname" . }}
+  name: {{ template "kube-state-metrics.fullname" . }}
 rules:
 - apiGroups: [""]
   resources:

stable/kube-state-metrics/templates/clusterrolebinding.yaml

@@ -3,17 +3,17 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "kube-state-metrics.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
-  name: {{ template "fullname" . }}
+  name: {{ template "kube-state-metrics.fullname" . }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ template "fullname" . }}
+  name: {{ template "kube-state-metrics.fullname" . }}
 subjects:
   - kind: ServiceAccount
-    name: {{ template "fullname" . }}
+    name: {{ template "kube-state-metrics.fullname" . }}
     namespace: {{ .Release.Namespace }}
 {{- end -}}

stable/kube-state-metrics/templates/deployment.yaml

@@ -1,9 +1,9 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "kube-state-metrics.fullname" . }}
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "kube-state-metrics.name" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
@@ -12,10 +12,10 @@ spec:
   template:
     metadata:
       labels:
-        app: {{ template "name" . }}
+        app: {{ template "kube-state-metrics.name" . }}
         release: "{{ .Release.Name }}"
     spec:
-      serviceAccountName: {{ if .Values.rbac.create }}{{ template "fullname" . }}{{ else }}"{{ .Values.rbac.serviceAccountName }}"{{ end }}
+      serviceAccountName: {{ if .Values.rbac.create }}{{ template "kube-state-metrics.fullname" . }}{{ else }}"{{ .Values.rbac.serviceAccountName }}"{{ end }}
       containers:
       - name: {{ .Chart.Name }}
         imagePullPolicy: {{ .Values.image.pullPolicy }}

stable/kube-state-metrics/templates/service.yaml

@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "kube-state-metrics.fullname" . }}
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "kube-state-metrics.name" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
@@ -18,5 +18,5 @@ spec:
     port: {{ .Values.service.port }}
     targetPort: 8080
   selector:
-    app: {{ template "name" . }}
+    app: {{ template "kube-state-metrics.name" . }}
     release: {{ .Release.Name }}

stable/kube-state-metrics/templates/serviceaccount.yaml

@@ -3,9 +3,9 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "kube-state-metrics.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
-  name: {{ template "fullname" . }}
+  name: {{ template "kube-state-metrics.fullname" . }}
 {{- end -}}