[incubator/docker-registry] #1785 namespace defined templates with chart name (#1836)

incubator/docker-registry/Chart.yaml

@@ -1,10 +1,10 @@
-version: 0.1.0
+version: 0.2.0
 appVersion: 2
 description: private docker registry
 name: docker-registry
 keywords:
-  - docker
-  - registry
+- docker
+- registry
 maintainers:
-  - name: sbezverk 
-    email: sbezverk@cisco.com
+- name: sbezverk
+  email: sbezverk@cisco.com

incubator/docker-registry/templates/_helpers.tpl

@@ -1,8 +1,8 @@
-{{- define "name" -}}
+{{- define "docker-registry.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-{{- define "fullname" -}}
+{{- define "docker-registry.fullname" -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- printf "%s-%s" $name .Release.Name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}

incubator/docker-registry/templates/deployment.yaml

@@ -1,9 +1,9 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "docker-registry.fullname" . }}
   labels:
-    app: {{ template "name" . }} 
+    app: {{ template "docker-registry.name" . }} 
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
@@ -12,7 +12,7 @@ spec:
   template:
     metadata:
       labels:
-        app: {{ template "name" . }}
+        app: {{ template "docker-registry.name" . }}
         release: {{ .Release.Name }}
     spec:
       initContainers:
@@ -56,7 +56,7 @@ spec:
       - name: image-store
       {{- if .Values.persistentVolumeEnabled }}
         persistentVolumeClaim:
-          claimName: {{ if .Values.persistentVolume.existingClaim }}{{ .Values.persistentVolume.existingClaim }}{{- else }}{{ template "fullname" . }}{{- end }}
+          claimName: {{ if .Values.persistentVolume.existingClaim }}{{ .Values.persistentVolume.existingClaim }}{{- else }}{{ template "docker-registry.fullname" . }}{{- end }}
       {{- else }}
         emptyDir: {}
       {{- end -}}

incubator/docker-registry/templates/pvc.yaml

@@ -13,11 +13,11 @@ metadata:
 {{ toYaml .Values.persistentVolume.annotations | indent 4 }}
   {{- end }}
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "docker-registry.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
-  name: {{ template "fullname" . }}
+  name: {{ template "docker-registry.fullname" . }}
 spec:
   accessModes:
 {{ toYaml .Values.persistentVolume.accessModes | indent 4 }}

incubator/docker-registry/templates/service.yaml

@@ -1,15 +1,15 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "docker-registry.fullname" . }}
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "docker-registry.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
 spec:
   selector:
-    app: {{ template "name" . }}
+    app: {{ template "docker-registry.name" . }}
     release: {{ .Release.Name }}
   ports:
   - name: registry