diff --git a/jira/templates/clusterrole.yaml b/jira/templates/clusterrole.yaml index 8fa6f80..dcd5dc2 100644 --- a/jira/templates/clusterrole.yaml +++ b/jira/templates/clusterrole.yaml @@ -2,7 +2,7 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1beta1 metadata: - name: jira + name: {{ .Release.Name }} rules: - apiGroups: - "" diff --git a/jira/templates/clusterrolebindings.yaml b/jira/templates/clusterrolebindings.yaml index 567c56a..2dd7b30 100644 --- a/jira/templates/clusterrolebindings.yaml +++ b/jira/templates/clusterrolebindings.yaml @@ -2,13 +2,13 @@ kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1beta1 metadata: - name: jira + name: {{ .Release.Name }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: jira + name: {{ .Release.Name }} subjects: - kind: ServiceAccount - name: jira + name: {{ .Release.Name }} namespace: {{ .Release.Namespace }} {{- end }} diff --git a/jira/templates/serviceaccount.yaml b/jira/templates/serviceaccount.yaml index bdec234..90553c9 100644 --- a/jira/templates/serviceaccount.yaml +++ b/jira/templates/serviceaccount.yaml @@ -2,5 +2,5 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: jira + name: {{ .Release.Name }} {{- end }} diff --git a/jira/templates/statefulset.yaml b/jira/templates/statefulset.yaml index e56d491..42e53d4 100644 --- a/jira/templates/statefulset.yaml +++ b/jira/templates/statefulset.yaml @@ -24,7 +24,7 @@ spec: app: {{ .Release.Name }} spec: {{- if .Values.RBAC.Enabled }} - serviceAccountName: jira + serviceAccountName: {{ .Release.Name }} {{- end }} terminationGracePeriodSeconds: {{ .Values.TerminationGracePeriodSeconds | default 50 }} containers: