Skip to content
This repository has been archived by the owner on Sep 27, 2024. It is now read-only.

Commit

Permalink
Added ALLURE_MAIL_ROOT parameter (#11)
Browse files Browse the repository at this point in the history
* Added ALLURE_MAIL_ROOT parameter

* Update Chart.yaml

5.4.0 → 5.5.0

* 5.4.0 won't see the day light

5.4.0 won't see the day light

---------

Co-authored-by: Egor I <[email protected]>
  • Loading branch information
alexey-bogdanov and cheshi-mantu authored Jul 3, 2024
1 parent 1429d2c commit 1131bd7
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
4 changes: 2 additions & 2 deletions charts/testops/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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

Expand Down
12 changes: 2 additions & 10 deletions charts/testops/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@
{{- end }}

{{- define "renderCommonEnvs" }}
- name: ALLURE_MAIL_ROOT
value: "{{ .Values.email }}"
- name: SPRING_PROFILES_ACTIVE
value: kubernetes
- name: ALLURE_ENDPOINT
Expand Down Expand Up @@ -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 }}


Expand Down
6 changes: 0 additions & 6 deletions charts/testops/templates/infra/secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
9 changes: 4 additions & 5 deletions charts/testops/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: [email protected]

############################################################################################################
# cryptoPass parameter is used to encrypt sensitive data (passwords, API tokens in the database)
Expand Down

0 comments on commit 1131bd7

Please sign in to comment.