- Fixes SA logic. Sets explicit SA creation (Required if customer has…

… existing SA) - Adds Vault Params (Implements full capabilities) (resolves #68) - Fixes Redis Values, Didn't pass lint (Fixed)
qameta · Oct 10, 2023 · 8a0d8ba · 8a0d8ba
1 parent 326b5d5
commit 8a0d8ba
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 9 deletions.
diff --git 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.2
+          version: 4.14.3
diff --git a/charts/allure-testops/Chart.yaml b/charts/allure-testops/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: allure-testops
-version: 4.14.2
+version: 4.14.3
 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
@@ -169,7 +169,7 @@ spec:
 {{- if .Values.vault.enabled }}
           volumeMounts:
             - name: vault-creds
-              mountPath: "/mnt/secrets-store"
+              mountPath: "{{ .Values.vault.mountPath }}"
               readOnly: true
       volumes:
         - name: vault-creds

diff --git a/charts/allure-testops/templates/allure/report-statefulset.yaml b/charts/allure-testops/templates/allure/report-statefulset.yaml
@@ -209,7 +209,7 @@ spec:
 {{- end }}
 {{- if .Values.vault.enabled }}
             - name: vault-creds
-              mountPath: "/mnt/secrets-store"
+              mountPath: "{{ .Values.vault.mountPath }}"
               readOnly: true
 {{- end }}
 {{- if .Values.postgresql.external.pgbouncer.enabled }}

diff --git a/charts/allure-testops/templates/allure/uaa-dep.yaml b/charts/allure-testops/templates/allure/uaa-dep.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -278,15 +279,15 @@ spec:
 {{- if .Values.vault.enabled }}
           volumeMounts:
             - name: vault-creds
-              mountPath: "/mnt/secrets-store"
+              mountPath: "{{ .Values.vault.mountPath }}"
               readOnly: true
 {{- if .Values.postgresql.external.pgbouncer.enabled }}
         - name: pgbouncer
           image: {{ .Values.postgresql.external.pgbouncer.image | quote }}
           imagePullPolicy: {{ .Values.registry.pullPolicy }}
           volumeMounts:
             - name: vault-creds
-              mountPath: "/mnt/secrets-store"
+              mountPath: "{{ .Values.vault.mountPath }}"
               readOnly: true
           lifecycle:
             preStop:

diff --git a/charts/allure-testops/templates/infra/serviceaccount.yaml b/charts/allure-testops/templates/infra/serviceaccount.yaml
@@ -1,4 +1,5 @@
-{{- if .Values.rbac.enabled -}}
+{{- if and .Values.rbac.enabled .Values.rbac.serviceAccountCreate }}
+---
 apiVersion: v1
 kind: ServiceAccount
 metadata:

diff --git a/charts/allure-testops/templates/infra/vault.yaml b/charts/allure-testops/templates/infra/vault.yaml
@@ -47,6 +47,13 @@ spec:
         - objectName: "smtpPassword"
           key: "smtpPassword"
   parameters:
+{{- if .Values.vault.url }}
+    vaultAddress: {{ .Values.vault.url }}
+    vaultSkipTLSVerify: {{ .Values.vault.skipTLSVerify }}
+{{- end }}
+{{- if .Values.vault.kubernetesMountPath }}
+    vaultKubernetesMountPath: {{ .Values.vault.kubernetesMountPath }}
+{{- end }}
     roleName: "{{ .Values.vault.roleName }}"
     objects: |
       - objectName: "cryptoPass"

diff --git a/charts/allure-testops/values.yaml b/charts/allure-testops/values.yaml
@@ -151,7 +151,7 @@ redis:
     password: allure
   master:
     service:
-
+      annotations: {}
     persistence:
       enabled: false
       size: 32Gi
@@ -310,10 +310,14 @@ smtp:
 vault:
   enabled: false
   secretName: vault-secret
-  vaultAddress: "http://vault.vault.svc.cluster.local:8200"
+  url: "http://vault.vault.svc.cluster.local:8200"
+  skipTLSVerify: false
+  # Path where the k8s authentication backend is mounted in Vault
+  kubernetesMountPath: my-cluster
   roleName: testops
   secretPath: secret/data/testops-credentials
   smtpPath: secret/data/smtp-credentials
+  mountPath: /mnt/secrets-store
 
 allure:
   # No Settings from this helm chart will be applied except ENV. (For internal use)
@@ -561,6 +565,7 @@ monitoring:
 rbac:
   enabled: true
   serviceAccountName: allure-testops-sa
+  serviceAccountCreate: true
   rules:
     - apiGroups:
         - ''