fix awsSTS and #19 (#20)

* fix awsSTS and #19

* fix

- linter still fails

charts/testops/templates/_helpers.tpl

@@ -24,7 +24,7 @@
 {{- end -}}
 
 {{- define "allure-testops.redis.fullname" -}}
-{{- if .Values.redis.deployByChart }}
+{{- if .Values.redis.enabled }}
   {{- printf "%s-%s" .Release.Name "redis-master" | trunc 63 | trimSuffix "-" }}
 {{- else }}
   {{- print .Values.redis.host }}
@@ -52,7 +52,7 @@
 {{- end }}
 
 {{- define "rabbitHost" }}
-{{- if .Values.rabbitmq.deployByChart }}
+{{- if .Values.rabbitmq.enabled }}
   {{- printf "amqp://%s-%s:%.f" .Release.Name "rabbitmq" .Values.rabbitmq.service.ports.amqp | trunc 63 | trimSuffix "-" }}
 {{- else }}
   {{- print .Values.rabbitmq.hosts }}
@@ -546,7 +546,7 @@
 
 {{- define "renderWidgetsCache" }}
   - name: ALLURE_CACHE-TTL_ENABLED
-    value: {{ .Values.widgetsCache.enabled }}
+    value: {{ .Values.widgetsCache.enabled | quote }}
   - name: ALLURE_CACHE-TTL_BY-DEFAULT
     value: {{ .Values.widgetsCache.byDefault }}
   - name: ALLURE_CACHE-TTL_WIDGETS_AUTOMATION-TREND

charts/testops/templates/infra/role.yaml

@@ -1,14 +1,31 @@
-{{- if .Values.rbac.enabled -}}
-# create rbac role with permission for discovery
+{{- if .Values.rbac.enabled }}
 kind: Role
-apiVersion: rbac.authorization.k8s.io/v1
+apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
 metadata:
-  name: {{ template "allure-testops.name" . }}-namespace-reader
-  labels:
-    app: {{ template "allure-testops.name" . }}
-    chart: {{ template "allure-testops.chart" . }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+  name: {{ include "common.names.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
+  labels: {{- include "common.labels.standard" . | nindent 4 }}
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+# yamllint disable rule:indentation
 rules:
-{{ toYaml .Values.rbac.rules | indent 2}}
-{{- end -}}
+  {{- $pspAvailable := (semverCompare "<1.25-0" (include "common.capabilities.kubeVersion" .)) -}}
+  {{- if and $pspAvailable .Values.psp.create }}
+  - apiGroups:
+      - 'policy'
+    resources:
+      - 'podsecuritypolicies'
+    verbs:
+      - 'use'
+    resourceNames:
+      - {{ include "common.names.fullname" . }}
+  {{- end }}
+  {{- if .Values.rbac.rules }}
+  {{- include "common.tplvalues.render" ( dict "value" .Values.rbac.rules "context" $ ) | nindent 2 }}
+  {{- end }}
+        # yamllint enable rule:indentation
+{{- end }}

charts/testops/templates/infra/serviceaccount.yaml

@@ -1,10 +1,11 @@
-{{- if .Values.rbac.enabled -}}
+{{- if and .Values.rbac.enabled .Values.rbac.serviceAccountCreate }}
+---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ template "allure-testops.name" . }}-sa
+  name: {{ .Values.rbac.serviceAccountName }}
   labels:
-    app: {{ template "allure-testops.name" . }}
+    app: {{ template "allure-testops.fullname" . }}
     chart: {{ template "allure-testops.chart" . }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}

charts/testops/values.yaml

@@ -575,6 +575,8 @@ auth:
 ############################################################################################################
 rbac:
   enabled: true
+  serviceAccountName: allure-testops-sa
+  serviceAccountCreate: true
   rules:
     - apiGroups:
         - ''
@@ -655,7 +657,7 @@ rabbitmq:
   # If deployed using this chart, RabbitMQ is managed by the original Helm chart provided by Bitnami
   # for the reference, please visit: https://github.com/bitnami/charts/tree/main/bitnami/rabbitmq
   #########################################################################################################
-  deployByChart: true
+  enabled: true
   hosts: amqps://mq.example.com:5672
   vhost: "/"
   # username and password to connect to RabbitMQ server as per the deployed config
@@ -672,7 +674,7 @@ rabbitmq:
 
 redis:
   # Set to 'false' if you have Redis deployed in your infrastructure, and you are allowed to use it with Allure TestOps
-  deployByChart: true
+  enabled: true
   # if deployByChart is false, then the settings below are required
   host: redis.example.com
   port: 6379