[stable/buildkite] #1785 namespace defined templates with chart name (#1979)

stable/buildkite/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Agent for Buildkite
 name: buildkite
-version: 0.1.0
+version: 0.2.0
 appVersion: 3.0
 icon: https://github.com/buildkite/media/blob/master/marks/Buildkite%20-%20Mark%20-%20colour.png
 keywords:

stable/buildkite/templates/NOTES.txt

@@ -1,10 +1,10 @@
 {{- if .Values.agent.token }}
 
-The {{ template "fullname" . }} is getting provisioned in your cluster. After a few minutes, you can run the following to verify.
+The {{ template "buildkite.fullname" . }} is getting provisioned in your cluster. After a few minutes, you can run the following to verify.
 
-To verify that {{ template "fullname" . }} has started, run:
+To verify that {{ template "buildkite.fullname" . }} has started, run:
 
-  kubectl --namespace={{ .Release.Namespace }} get pods -l "app={{ template "name" . }},release={{ .Release.Name }}"
+  kubectl --namespace={{ .Release.Namespace }} get pods -l "app={{ template "buildkite.name" . }},release={{ .Release.Name }}"
 
 {{- else }}
 
@@ -16,7 +16,7 @@ Pods will not go to the running state if the Buildkite Agent Token was not provi
 
 This deployment will be incomplete until you provide Buildkite Agent Token:
 
-  helm upgrade {{ template "fullname" . }} stable/builkite \
+  helm upgrade {{ template "buildkite.fullname" . }} stable/builkite \
       --set agent.token="YOUR_BUILKITE_TOKEN"
 
 {{- end }}

stable/buildkite/templates/_helpers.tpl

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

stable/buildkite/templates/deployment.yaml

@@ -2,9 +2,9 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "buildkite.fullname" . }}
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "buildkite.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -13,10 +13,10 @@ spec:
   template:
     metadata:
       labels:
-        app: {{ template "name" . }}
+        app: {{ template "buildkite.name" . }}
         release: {{ .Release.Name }}
     spec:
-      serviceAccount: {{ template "fullname" . }}
+      serviceAccount: {{ template "buildkite.fullname" . }}
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag  }}"
@@ -28,7 +28,7 @@ spec:
             - name: BUILDKITE_AGENT_TOKEN
               valueFrom:
                 secretKeyRef:
-                  name: {{ template "fullname" . }}
+                  name: {{ template "buildkite.fullname" . }}
                   key: agent-token
             - name: BUILDKITE_AGENT_META_DATA
               value: "{{ .Values.agent.meta }}"
@@ -36,7 +36,7 @@ spec:
             - name: SSH_PRIVATE_RSA_KEY
               valueFrom:
                 secretKeyRef:
-                  name: {{ template "fullname" . }}
+                  name: {{ template "buildkite.fullname" . }}
                   key: agent-ssh
             {{- end }}
             # EXTRA BUILDKITE AGENT ENV VARS
@@ -61,12 +61,12 @@ spec:
         {{- if .Values.registryCreds.gcrServiceAccountKey }}
         - name: service-key
           secret:
-            secretName: {{ template "fullname" . }}-gcr
+            secretName: {{ template "buildkite.fullname" . }}-gcr
         {{- end }}
         {{- if .Values.registryCreds.dockerConfig }}
         - name: docker-config
           secret:
-            secretName: {{ template "fullname" . }}-registry
+            secretName: {{ template "buildkite.fullname" . }}-registry
         {{- end }}
     {{- if .Values.nodeSelector }}
       nodeSelector:

stable/buildkite/templates/secret-gcr.yaml

@@ -2,9 +2,9 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ template "fullname" . }}-gcr
+  name: {{ template "buildkite.fullname" . }}-gcr
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "buildkite.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}

stable/buildkite/templates/secret-registry.yaml

@@ -2,9 +2,9 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ template "fullname" . }}-registry
+  name: {{ template "buildkite.fullname" . }}-registry
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "buildkite.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}

stable/buildkite/templates/secret.yaml

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

stable/buildkite/templates/service-account.yaml

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