Skip to content

Commit 5fc9fa2

Browse files
committed
added template helper
1 parent acdd395 commit 5fc9fa2

7 files changed

Lines changed: 20 additions & 16 deletions

File tree

charts/matrixbot/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
description: Web3 Foundation bot for matrix.org
22
name: matrixbot
3-
version: v1.3.2
4-
appVersion: v1.3.2
3+
version: v1.3.3
4+
appVersion: v1.3.3
55
apiVersion: v2
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{{/* Returns the app name */}}
2+
{{- define "app.name" -}}
3+
{{- default .Release.Name .Values.nameOverride -}}
4+
{{- end }}

charts/matrixbot/templates/configmap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v1
22
kind: ConfigMap
33
metadata:
4-
name: {{ .Release.Name }}
4+
name: {{ include "app.name" . }}
55
data:
66
configuration.yaml: |
77
web:

charts/matrixbot/templates/deployment.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
4-
name: {{ .Release.Name }}
4+
name: {{ include "app.name" . }}
55
labels:
6-
app: {{ .Release.Name }}
6+
app: {{ include "app.name" . }}
77
spec:
88
{{ if or (eq .Values.sqliteDB.enabled true) (eq .Values.sqliteDB.enabled true) }}
99
replicas: 1
@@ -19,16 +19,16 @@ spec:
1919
{{ end }}
2020
selector:
2121
matchLabels:
22-
app: {{ .Release.Name }}
22+
app: {{ include "app.name" . }}
2323
template:
2424
metadata:
2525
labels:
26-
app: {{ .Release.Name }}
26+
app: {{ include "app.name" . }}
2727
annotations:
2828
checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
2929
spec:
3030
containers:
31-
- name: {{ .Release.Name }}
31+
- name: {{ include "app.name" . }}
3232
image: {{ .Values.image.repo }}:{{ .Values.image.tag | default .Chart.AppVersion }}
3333
imagePullPolicy: IfNotPresent
3434
ports:
@@ -64,12 +64,12 @@ spec:
6464
volumes:
6565
- name: config
6666
configMap:
67-
name: {{ .Release.Name }}
67+
name: {{ include "app.name" . }}
6868
{{ if eq .Values.sqliteDB.enabled true }}
6969
- name: db
7070
{{ if and (ne .Values.environment "ci") (ne .Values.environment "local") }}
7171
persistentVolumeClaim:
72-
claimName: {{ .Release.Name }}-db
72+
claimName: {{ include "app.name" . }}-db
7373
{{ else }}
7474
emptyDir: {}
7575
{{ end }}
@@ -78,7 +78,7 @@ spec:
7878
- name: store
7979
{{ if and (ne .Values.environment "ci") (ne .Values.environment "local") }}
8080
persistentVolumeClaim:
81-
claimName: {{ .Release.Name }}-store
81+
claimName: {{ include "app.name" . }}-store
8282
{{ else }}
8383
emptyDir: {}
8484
{{ end }}

charts/matrixbot/templates/pvc-db.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
kind: PersistentVolumeClaim
33
apiVersion: v1
44
metadata:
5-
name: {{ .Release.Name }}-db
5+
name: {{ include "app.name" . }}-db
66
spec:
77
accessModes:
88
- ReadWriteOnce

charts/matrixbot/templates/pvc-store.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
kind: PersistentVolumeClaim
33
apiVersion: v1
44
metadata:
5-
name: {{ .Release.Name }}-store
5+
name: {{ include "app.name" . }}-store
66
spec:
77
accessModes:
88
- ReadWriteOnce
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apiVersion: v1
22
kind: Service
33
metadata:
4-
name: {{ .Release.Name }}
4+
name: {{ include "app.name" . }}
55
labels:
6-
app: {{ .Release.Name }}
6+
app: {{ include "app.name" . }}
77
spec:
88
ports:
99
- name: http
1010
port: {{ .Values.port }}
1111
selector:
12-
app: {{ .Release.Name }}
12+
app: {{ include "app.name" . }}

0 commit comments

Comments
 (0)