Merge pull request #322 from reportportal/develop

Release 23.2
reportportal · Oct 4, 2023 · aaa158a · aaa158a
2 parents 6805f9f + 1aa49d3
commit aaa158a
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 30 deletions.
diff --git a/reportportal/Chart.yaml b/reportportal/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "23.1.1"
+appVersion: "23.2"
 description: ReportPortal.io AI-powered Test Automation Dashboard
 name: reportportal
-version: 5.8.1
+version: 5.10.0
 sources:
   - https://github.com/reportportal/kubernetes
 keywords:

diff --git a/reportportal/README.md b/reportportal/README.md
@@ -99,7 +99,7 @@ Initialize Helm package manager:
 helm repo add bitnami https://charts.bitnami.com/bitnami && helm repo update
 ```
 
-> Before you deploy ReportPortal you should have installed all its requirements. Their versions are described in requirements.yaml
+> Before you deploy ReportPortal you should have installed all its requirements. Their versions are described in `Chart.yaml`
 > You should also specify correct PostgreSQL and RabbitMQ addresses and ports in values.yaml
 
 ```yaml
@@ -269,7 +269,7 @@ Add the elastic helm charts repo:
 helm repo add elastic https://helm.elastic.co && helm repo update
 ```
 
-The following command will use your ReportPortal dependency file requirements.yaml to download all the specified charts into your charts/ directory for you:
+The following command will use ReportPortal dependencies located in `Chart.yaml` file to download all the specified charts into your charts/ directory for you:
 ```sh
 helm dependency build ./reportportal/
 ```

diff --git a/reportportal/templates/api-deployment.yaml b/reportportal/templates/api-deployment.yaml
@@ -33,10 +33,14 @@ spec:
 {{- if .Values.serviceapi.extraEnvs }}
 {{ toYaml .Values.serviceapi.extraEnvs | indent 8 }}
 {{- end }}
+        - name: AUDIT_LOGGER
+          value: "{{ .Values.serviceapi.auditLogs }}"
+        - name: RP_ENVIRONMENT_VARIABLE_ALLOW_DELETE_ACCOUNT
+          value: "{{ .Values.serviceapi.allowDeleteAccount }}"
         {{- if .Values.elasticsearch.doubleEntry.enable }}
         - name: RP_ELASTICSEARCHLOGMESSAGE_HOST
           value: "true"
-        {{- end}}
+        {{- end }}
         - name: LOGGING_LEVEL_ORG_HIBERNATE_SQL
           value: "info"
         - name: RP_REQUESTLOGGING

diff --git a/reportportal/templates/uat-deployment.yaml b/reportportal/templates/uat-deployment.yaml
@@ -33,6 +33,17 @@ spec:
 {{- if .Values.uat.extraEnvs }}
 {{ toYaml .Values.uat.extraEnvs | indent 8 }}
 {{- end }}
+        - name: RP_AMQP_PASS
+        {{- if .Values.rabbitmq.SecretName }}
+          valueFrom:
+            secretKeyRef:
+              name: "{{ .Values.rabbitmq.SecretName }}"
+              key: "rabbitmq-password"
+        {{- else }}
+          value: "{{ .Values.rabbitmq.endpoint.password }}"
+        {{- end }}
+        - name: RP_AMQP_ADDRESSES
+          value: {{ ternary "amqps" "amqp" .Values.rabbitmq.endpoint.ssl }}://{{ .Values.rabbitmq.endpoint.user }}:$(RP_AMQP_PASS)@{{ .Values.rabbitmq.endpoint.address }}:{{ .Values.rabbitmq.endpoint.port }}
         {{- if .Values.uat.superadminInitPasswd.secretName }}
         - name: RP_INITIAL_ADMIN_PASSWORD
           valueFrom:

diff --git a/reportportal/values.yaml b/reportportal/values.yaml
@@ -8,7 +8,7 @@
 
 serviceindex:
   repository: reportportal/service-index
-  tag: 5.8.0
+  tag: 5.10.0
   name: index
   pullPolicy: Always
   resources:
@@ -21,17 +21,17 @@ serviceindex:
   podLabels: {}
   podAnnotations: {}
   securityContext: {}
+  ##
   ## Define which Nodes the Pods are scheduled on.
   ## ref: https://kubernetes.io/docs/user-guide/node-selection/
-  ##
   nodeSelector: {}
   #  disktype: ssd
   service:
     portName: ""
 
 uat:
   repository: reportportal/service-authorization
-  tag: 5.8.2
+  tag: 5.10.0
   name: uat
   pullPolicy: Always
   readinessProbe:
@@ -55,9 +55,9 @@ uat:
       memory: 2048Mi
   sessionLiveTime: 86400
   samlSessionLiveTime: 4320
+  ##
   ## RP_INITIAL_ADMIN_PASSWORD. The initial password for superadmin user. 
   ## If the password was changed from the UI, this value can't change the password on redeployments.
-  ##
   superadminInitPasswd:
     secretName: ""
     passwordKeyName: "superadmin-password"
@@ -68,8 +68,8 @@ uat:
   ## If you need to use a custom java keystore you can use it through jvmArgs
   ## eg. : -Djavax.net.ssl.trustStore=/etc/secret-volume/custom-pki.jks 
   jvmArgs: "-Djava.security.egd=file:/dev/./urandom -XX:MinRAMPercentage=60.0 -XX:MaxRAMPercentage=90.0"
-  ## External environment variables
   ##
+  ## External environment variables
   extraEnvs: []
     # - name: EXTRA_ENV
     #   value: "TRUE"
@@ -79,9 +79,9 @@ uat:
     #       name: "additional-credentials"
     #       key: username
   securityContext: {}
+  ##
   ## Define which Nodes the Pods are scheduled on.
   ## ref: https://kubernetes.io/docs/user-guide/node-selection/
-  ##
   nodeSelector: {}
   #  disktype: ssd
   serviceAccountName: ""
@@ -105,7 +105,7 @@ uat:
 
 serviceui:
   repository: reportportal/service-ui
-  tag: 5.9.0
+  tag: 5.10.0
   name: ui
   pullPolicy: Always
   resources:
@@ -118,9 +118,9 @@ serviceui:
   podLabels: {}
   podAnnotations: {}
   securityContext: {}
+  ##
   ## Define which Nodes the Pods are scheduled on.
   ## ref: https://kubernetes.io/docs/user-guide/node-selection/
-  ##
   nodeSelector: {}
   #  disktype: ssd
   serviceAccountName: ""
@@ -129,7 +129,7 @@ serviceui:
 
 serviceapi:
   repository: reportportal/service-api
-  tag: 5.9.2
+  tag: 5.10.0
   name: api
   pullPolicy: Always
   replicaCount: 1
@@ -152,18 +152,26 @@ serviceapi:
     limits:
       cpu: 1000m
       memory: 2048Mi
+  ## Enable audit logs written to the API container's directory /var/log/reportportal/audit.log
+  auditLogs: off
+  # auditLogs: on
+  ##
   ## jvmArgs
   ## If you need to use a custom java keystore you can use it through jvmArgs
   ## eg. : -Djavax.net.ssl.trustStore=/etc/secret-volume/custom-pki.jks 
   jvmArgs: "-Djava.security.egd=file:/dev/./urandom -XX:+UseG1GC -XX:MinRAMPercentage=60.0 -XX:InitiatingHeapOccupancyPercent=70 -XX:MaxRAMPercentage=90.0 -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp"
+  ##
+  ## Enable the "Delete Account" button in profile UI
+  allowDeleteAccount: true
+  ##
   ## Number of queues
   ## Where "totalNumber" is the total number of queues
   ## Сalculation formula: perPodNumber = totalNumber / serviceapi.replicaCount
   queues:
     totalNumber:
     perPodNumber:
-  ## External environment variables
   ##
+  ## External environment variables
   extraEnvs: []
     # - name: EXTRA_ENV
     #   value: "TRUE"
@@ -175,9 +183,9 @@ serviceapi:
   podLabels: {}
   podAnnotations: {}
   securityContext: {}
+  ##
   ## Define which Nodes the Pods are scheduled on.
   ## ref: https://kubernetes.io/docs/user-guide/node-selection/
-  ##
   nodeSelector: {}
   #  disktype: ssd
   serviceAccountName: ""
@@ -201,7 +209,7 @@ serviceapi:
 
 servicejobs:
   repository: reportportal/service-jobs
-  tag: 5.8.2
+  tag: 5.10.0
   name: jobs
   pullPolicy: Always
   readinessProbe:
@@ -222,7 +230,7 @@ servicejobs:
     cleanLaunchCron: 0 0 */24 * * *
     cleanStorageCron: 0 0 */24 * * *
     storageProjectCron: 0 */5 * * * *
-  chunksize: 1000
+  chunksize: 200000
   ## Used for Double Entry. Ref: https://reportportal.io/blog/double-entry-in-5.7.2
   ## Processing logs by Jobs service (log per ms).
   logProcessing:
@@ -236,8 +244,8 @@ servicejobs:
       cpu: 100m
       memory: 372Mi
   jvmArgs: ""
-  ## External environment variables
   ##
+  ## External environment variables
   extraEnvs: []
     # - name: EXTRA_ENV
     #   value: "TRUE"
@@ -249,9 +257,9 @@ servicejobs:
   podLabels: {}
   podAnnotations: {}
   securityContext: {}
+  ##
   ## Define which Nodes the Pods are scheduled on.
   ## ref: https://kubernetes.io/docs/user-guide/node-selection/
-  ##
   nodeSelector: {}
   #  disktype: ssd
   serviceAccountName: ""
@@ -260,7 +268,7 @@ servicejobs:
 
 migrations:
   repository: reportportal/migrations
-  tag: 5.9.0
+  tag: 5.10.0
   pullPolicy: Always
   resources:
     requests:
@@ -272,9 +280,9 @@ migrations:
   podLabels: {}
   podAnnotations: {}
   securityContext: {}
+  ##
   ## Define which Nodes the Pods are scheduled on.
   ## ref: https://kubernetes.io/docs/user-guide/node-selection/
-  ##
   nodeSelector: {}
   #  disktype: ssd
   serviceAccountName: ""
@@ -286,7 +294,7 @@ migrations:
 
 serviceanalyzer:
   repository: reportportal/service-auto-analyzer
-  tag: 5.7.6
+  tag: 5.10.0
   name: analyzer
   pullPolicy: Always
   uwsgiWorkers: 2
@@ -300,8 +308,8 @@ serviceanalyzer:
   podLabels: {}
   podAnnotations: {}
   securityContext: {}
-  ## External environment variables
   ##
+  ## External environment variables
   extraEnvs: []
     # - name: EXTRA_ENV
     #   value: "TRUE"
@@ -331,8 +339,8 @@ serviceanalyzertrain:
   podLabels: {}
   podAnnotations: {}
   securityContext: {}
-  ## External environment variables
   ##
+  ## External environment variables
   extraEnvs: []
     # - name: EXTRA_ENV
     #   value: "TRUE"
@@ -341,9 +349,9 @@ serviceanalyzertrain:
     #     secretKeyRef:
     #       name: "additional-credentials"
     #       key: username
+  ##
   ## Define which Nodes the Pods are scheduled on.
   ## ref: https://kubernetes.io/docs/user-guide/node-selection/
-  ##
   nodeSelector: {}
   #  disktype: ssd
   serviceAccountName: ""
@@ -352,7 +360,7 @@ serviceanalyzertrain:
 
 metricsgatherer:
   repository: reportportal/service-metrics-gatherer
-  tag: 5.7.5
+  tag: 5.10.0
   name: metrics-gatherer
   loggingLevel: debug
   timeManagement:
@@ -370,8 +378,8 @@ metricsgatherer:
   podLabels: {}
   podAnnotations: {}
   securityContext: {}
-  ## External environment variables
   ##
+  ## External environment variables
   extraEnvs: []
     # - name: EXTRA_ENV
     #   value: "TRUE"
@@ -426,14 +434,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
+    enable: false
   endpoint: http://elasticsearch-master.default.svc.cluster.local:9200
   user: elastic
   password: