Merge pull request #30 from w3f/helper

added template helper

Author: ironoa

charts/matrixbot/Chart.yaml

@@ -1,5 +1,5 @@
 description: Web3 Foundation bot for matrix.org
 name: matrixbot
-version: v1.3.2
-appVersion: v1.3.2
+version: v1.3.3
+appVersion: v1.3.3
 apiVersion: v2

charts/matrixbot/templates/_helpers.tpl

@@ -0,0 +1,4 @@
+{{/* Returns the app name */}}
+{{- define "app.name" -}}
+{{- default .Release.Name .Values.nameOverride -}}
+{{- end }}

charts/matrixbot/templates/configmap.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ .Release.Name }}
+  name: {{ include "app.name" . }}
 data:
   configuration.yaml: |
     web:

charts/matrixbot/templates/deployment.yaml

@@ -1,9 +1,9 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ .Release.Name }}
+  name: {{ include "app.name" . }}
   labels:
-    app: {{ .Release.Name }}
+    app: {{ include "app.name" . }}
 spec:
   {{ if or (eq .Values.sqliteDB.enabled true) (eq .Values.sqliteDB.enabled true) }}
   replicas: 1
@@ -19,16 +19,16 @@ spec:
     {{ end }}
   selector:
     matchLabels:
-      app: {{ .Release.Name }}
+      app: {{ include "app.name" . }}
   template:
     metadata:
       labels:
-        app: {{ .Release.Name }}
+        app: {{ include "app.name" . }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
     spec:
       containers:
-      - name: {{ .Release.Name }}
+      - name: {{ include "app.name" . }}
         image: {{ .Values.image.repo }}:{{ .Values.image.tag | default .Chart.AppVersion }}
         imagePullPolicy: IfNotPresent
         ports:
@@ -64,12 +64,12 @@ spec:
       volumes:
       - name: config
         configMap:
-          name: {{ .Release.Name }} 
+          name: {{ include "app.name" . }} 
       {{ if eq .Values.sqliteDB.enabled true }}            
       - name: db
         {{ if and (ne .Values.environment "ci") (ne .Values.environment "local") }}
         persistentVolumeClaim:
-          claimName: {{ .Release.Name }}-db
+          claimName: {{ include "app.name" . }}-db
         {{ else }}
         emptyDir: {}  
         {{ end }}
@@ -78,7 +78,7 @@ spec:
       - name: store
         {{ if and (ne .Values.environment "ci") (ne .Values.environment "local") }}
         persistentVolumeClaim:
-          claimName: {{ .Release.Name }}-store
+          claimName: {{ include "app.name" . }}-store
         {{ else }}
         emptyDir: {}  
         {{ end }} 

charts/matrixbot/templates/pvc-db.yaml

@@ -2,7 +2,7 @@
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: {{ .Release.Name }}-db
+  name: {{ include "app.name" . }}-db
 spec:
   accessModes:
     - ReadWriteOnce

charts/matrixbot/templates/pvc-store.yaml

@@ -2,7 +2,7 @@
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: {{ .Release.Name }}-store
+  name: {{ include "app.name" . }}-store
 spec:
   accessModes:
     - ReadWriteOnce

charts/matrixbot/templates/service.yaml

@@ -1,12 +1,12 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Release.Name }}
+  name: {{ include "app.name" . }}
   labels:
-    app: {{ .Release.Name }}
+    app: {{ include "app.name" . }}
 spec:
   ports:
   - name: http
     port: {{ .Values.port }}
   selector:
-    app: {{ .Release.Name }}
+    app: {{ include "app.name" . }}