Append reloader to templates

deployments/kubernetes/chart/reloader/templates/_helpers.tpl

@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "name" -}}
+{{- define "reloader-name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" | lower -}}
 {{- end -}}
 
@@ -10,23 +10,23 @@ 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 "reloader-fullname" -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-{{- define "labels.selector" -}}
-app: {{ template "name" . }}
+{{- define "reloader-labels.selector" -}}
+app: {{ template "reloader-name" . }}
 group: {{ .Values.reloader.labels.group }}
 provider: {{ .Values.reloader.labels.provider }}
 {{- end -}}
 
-{{- define "labels.stakater" -}}
-{{ template "labels.selector" . }}
+{{- define "reloader-labels.stakater" -}}
+{{ template "reloader-labels.selector" . }}
 version: {{ .Values.reloader.labels.version }}
 {{- end -}}
 
-{{- define "labels.chart" -}}
+{{- define "reloader-labels.chart" -}}
 chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
 release: {{ .Release.Name | quote }}
 heritage: {{ .Release.Service | quote }}

deployments/kubernetes/chart/reloader/templates/deployment.yaml

@@ -2,23 +2,23 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   annotations:
-    configmap.fabric8.io/update-on-change: {{ template "name" . }}
+    configmap.fabric8.io/update-on-change: {{ template "reloader-name" . }}
   labels:
-{{ include "labels.stakater" . | indent 4 }}
-{{ include "labels.chart" . | indent 4 }}
-  name: {{ template "name" . }}
+{{ include "reloader-labels.stakater" . | indent 4 }}
+{{ include "reloader-labels.chart" . | indent 4 }}
+  name: {{ template "reloader-name" . }}
 spec:
   replicas: 1
   revisionHistoryLimit: 2
   selector:
     matchLabels:
-{{ include "labels.selector" . | indent 6 }}
+{{ include "reloader-labels.selector" . | indent 6 }}
   template:
     metadata:
       annotations:
-        configmap.fabric8.io/update-on-change: {{ template "name" . }}
+        configmap.fabric8.io/update-on-change: {{ template "reloader-name" . }}
       labels:
-{{ include "labels.selector" . | indent 8 }}
+{{ include "reloader-labels.selector" . | indent 8 }}
     spec:
       containers:
       - env:
@@ -28,6 +28,6 @@ spec:
               fieldPath: metadata.namespace
         image: "{{ .Values.reloader.image.name }}:{{ .Values.reloader.image.tag }}"
         imagePullPolicy: {{ .Values.reloader.image.pullPolicy }}
-        name: {{ template "name" . }}
-      serviceAccountName: {{ template "name" . }}
+        name: {{ template "reloader-name" . }}
+      serviceAccountName: {{ template "reloader-name" . }}
               

deployments/kubernetes/chart/reloader/templates/rbac.yaml

@@ -2,17 +2,17 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   labels:
-{{ include "labels.stakater" . | indent 4 }}
-{{ include "labels.chart" . | indent 4 }}
-  name: {{ template "name" . }}
+{{ include "reloader-labels.stakater" . | indent 4 }}
+{{ include "reloader-labels.chart" . | indent 4 }}
+  name: {{ template "reloader-name" . }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
 metadata:
   labels: 
-{{ include "labels.stakater" . | indent 4 }}
-{{ include "labels.chart" . | indent 4 }}
-  name: {{ template "name" . }}-role
+{{ include "reloader-labels.stakater" . | indent 4 }}
+{{ include "reloader-labels.chart" . | indent 4 }}
+  name: {{ template "reloader-name" . }}-role
 rules:
   - apiGroups:
       - ""
@@ -28,14 +28,14 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding
 metadata:
   labels: 
-{{ include "labels.stakater" . | indent 4 }}
-{{ include "labels.chart" . | indent 4 }}
-  name: {{ template "name" . }}-role-binding
+{{ include "reloader-labels.stakater" . | indent 4 }}
+{{ include "reloader-labels.chart" . | indent 4 }}
+  name: {{ template "reloader-name" . }}-role-binding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ template "name" . }}-role
+  name: {{ template "reloader-name" . }}-role
 subjects:
   - kind: ServiceAccount
-    name: {{ template "name" . }}
+    name: {{ template "reloader-name" . }}
     namespace: {{ .Release.Namespace }}