Merge pull request #453 from reportportal/develop

Re-release 25.1.20

.gitignore

@@ -21,4 +21,5 @@ charts/
 *.rej
 *.tgz
 tmp/
-temp/
+temp/
+tmp*

reportportal/templates/_helpers.tpl

@@ -45,10 +45,10 @@ app: {{ $.Chart.Name | quote }}
 Create the name of the service account to use
 */}}
 {{- define "reportportal.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
-    {{ default "reportportal" .Values.serviceAccount.name }}
+{{- if .Values.global.serviceAccount.create -}}
+    {{ default "reportportal" .Values.global.serviceAccount.name }}
 {{- else -}}
-    {{ default "default" .Values.serviceAccount.name }}
+    {{ default "default" .Values.global.serviceAccount.name }}
 {{- end -}}
 {{- end -}}
 

reportportal/templates/authorization/rolebinding.yaml

@@ -1,4 +1,4 @@
-{{- if and .Values.rbac.create .Values.serviceAccount.create }}
+{{- if and .Values.rbac.create .Values.global.serviceAccount.create }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:

reportportal/templates/authorization/serviceaccount.yaml

@@ -1,12 +1,12 @@
-{{- if .Values.serviceAccount.create }}
+{{- if .Values.global.serviceAccount.create }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
     name: {{ template "reportportal.serviceAccountName" . }}
     namespace: {{ .Release.Namespace }}
-  {{- if .Values.serviceAccount.annotations }}
+  {{- if .Values.global.serviceAccount.annotations }}
     annotations:
-      {{- range $key, $value := .Values.serviceAccount.annotations }}
+      {{- range $key, $value := .Values.global.serviceAccount.annotations }}
       {{ $key }}: {{ $value | quote }}
       {{- end }}
   {{- end }}

reportportal/values.yaml

@@ -15,6 +15,13 @@ global:
   fullnameOverride: ""
   security:
     allowInsecureImages: true
+  serviceAccount:
+    create: true
+    name: reportportal
+    ## @param serviceAccount.annotations For AWS IAM role association use the following annotations
+    ## See: https://docs.aws.amazon.com/eks/latest/userguide/specify-service-account-role.html
+    ##
+    annotations: {}
 
 
 ## @param serviceindex Core ReportPortal service for the indexing
@@ -832,14 +839,6 @@ tolerations: []
   #   value: "value"
   #   effect: "NoSchedule|PreferNoSchedule|NoExecute"
 
-serviceAccount:
-  create: true
-  name: reportportal
-  ## @param serviceAccount.annotations For AWS IAM role association use the following annotations
-  ## See: https://docs.aws.amazon.com/eks/latest/userguide/specify-service-account-role.html
-  ##
-  annotations: {}
-
 ## Role Based Access
 ## ref: https://kubernetes.io/docs/admin/authorization/rbac/
 ##