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

stable/keel/Chart.yaml

@@ -1,7 +1,8 @@
 apiVersion: v1
 name: keel
-description: Open source, tool for automating Kubernetes deployment updates. Keel is stateless, robust and lightweight.
-version: 0.1.3
+description: Open source, tool for automating Kubernetes deployment updates. Keel
+  is stateless, robust and lightweight.
+version: 0.2.0
 appVersion: 0.4.2
 keywords:
 - kubernetes deployment

stable/keel/templates/NOTES.txt

@@ -1,8 +1,8 @@
-1. The {{ template "fullname" . }} is getting provisioned in your cluster. After a few minutes, you can run the following to verify.
+1. The {{ template "keel.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 "keel.fullname" . }} has started, run:
 
-  kubectl --namespace=kube-system get pods -l "app={{ template "name" . }},release={{ .Release.Name }}"
+  kubectl --namespace=kube-system get pods -l "app={{ template "keel.name" . }},release={{ .Release.Name }}"
 
 {{- if .Values.service.enabled }}
 
@@ -11,20 +11,20 @@ To verify that {{ template "fullname" . }} has started, run:
 {{- if contains "LoadBalancer" .Values.service.type }}
 
   NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-        Watch the status with: 'kubectl get svc --namespace kube-system -w {{ template "fullname" . }}'
+        Watch the status with: 'kubectl get svc --namespace kube-system -w {{ template "keel.fullname" . }}'
 
-  export SERVICE_IP=$(kubectl get svc --namespace kube-system  {{ template "fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+  export SERVICE_IP=$(kubectl get svc --namespace kube-system  {{ template "keel.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
   echo http://$SERVICE_IP:{{ .Values.service.externalPort }}
 
 {{- else if contains "ClusterIP"  .Values.service.type }}
 
-  export POD_NAME=$(kubectl get pods --namespace kube-system  -l "app={{ template "name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace kube-system  -l "app={{ template "keel.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
   echo http://127.0.0.1:{{ .Values.service.externalPort }}
   kubectl port-forward --namespace kube-system $POD_NAME {{ .Values.service.externalPort }}:{{ .Values.service.externalPort }}
 
 {{- else if contains "NodePort" .Values.service.type }}
 
-  export NODE_PORT=$(kubectl get --namespace kube-system  -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "fullname" . }})
+  export NODE_PORT=$(kubectl get --namespace kube-system  -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "keel.fullname" . }})
   export NODE_IP=$(kubectl get nodes --namespace kube-system  -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT/
 

stable/keel/templates/_helpers.tpl

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

stable/keel/templates/deployment.yaml

@@ -1,10 +1,10 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "keel.fullname" . }}
   namespace: kube-system
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "keel.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -15,7 +15,7 @@ spec:
   template:
     metadata:
       labels:
-        app: {{ template "name" . }}
+        app: {{ template "keel.name" . }}
         release: {{ .Release.Name }}
     spec:
       containers:
@@ -75,12 +75,12 @@ spec:
             - name: KEY
               valueFrom:
                 secretKeyRef:
-                  name: {{ template "fullname" . }}-webhookrelay
+                  name: {{ template "keel.fullname" . }}-webhookrelay
                   key: key
             - name: SECRET
               valueFrom:
                 secretKeyRef:
-                  name: {{ template "fullname" . }}-webhookrelay
+                  name: {{ template "keel.fullname" . }}-webhookrelay
                   key: secret
             - name: BUCKET
               value: "{{ .Values.webhookRelay.bucket }}"

stable/keel/templates/secrets-webhookrelay.yaml

@@ -2,10 +2,10 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ template "fullname" . }}-webhookrelay
+  name: {{ template "keel.fullname" . }}-webhookrelay
   namespace: kube-system
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "keel.name" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"

stable/keel/templates/service-account.yaml

@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "keel.fullname" . }}
   namespace: kube-system
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "keel.name" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"

stable/keel/templates/service.yaml

@@ -2,10 +2,10 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "keel.fullname" . }}
   namespace: kube-system
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "keel.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -17,7 +17,7 @@ spec:
       protocol: TCP
       name: keel
   selector:
-    app: {{ template "name" . }}
+    app: {{ template "keel.name" . }}
     release: {{ .Release.Name }}
   sessionAffinity: None
 {{- end }}