Use fullname to generate cleaner name in chart

Signed-off-by: Tamal Saha <[email protected]>
stashed · Dec 29, 2018 · 5a9efe7 · 5a9efe7
1 parent a876a9d
commit 5a9efe7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/chart/stash/templates/apiregistration.yaml b/chart/stash/templates/apiregistration.yaml
@@ -59,10 +59,7 @@ metadata:
   name: {{ template "stash.fullname" . }}-apiserver-cert
   namespace: {{ $promNamespace }}
   labels:
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    app: "{{ template "stash.name" . }}"
-    heritage: "{{ .Release.Service }}"
-    release: "{{ .Release.Name }}"
+    {{- include "stash.labels" . | nindent 4 }}
 type: kubernetes.io/tls
 data:
   tls.crt: {{ b64enc $cert.Cert }}

diff --git a/chart/stash/templates/cleaner.yaml b/chart/stash/templates/cleaner.yaml
@@ -1,7 +1,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: {{ .Release.Name }}-cleaner
+  name: {{ template "stash.fullname" . }}-cleaner
   labels:
     {{- include "stash.labels" . | nindent 4 }}
   annotations: