diff --git a/deployments/kubernetes/chart/reloader/templates/_helpers.tpl b/deployments/kubernetes/chart/reloader/templates/_helpers.tpl index 09593e5d..a2d2ef19 100644 --- a/deployments/kubernetes/chart/reloader/templates/_helpers.tpl +++ b/deployments/kubernetes/chart/reloader/templates/_helpers.tpl @@ -2,9 +2,6 @@ {{/* Expand the name of the chart. */}} -{{- define "reloader-name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" | lower -}} -{{- end -}} {{/* Create a default fully qualified app name. @@ -16,7 +13,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this {{- end -}} {{- define "reloader-labels.chart" -}} -app: {{ template "reloader-name" . }} +app: {{ template "reloader-fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} diff --git a/deployments/kubernetes/chart/reloader/templates/clusterrole.yaml b/deployments/kubernetes/chart/reloader/templates/clusterrole.yaml index b622bee1..8d51ef40 100644 --- a/deployments/kubernetes/chart/reloader/templates/clusterrole.yaml +++ b/deployments/kubernetes/chart/reloader/templates/clusterrole.yaml @@ -10,7 +10,7 @@ metadata: {{- if .Values.reloader.matchLabels }} {{ toYaml .Values.reloader.matchLabels | indent 4 }} {{- end }} - name: {{ template "reloader-name" . }}-role + name: {{ template "reloader-fullname" . }}-role namespace: {{ .Release.Namespace }} rules: - apiGroups: diff --git a/deployments/kubernetes/chart/reloader/templates/clusterrolebinding.yaml b/deployments/kubernetes/chart/reloader/templates/clusterrolebinding.yaml index aebd6734..28c9d4b9 100644 --- a/deployments/kubernetes/chart/reloader/templates/clusterrolebinding.yaml +++ b/deployments/kubernetes/chart/reloader/templates/clusterrolebinding.yaml @@ -10,12 +10,12 @@ metadata: {{- if .Values.reloader.matchLabels }} {{ toYaml .Values.reloader.matchLabels | indent 4 }} {{- end }} - name: {{ template "reloader-name" . }}-role-binding + name: {{ template "reloader-fullname" . }}-role-binding namespace: {{ .Release.Namespace }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: {{ template "reloader-name" . }}-role + name: {{ template "reloader-fullname" . }}-role subjects: - kind: ServiceAccount name: {{ template "reloader-serviceAccountName" . }} diff --git a/deployments/kubernetes/chart/reloader/templates/deployment.yaml b/deployments/kubernetes/chart/reloader/templates/deployment.yaml index a72a2f77..2beb581f 100644 --- a/deployments/kubernetes/chart/reloader/templates/deployment.yaml +++ b/deployments/kubernetes/chart/reloader/templates/deployment.yaml @@ -13,13 +13,13 @@ metadata: {{- if .Values.reloader.matchLabels }} {{ toYaml .Values.reloader.matchLabels | indent 4 }} {{- end }} - name: {{ template "reloader-name" . }} + name: {{ template "reloader-fullname" . }} spec: replicas: 1 revisionHistoryLimit: 2 selector: matchLabels: - app: {{ template "reloader-name" . }} + app: {{ template "reloader-fullname" . }} release: {{ .Release.Name | quote }} {{- if .Values.reloader.matchLabels }} {{ toYaml .Values.reloader.matchLabels | indent 6 }} @@ -81,7 +81,7 @@ spec: {{- end }} image: "{{ .Values.reloader.deployment.image.name }}:{{ .Values.reloader.deployment.image.tag }}" imagePullPolicy: {{ .Values.reloader.deployment.image.pullPolicy }} - name: {{ template "reloader-name" . }} + name: {{ template "reloader-fullname" . }} {{- if eq .Values.reloader.readOnlyRootFileSystem true }} volumeMounts: - mountPath: /tmp/ diff --git a/deployments/kubernetes/chart/reloader/templates/role.yaml b/deployments/kubernetes/chart/reloader/templates/role.yaml index dd4507c0..8b616592 100644 --- a/deployments/kubernetes/chart/reloader/templates/role.yaml +++ b/deployments/kubernetes/chart/reloader/templates/role.yaml @@ -10,7 +10,7 @@ metadata: {{- if .Values.reloader.matchLabels }} {{ toYaml .Values.reloader.matchLabels | indent 4 }} {{- end }} - name: {{ template "reloader-name" . }}-role + name: {{ template "reloader-fullname" . }}-role namespace: {{ .Release.Namespace }} rules: - apiGroups: diff --git a/deployments/kubernetes/chart/reloader/templates/rolebinding.yaml b/deployments/kubernetes/chart/reloader/templates/rolebinding.yaml index 31b37792..94fb1f83 100644 --- a/deployments/kubernetes/chart/reloader/templates/rolebinding.yaml +++ b/deployments/kubernetes/chart/reloader/templates/rolebinding.yaml @@ -10,12 +10,12 @@ metadata: {{- if .Values.reloader.matchLabels }} {{ toYaml .Values.reloader.matchLabels | indent 4 }} {{- end }} - name: {{ template "reloader-name" . }}-role-binding + name: {{ template "reloader-fullname" . }}-role-binding namespace: {{ .Release.Namespace }} roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: {{ template "reloader-name" . }}-role + name: {{ template "reloader-fullname" . }}-role subjects: - kind: ServiceAccount name: {{ template "reloader-serviceAccountName" . }}