diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d24c4ca..df054f4 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -39,4 +39,4 @@ jobs: - name: Run chart-testing (install) timeout-minutes: 10 run: | - ct install --config ct.yaml --debug --helm-extra-set-args "--set=postgresql.enabled=true --set=minio.enabled=true --set=image.authRequired.enabled=true --set=image.registry=dl.qameta.io --set=image.repository=docker-internal --set=image.imageName=allure-testops --set=image.authRequired.credsKubeSecretName=qameta-secret --set=image.authRequired.username=${{ secrets.ARTIFACTORY_USER }} --set=image.authRequired.password=${{ secrets.ARTIFACTORY_PASS }}" + ct install --config ct.yaml --helm-extra-set-args "--set=postgresql.enabled=true --set=minio.enabled=true --set=image.authRequired.enabled=true --set=image.registry=dl.qameta.io --set=image.repository=docker-internal --set=image.imageName=allure-testops --set=image.authRequired.credsKubeSecretName=qameta-secret --set=image.authRequired.username=${{ secrets.ARTIFACTORY_USER }} --set=image.authRequired.password=${{ secrets.ARTIFACTORY_PASS }}" diff --git a/charts/testops/Chart.yaml b/charts/testops/Chart.yaml index 155c892..503dab4 100644 --- a/charts/testops/Chart.yaml +++ b/charts/testops/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: testops -version: 5.3.3 -appVersion: 5.3.3 +version: 5.5.0 +appVersion: 5.5.0 description: TestOps diff --git a/charts/testops/templates/_helpers.tpl b/charts/testops/templates/_helpers.tpl index f21952c..22d6429 100644 --- a/charts/testops/templates/_helpers.tpl +++ b/charts/testops/templates/_helpers.tpl @@ -108,6 +108,8 @@ {{- end }} {{- define "renderCommonEnvs" }} + - name: ALLURE_MAIL_ROOT + value: "{{ .Values.email }}" - name: SPRING_PROFILES_ACTIVE value: kubernetes - name: ALLURE_ENDPOINT @@ -283,16 +285,6 @@ secretKeyRef: name: {{ template "allure-testops.secret.name" . }} key: "cryptoPass" - - name: ALLURE_SECURITY_USER_NAME - valueFrom: - secretKeyRef: - name: {{ template "allure-testops.secret.name" . }} - key: "username" - - name: ALLURE_SECURITY_USER_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "allure-testops.secret.name" . }} - key: "password" {{- end }} diff --git a/charts/testops/templates/infra/secret.yaml b/charts/testops/templates/infra/secret.yaml index 79ed54b..06fecc2 100644 --- a/charts/testops/templates/infra/secret.yaml +++ b/charts/testops/templates/infra/secret.yaml @@ -10,12 +10,6 @@ metadata: heritage: "{{ .Release.Service }}" type: Opaque data: - username: {{ .Values.username | b64enc | quote }} -{{- if .Values.password }} - password: {{ .Values.password | b64enc | quote }} -{{- else }} - password: {{ randAlphaNum 16 | b64enc | quote }} -{{- end }} {{- if .Values.jwtSecret }} jwtSecret: {{ .Values.jwtSecret | b64enc | quote }} diff --git a/charts/testops/values.yaml b/charts/testops/values.yaml index 2d7fef9..1bcef38 100644 --- a/charts/testops/values.yaml +++ b/charts/testops/values.yaml @@ -24,7 +24,7 @@ appName: testops # for version upgrades, select the desired version of the application and the most recent chart # minimal version of Allure Testops supported by this chart is 5.3.3 ############################################################################################################ -version: 5.3.3 +version: 5.5.0 ############################################################################################################ # Deploy related @@ -104,11 +104,10 @@ resources: timeZone: "Europe/London" ############################################################################################################ -# Credentials of the super-admin -# Good idea would be to manage admin's password via k8s secrets +# Email address to send the invitation for user authorization with admin rights. +# Ensure SMTP is configured to send the invite. ############################################################################################################ -username: admin -password: admin +email: you@company.com ############################################################################################################ # cryptoPass parameter is used to encrypt sensitive data (passwords, API tokens in the database)