Skip to content

Commit

Permalink
Merge pull request #296 from reportportal/develop
Browse files Browse the repository at this point in the history
Release
  • Loading branch information
HardNorth committed Feb 24, 2023
2 parents 883876f + 487c291 commit 1ca8de6
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 18 deletions.
8 changes: 4 additions & 4 deletions reportportal/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
appVersion: "5.7.3"
appVersion: "5.7.4"
description: ReportPortal.io AI-powered Test Automation Dashboard
name: reportportal
version: 5.7.3
version: 5.7.4
sources:
- https://github.com/reportportal/kubernetes
keywords:
Expand All @@ -17,8 +17,8 @@ dependencies:
condition: postgresql.installdep.enable

- name: rabbitmq
version: 7.5.6
repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
version: 10.3.9
repository: https://charts.bitnami.com/bitnami
condition: rabbitmq.installdep.enable

- name: elasticsearch
Expand Down
4 changes: 4 additions & 0 deletions reportportal/templates/api-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ spec:
{{- if .Values.serviceapi.extraEnvs }}
{{ toYaml .Values.serviceapi.extraEnvs | indent 8 }}
{{- end }}
{{- if .Values.elasticsearch.doubleEntry.enable }}
- name: RP_ELASTICSEARCHLOGMESSAGE_HOST
value: "true"
{{- end}}
- name: LOGGING_LEVEL_ORG_HIBERNATE_SQL
value: "info"
- name: RP_REQUESTLOGGING
Expand Down
8 changes: 8 additions & 0 deletions reportportal/templates/jobs-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,14 @@ spec:
{{- if .Values.servicejobs.extraEnvs }}
{{ toYaml .Values.servicejobs.extraEnvs | indent 8 }}
{{- end }}
{{- if .Values.elasticsearch.doubleEntry.enable }}
- name: RP_ELASTICSEARCH_HOST
value: "{{ .Values.elasticsearch.endpoint }}"
- name: RP_ELASTICSEARCH_USERNAME
value: "{{ .Values.elasticsearch.user }}"
- name: RP_ELASTICSEARCH_PASSWORD
value: "{{ .Values.elasticsearch.password }}"
{{- end}}
- name: RP_ENVIRONMENT_VARIABLE_CLEAN_ATTACHMENT_CRON
value: "{{ .Values.servicejobs.coreJobs.cleanAttachmentCron }}"
- name: RP_ENVIRONMENT_VARIABLE_CLEAN_LOG_CRON
Expand Down
36 changes: 22 additions & 14 deletions reportportal/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ serviceindex:
uat:
repository: reportportal/service-authorization
name: uat
tag: 5.7.3
tag: 5.7.4
pullPolicy: Always
readinessProbe:
enabled: true
Expand Down Expand Up @@ -97,7 +97,7 @@ uat:

serviceui:
repository: reportportal/service-ui
tag: 5.7.3
tag: 5.7.4
name: ui
pullPolicy: Always
resources:
Expand All @@ -121,7 +121,7 @@ serviceui:

serviceapi:
repository: reportportal/service-api
tag: 5.7.3
tag: 5.7.4
name: api
pullPolicy: Always
replicaCount: 1
Expand Down Expand Up @@ -175,7 +175,7 @@ serviceapi:

servicejobs:
repository: reportportal/service-jobs
tag: 5.7.3
tag: 5.7.4
name: jobs
pullPolicy: Always
readinessProbe:
Expand Down Expand Up @@ -255,7 +255,7 @@ migrations:

serviceanalyzer:
repository: reportportal/service-auto-analyzer
tag: 5.7.3
tag: 5.7.4
name: analyzer
pullPolicy: Always
uwsgiWorkers: 2
Expand Down Expand Up @@ -395,6 +395,14 @@ elasticsearch:
secretName: ""
installdep:
enable: false
## Double entry moves test logs from PostgreSQL to Elastic-type engines
## Ref: https://reportportal.io/blog/double-entry-in-5.7.2
##
## ElasticSearch Performance tuning
## Ref: https://reportportal.io/docs/installation-steps/OptimalPerformanceHardwareSetup/#7-elasticsearch-performance-tuning
##
doubleEntry:
enable: true
endpoint: http://elasticsearch-master.default.svc.cluster.local:9200
user: elastic
password:
Expand All @@ -415,13 +423,13 @@ minio:
defaultBucketName: ""
integrationSaltPath: ""

# Ingress configuration for the ui
# If you have installed ingress controller and want to expose application - set INGRESS.ENABLE to true.
# If you have some domain name set INGRESS.USEDOMAINNAME variable to true and set this fqdn to INGRESS.HOSTS
# If you don't have any domain names - set INGRESS.USEDOMAINNAME to false
## Ingress configuration for the ui
## If you have installed ingress controller and want to expose application - set INGRESS.ENABLE to true.
## If you have some domain name set INGRESS.USEDOMAINNAME variable to true and set this fqdn to INGRESS.HOSTS
## If you don't have any domain names - set INGRESS.USEDOMAINNAME to false
ingress:
enable: true
# IF YOU HAVE SOME DOMAIN NAME SET INGRESS.USEDOMAINNAME to true
## IF YOU HAVE SOME DOMAIN NAME SET INGRESS.USEDOMAINNAME to true
usedomainname: false
hosts:
- reportportal.k8.com
Expand All @@ -442,29 +450,29 @@ ingress:
# - reportportal.k8.com
# secretName: reportportal.k8.com-tls

# tolerations for all components, if any (requires Kubernetes >= 1.6)
## tolerations for all components, if any (requires Kubernetes >= 1.6)
## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
tolerations: []
# - key: "key"
# operator: "Equal|Exists"
# value: "value"
# effect: "NoSchedule|PreferNoSchedule|NoExecute"

# RBAC is required for service-index in order to collect status/info over all services
## RBAC is required for service-index in order to collect status/info over all services
rbac:
create: true
serviceAccount:
create: true
name: reportportal
# For AWS IAM role association use the following annotations
## For AWS IAM role association use the following annotations
## See: https://docs.aws.amazon.com/eks/latest/userguide/specify-service-account-role.html
annotations: {}

rp:
infoEndpoint: "/info"
healthEndpoint: "/health"

# Extra init containers to e.g. wait for minio
## Extra init containers to e.g. wait for minio
extraInitContainers: {}
# - name: "wait-for-minio"
# image: "busybox"
Expand Down

0 comments on commit 1ca8de6

Please sign in to comment.