Merge pull request #77 from qameta/vault-fix

Removes aws access key and secret key when using STS
qameta · Nov 17, 2023 · 19c4e31 · 19c4e31
2 parents 4a03eda + 4e8c647
commit 19c4e31
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 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.4
+          version: 4.14.5
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.4
+version: 4.14.5
 appVersion: 4.22.0
 
 description: Allure TestOps

diff --git a/charts/allure-testops/templates/infra/vault.yaml b/charts/allure-testops/templates/infra/vault.yaml
@@ -38,10 +38,12 @@ spec:
           key: "rabbitUser"
         - objectName: "rabbitPass"
           key: "rabbitPass"
+{{- if not .Values.aws.enabled }}
         - objectName: "s3AccessKey"
           key: "s3AccessKey"
         - objectName: "s3SecretKey"
           key: "s3SecretKey"
+{{- end }}
         - objectName: "smtpUsername"
           key: "smtpUsername"
         - objectName: "smtpPassword"
@@ -108,13 +110,15 @@ spec:
         secretPath: "{{ .Values.vault.secretPath }}"
         secretKey: "rabbit_pass"
 
+{{- if not .Values.aws.enabled }}
       - objectName: "s3AccessKey"
         secretPath: "{{ .Values.vault.secretPath }}"
         secretKey: "s3_access_key"
 
       - objectName: "s3SecretKey"
         secretPath: "{{ .Values.vault.secretPath }}"
         secretKey: "s3_secret_key"
+{{- end }}
 
       - objectName: "smtpUsername"
         secretPath: "{{ .Values.vault.smtpPath }}"