fixed RBAC generation logic

charts/testops/templates/infra/role.yaml

@@ -1,31 +1,14 @@
-{{- if .Values.rbac.enabled }}
+{{- if .Values.rbac.enabled -}}
+# create rbac role with permission for discovery
 kind: Role
-apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  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
+  name: {{ template "allure-testops.name" . }}-namespace-reader
+  labels:
+    app: {{ template "allure-testops.name" . }}
+    chart: {{ template "allure-testops.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
 rules:
-  {{- $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 }}
+{{ toYaml .Values.rbac.rules | indent 2}}
+{{- end -}}

charts/testops/templates/infra/rolebinding.yaml

@@ -10,8 +10,8 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
 subjects:
-- kind: ServiceAccount
-  name: {{ template "allure-testops.name" . }}-sa
+  - kind: ServiceAccount
+    name: {{ template "allure-testops.name" . }}-sa
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role

charts/testops/templates/testops/testops-dep.yaml

@@ -30,7 +30,7 @@ spec:
 {{- end }}
     spec:
 {{- if .Values.rbac.enabled }}
-      serviceAccountName:  {{ template "allure-testops.name" . }}-sa
+      serviceAccountName:  {{ .Values.rbac.serviceAccountName }}
 {{- end }}
       imagePullSecrets:
         - name: {{ .Values.image.authRequired.credsKubeSecretName }}