From 719e67fe688a24f56fa76c7d5a1797714d3762e3 Mon Sep 17 00:00:00 2001
From: Andrey Ryoo <andrey.ryoo@qameta.io>
Date: Fri, 6 Oct 2023 19:55:34 +0600
Subject: [PATCH] Fixes ServiceAccount naming

---
 .github/workflows/release.yml                                 | 2 +-
 charts/allure-testops/Chart.yaml                              | 2 +-
 charts/allure-testops/templates/allure/gateway-dep.yaml       | 2 +-
 .../allure-testops/templates/allure/report-statefulset.yaml   | 4 +---
 charts/allure-testops/templates/allure/uaa-dep.yaml           | 2 +-
 charts/allure-testops/templates/infra/serviceaccount.yaml     | 2 +-
 charts/allure-testops/values.yaml                             | 1 +
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 990d170..4b71da6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,4 +26,4 @@ jobs:
           password: ${{ secrets.ARTIFACTORY_PASS }}
           repoName: allure-testops
           chart: charts/allure-testops
-          version: 4.14.1
+          version: 4.14.2
diff --git a/charts/allure-testops/Chart.yaml b/charts/allure-testops/Chart.yaml
index ec4c6e5..2c895ef 100644
--- a/charts/allure-testops/Chart.yaml
+++ b/charts/allure-testops/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: allure-testops
-version: 4.14.1
+version: 4.14.2
 appVersion: 4.21.0
 
 description: Allure TestOps
diff --git a/charts/allure-testops/templates/allure/gateway-dep.yaml b/charts/allure-testops/templates/allure/gateway-dep.yaml
index d8391ad..7b48b3f 100644
--- a/charts/allure-testops/templates/allure/gateway-dep.yaml
+++ b/charts/allure-testops/templates/allure/gateway-dep.yaml
@@ -30,7 +30,7 @@ spec:
 {{- end }}
     spec:
 {{- if .Values.rbac.enabled }}
-      serviceAccountName: sa-{{ template "allure-testops.fullname" . }}
+      serviceAccountName: {{ .Values.rbac.serviceAccountName }}
 {{- end }}
       imagePullSecrets:
         - name: {{ .Values.registry.imagePullSecret }}
diff --git a/charts/allure-testops/templates/allure/report-statefulset.yaml b/charts/allure-testops/templates/allure/report-statefulset.yaml
index 807948d..74f79a7 100644
--- a/charts/allure-testops/templates/allure/report-statefulset.yaml
+++ b/charts/allure-testops/templates/allure/report-statefulset.yaml
@@ -30,7 +30,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 30
 {{- if .Values.rbac.enabled }}
-      serviceAccountName: sa-{{ template "allure-testops.fullname" . }}
+      serviceAccountName: {{ .Values.rbac.serviceAccountName }}
 {{- end }}
       imagePullSecrets:
         - name: {{ .Values.registry.imagePullSecret }}
@@ -180,8 +180,6 @@ spec:
             - name: STATIC_CERTS
               value: "{{ join "," .Values.certificates.staticCerts }}"
 {{- end }}
-
-
 {{- range $name, $value := .Values.report.env.open }}
             - name: {{ $name | quote }}
               value: {{ $value | quote }}
diff --git a/charts/allure-testops/templates/allure/uaa-dep.yaml b/charts/allure-testops/templates/allure/uaa-dep.yaml
index 0c3dcc5..473089d 100644
--- a/charts/allure-testops/templates/allure/uaa-dep.yaml
+++ b/charts/allure-testops/templates/allure/uaa-dep.yaml
@@ -29,7 +29,7 @@ spec:
 {{- end }}
     spec:
 {{- if .Values.rbac.enabled }}
-      serviceAccountName: sa-{{ template "allure-testops.fullname" . }}
+      serviceAccountName: {{ .Values.rbac.serviceAccountName }}
 {{- end }}
       imagePullSecrets:
         - name: {{ .Values.registry.imagePullSecret }}
diff --git a/charts/allure-testops/templates/infra/serviceaccount.yaml b/charts/allure-testops/templates/infra/serviceaccount.yaml
index 3ae0cec..2f54ffd 100644
--- a/charts/allure-testops/templates/infra/serviceaccount.yaml
+++ b/charts/allure-testops/templates/infra/serviceaccount.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: sa-{{ template "allure-testops.fullname" . }}
+  name: {{ .Values.rbac.serviceAccountName }}
   labels:
     app: {{ template "allure-testops.fullname" . }}
     chart: {{ template "allure-testops.chart" . }}
diff --git a/charts/allure-testops/values.yaml b/charts/allure-testops/values.yaml
index 88e87cf..7cd6f04 100644
--- a/charts/allure-testops/values.yaml
+++ b/charts/allure-testops/values.yaml
@@ -560,6 +560,7 @@ monitoring:
 ###
 rbac:
   enabled: true
+  serviceAccountName: allure-testops-sa
   rules:
     - apiGroups:
         - ''