[stable/mysql] #1785 namespace defined templates with chart name

stable/mysql/Chart.yaml

@@ -1,6 +1,7 @@
 name: mysql
-version: 0.2.9
-description: Fast, reliable, scalable, and easy to use open-source relational database system.
+version: 0.3.0
+description: Fast, reliable, scalable, and easy to use open-source relational database
+  system.
 keywords:
 - mysql
 - database

stable/mysql/templates/NOTES.txt

@@ -1,9 +1,9 @@
 MySQL can be accessed via port 3306 on the following DNS name from within your cluster:
-{{ template "fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local
+{{ template "mysql.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local
 
 To get your root password run:
 
-    kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.mysql-root-password}" | base64 --decode; echo
+    kubectl get secret --namespace {{ .Release.Namespace }} {{ template "mysql.fullname" . }} -o jsonpath="{.data.mysql-root-password}" | base64 --decode; echo
 
 To connect to your database:
 
@@ -16,4 +16,4 @@ To connect to your database:
     $ apt-get update && apt-get install mysql-client -y
 
 3. Connect using the mysql cli, then provide your password:
-    $ mysql -h {{ template "fullname" . }} -p
+    $ mysql -h {{ template "mysql.fullname" . }} -p

stable/mysql/templates/_helpers.tpl

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

stable/mysql/templates/configmap.yaml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "mysql.fullname" . }}
 data:
 {{- range $key, $val := .Values.configurationFiles }}
   {{ $key }}: |-

stable/mysql/templates/deployment.yaml

@@ -1,17 +1,17 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "mysql.fullname" . }}
   labels:
-    app: {{ template "fullname" . }}
+    app: {{ template "mysql.fullname" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
 spec:
   template:
     metadata:
       labels:
-        app: {{ template "fullname" . }}
+        app: {{ template "mysql.fullname" . }}
     spec:
       initContainers:
       - name: "remove-lost-found"
@@ -25,7 +25,7 @@ spec:
           subPath: {{ .Values.persistence.subPath }}
           {{- end }}
       containers:
-      - name: {{ template "fullname" . }}
+      - name: {{ template "mysql.fullname" . }}
         image: "{{ .Values.image }}:{{ .Values.imageTag }}"
         imagePullPolicy: {{ .Values.imagePullPolicy | quote }}
         resources:
@@ -38,12 +38,12 @@ spec:
         - name: MYSQL_ROOT_PASSWORD
           valueFrom:
             secretKeyRef:
-              name: {{ template "fullname" . }}
+              name: {{ template "mysql.fullname" . }}
               key: mysql-root-password
         - name: MYSQL_PASSWORD
           valueFrom:
             secretKeyRef:
-              name: {{ template "fullname" . }}
+              name: {{ template "mysql.fullname" . }}
               key: mysql-password
         {{- end }}
         - name: MYSQL_USER
@@ -93,12 +93,12 @@ spec:
       {{- if .Values.configurationFiles }}
       - name: configurations
         configMap:
-          name: {{ template "fullname" . }}
+          name: {{ template "mysql.fullname" . }}
       {{- end }}
       - name: data
       {{- if .Values.persistence.enabled }}
         persistentVolumeClaim:
-          claimName: {{ .Values.persistence.existingClaim | default (include "fullname" .) }}
+          claimName: {{ .Values.persistence.existingClaim | default (include "mysql.fullname" .) }}
       {{- else }}
         emptyDir: {}
       {{- end -}}

stable/mysql/templates/pvc.yaml

@@ -2,9 +2,9 @@
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "mysql.fullname" . }}
   labels:
-    app: {{ template "fullname" . }}
+    app: {{ template "mysql.fullname" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"

stable/mysql/templates/secrets.yaml

@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "mysql.fullname" . }}
   labels:
-    app: {{ template "fullname" . }}
+    app: {{ template "mysql.fullname" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"

stable/mysql/templates/svc.yaml

@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "mysql.fullname" . }}
   labels:
-    app: {{ template "fullname" . }}
+    app: {{ template "mysql.fullname" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
@@ -13,4 +13,4 @@ spec:
     port: 3306
     targetPort: mysql
   selector:
-    app: {{ template "fullname" . }}
+    app: {{ template "mysql.fullname" . }}