Merge pull request #307 from reportportal/develop

Release
reportportal · May 29, 2023 · 66db8de · 66db8de
2 parents 1ca8de6 + 7f6c3aa
commit 66db8de
Show file tree

Hide file tree

Showing 14 changed files with 105 additions and 35 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # [ReportPortal.io](http://ReportPortal.io)
 
-[![Join Slack chat!](https://reportportal-slack-auto.herokuapp.com/badge.svg)](https://reportportal-slack-auto.herokuapp.com)
+[![Join Slack chat!](https://slack.epmrpp.reportportal.io/badge.svg)](https://slack.epmrpp.reportportal.io/)
 [![stackoverflow](https://img.shields.io/badge/reportportal-stackoverflow-orange.svg?style=flat)](http://stackoverflow.com/questions/tagged/reportportal)
 [![GitHub contributors](https://img.shields.io/badge/contributors-102-blue.svg)](https://reportportal.io/community)
 [![Docker Pulls](https://img.shields.io/docker/pulls/reportportal/service-api.svg?maxAge=25920)](https://hub.docker.com/u/reportportal/)

diff --git a/reportportal/Chart.yaml b/reportportal/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "5.7.4"
+appVersion: "23.1"
 description: ReportPortal.io AI-powered Test Automation Dashboard
 name: reportportal
-version: 5.7.4
+version: 5.8.0
 sources:
   - https://github.com/reportportal/kubernetes
 keywords:

diff --git a/reportportal/templates/NOTES.txt b/reportportal/templates/NOTES.txt
@@ -1,2 +1,14 @@
+###
+CHART NAME: {{ .Chart.Name }}
+CHART VERSION: {{ .Chart.Version }}
+APP VERSION: {{ .Chart.AppVersion }}
+
 ReportPortal is now available at:
 {{ toYaml .Values.ingress.hosts | indent 4 }}
+
+{{- if .Values.uat.superadminInitPasswd.auto }}
+The initial password for superadmin user on FIRST launch:
+echo "$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "reportportal.name" . }}-superadmin-passwd -o jsonpath="{.data.superadmin-passwd}" | base64 -d)"
+
+If the password was changed from the UI, this value can't change the password on redeployments.
+{{- end}}
diff --git a/reportportal/templates/analyzer-service.yaml b/reportportal/templates/analyzer-service.yaml
@@ -8,7 +8,7 @@ spec:
   - name: {{ $.Values.serviceanalyzer.service.portName | default "headless" }}
     port: 8080
     protocol: TCP
-    targetPort: 8080
+    targetPort: analyzercore
   selector:
     component: {{ include "reportportal.fullname" . }}-analyzer
-  type: ClusterIP
+  type: ClusterIP
diff --git a/reportportal/templates/analyzer-statefulset.yaml b/reportportal/templates/analyzer-statefulset.yaml
@@ -94,8 +94,8 @@ spec:
         image: "{{ .Values.serviceanalyzer.repository }}:{{ .Values.serviceanalyzer.tag }}"
         name: analyzer
         ports:
-        - containerPort: 8080
-          protocol: TCP
+        - containerPort: 5001
+          name: analyzercore
         resources:
           requests:
             cpu: {{ .Values.serviceanalyzer.resources.requests.cpu }}
@@ -115,4 +115,4 @@ spec:
 {{- with .Values.tolerations }}
       tolerations: 
 {{- toYaml . | nindent 8 }}
-{{- end }}
+{{- end }}
diff --git a/reportportal/templates/analyzertrain-service.yaml b/reportportal/templates/analyzertrain-service.yaml
@@ -8,7 +8,7 @@ spec:
   - name: {{ $.Values.serviceanalyzertrain.service.portName | default "headless" }}
     port: 5000
     protocol: TCP
-    targetPort: 5000
+    targetPort: analyzertrain
   selector:
     component: {{ include "reportportal.fullname" . }}-analyzer-train
   type: ClusterIP
diff --git a/reportportal/templates/analyzertrain-statefulset.yaml b/reportportal/templates/analyzertrain-statefulset.yaml
@@ -94,8 +94,8 @@ spec:
         image: "{{ .Values.serviceanalyzer.repository }}:{{ .Values.serviceanalyzer.tag }}"
         name: analyzer
         ports:
-        - containerPort: 5000
-          protocol: TCP
+        - containerPort: 5001
+          name: analyzertrain
         resources:
           requests:
             cpu: {{ .Values.serviceanalyzertrain.resources.requests.cpu }}
@@ -115,4 +115,4 @@ spec:
 {{- with .Values.tolerations }}
       tolerations:
 {{- toYaml . | nindent 8 }}
-{{- end }}
+{{- end }}
diff --git a/reportportal/templates/api-deployment.yaml b/reportportal/templates/api-deployment.yaml
@@ -90,7 +90,7 @@ spec:
         {{- end }}
         {{- if .Values.minio.enabled }}
         - name: RP_BINARYSTORE_TYPE
-          value: "minio"
+          value: "{{ .Values.minio.type }}"
         - name: RP_BINARYSTORE_MINIO_ENDPOINT
           value: "{{ .Values.minio.endpoint }}"
         {{- if .Values.minio.region }}

diff --git a/reportportal/templates/jobs-deployment.yaml b/reportportal/templates/jobs-deployment.yaml
@@ -32,11 +32,24 @@ spec:
         {{- if .Values.elasticsearch.doubleEntry.enable }}
         - name: RP_ELASTICSEARCH_HOST
           value: "{{ .Values.elasticsearch.endpoint }}"
+        {{- if .Values.elasticsearch.secretName }}
+        - name: RP_ELASTICSEARCH_USERNAME
+          valueFrom:
+            secretKeyRef:
+              name: "{{ .Values.elasticsearch.secretName }}"
+              key: "username"
+        - name: RP_ELASTICSEARCH_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: "{{ .Values.elasticsearch.secretName }}"
+              key: "password"
+        {{- else }}
         - name: RP_ELASTICSEARCH_USERNAME
           value: "{{ .Values.elasticsearch.user }}"
         - name: RP_ELASTICSEARCH_PASSWORD
           value: "{{ .Values.elasticsearch.password }}"
         {{- end}}
+        {{- end}}
         - name: RP_ENVIRONMENT_VARIABLE_CLEAN_ATTACHMENT_CRON
           value: "{{ .Values.servicejobs.coreJobs.cleanAttachmentCron }}"
         - name: RP_ENVIRONMENT_VARIABLE_CLEAN_LOG_CRON
@@ -91,11 +104,11 @@ spec:
         {{- end }}
         {{- if .Values.minio.enabled }}
         - name: DATASTORE_TYPE
-          value: "minio"
+          value: "{{ .Values.minio.type }}"
         - name: DATASTORE_MINIO_ENDPOINT
           value: "{{ .Values.minio.endpoint }}"
         {{- if .Values.minio.bucketPrefix }}
-        - name: RP_BINARYSTORE_MINIO_BUCKETPREFIX
+        - name: DATASTORE_S3_BUCKETPREFIX
           value: "{{ .Values.minio.bucketPrefix }}"
         {{- end }}
         {{- if .Values.minio.defaultBucketName }}
@@ -125,9 +138,9 @@ spec:
        {{- end }}
        {{- end }}
         - name: RP_PROCESSING_LOG_MAXBATCHSIZE
-          value: "2000"
+          value: "{{ .Values.servicejobs.logProcessing.maxBatchSize }}"
         - name: RP_PROCESSING_LOG_MAXBATCHTIMEOUT
-          value: "6000"
+          value: "{{ .Values.servicejobs.logProcessing.maxBatchTimeout }}"
         - name: RP_AMQP_MAXLOGCONSUMER
           value: "1"
         image: "{{ .Values.servicejobs.repository }}:{{ .Values.servicejobs.tag }}"

diff --git a/reportportal/templates/metrics-gatherer-deployment.yaml b/reportportal/templates/metrics-gatherer-deployment.yaml
@@ -91,8 +91,8 @@ spec:
         image: "{{ .Values.metricsgatherer.repository }}:{{ .Values.metricsgatherer.tag }}"
         name: metrics-gatherer
         ports:
-        - containerPort: 3000
-          protocol: TCP
+        - containerPort: 5000
+          name: metricsgatherer
         resources:
           requests:
             cpu: {{ .Values.metricsgatherer.resources.requests.cpu }}
@@ -112,4 +112,4 @@ spec:
 {{- with .Values.tolerations }}
       tolerations: 
 {{- toYaml . | nindent 8 }}
-{{- end }}
+{{- end }}
diff --git a/reportportal/templates/metrics-gatherer-service.yaml b/reportportal/templates/metrics-gatherer-service.yaml
@@ -11,8 +11,8 @@ spec:
   - name: {{ $.Values.metricsgatherer.service.portName | default "headless" }}
     port: 8585
     protocol: TCP
-    targetPort: 8585
+    targetPort: metricsgatherer
   selector:
     component: {{ include "reportportal.fullname" . }}-metrics-gatherer
   type: ClusterIP
-
+
diff --git a/reportportal/templates/uat-deployment.yaml b/reportportal/templates/uat-deployment.yaml
@@ -29,6 +29,18 @@ spec:
 {{- if .Values.uat.extraEnvs }}
 {{ toYaml .Values.uat.extraEnvs | indent 8 }}
 {{- end }}
+        {{- if .Values.uat.superadminInitPasswd.auto }}
+        - name: RP_INITIAL_ADMIN_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: "{{ template "reportportal.name" . }}-superadmin-passwd"
+              key: "superadmin-passwd"
+        {{ else }}
+        - name: RP_INITIAL_ADMIN_PASSWORD
+          value: "{{ .Values.uat.superadminInitPasswd.password }}"
+        {{- end }}
+        - name: RP_SAML_SESSION-LIVE
+          value: "{{ .Values.uat.samlSessionLiveTime }}"
         {{- if .Values.uat.jvmArgs }}
         - name: JAVA_OPTS
           value: "{{ .Values.uat.jvmArgs }}"
@@ -54,7 +66,7 @@ spec:
         {{- end }}
         {{- if .Values.minio.enabled }}
         - name: RP_BINARYSTORE_TYPE
-          value: "minio"
+          value: "{{ .Values.minio.type }}"
         - name: RP_BINARYSTORE_MINIO_ENDPOINT
           value: "{{ .Values.minio.endpoint }}"
         {{- if .Values.minio.region }}

diff --git a/reportportal/templates/uat-secret.yaml b/reportportal/templates/uat-secret.yaml
@@ -6,9 +6,28 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
 {{ include "labels" . | indent 4 }}
-{{- if .Values.labels }}
-{{ toYaml .Values.labels | indent 4 }}
+{{- if .Values.uat.podLabels }}
+{{ toYaml .Values.uat.podLabels | indent 4 }}
 {{- end }}
 data:
 {{ toYaml .Values.uat.secret.data | indent 2 }}
 {{- end}}
+---
+{{- if .Values.uat.superadminInitPasswd.auto }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "reportportal.name" . }}-superadmin-passwd
+  namespace: {{ .Release.Namespace }}
+  labels:
+{{ include "labels" . | indent 4 }}
+{{- if .Values.uat.podLabels }}
+{{ toYaml .Values.uat.podLabels | indent 4 }}
+{{- end }}
+data:
+  {{- if .Release.IsInstall }}
+  superadmin-passwd: {{ randAlphaNum 20 | b64enc }}
+  {{ else }}
+  superadmin-passwd: {{ index (lookup "v1" "Secret" .Release.Namespace "{{ template reportportal.name . }}-superadmin-passwd").data "superadmin-passwd" }}
+  {{ end }}
+{{ end }}
diff --git a/reportportal/values.yaml b/reportportal/values.yaml
@@ -7,9 +7,9 @@
 # fullnameOverride:
 
 serviceindex:
-  name: index
   repository: reportportal/service-index
-  tag: 5.7.3
+  tag: 5.8.0
+  name: index
   pullPolicy: Always
   resources:
     requests:
@@ -31,8 +31,8 @@ serviceindex:
 
 uat:
   repository: reportportal/service-authorization
+  tag: 5.8.0
   name: uat
-  tag: 5.7.4
   pullPolicy: Always
   readinessProbe:
     enabled: true
@@ -54,6 +54,14 @@ uat:
       cpu: 500m
       memory: 2048Mi
   sessionLiveTime: 86400
+  samlSessionLiveTime: 4320
+  ## The initial password for superadmin user on FIRST launch. If the password was changed from the UI, 
+  ## this value can't change the password on redeployments.
+  superadminInitPasswd:
+    ## If 'true', the secret will be generated from 20 random characters.
+    auto: true
+    ## Specify if auto = false
+    password: ""
   podLabels: {}
   podAnnotations: {}
   ## jvmArgs
@@ -97,7 +105,7 @@ uat:
 
 serviceui:
   repository: reportportal/service-ui
-  tag: 5.7.4
+  tag: 5.8.0
   name: ui
   pullPolicy: Always
   resources:
@@ -121,7 +129,7 @@ serviceui:
 
 serviceapi:
   repository: reportportal/service-api
-  tag: 5.7.4
+  tag: 5.8.0
   name: api
   pullPolicy: Always
   replicaCount: 1
@@ -175,7 +183,7 @@ serviceapi:
 
 servicejobs:
   repository: reportportal/service-jobs
-  tag: 5.7.4
+  tag: 5.8.0
   name: jobs
   pullPolicy: Always
   readinessProbe:
@@ -197,6 +205,11 @@ servicejobs:
     cleanStorageCron: 0 0 */24 * * *
     storageProjectCron: 0 */5 * * * *
   chunksize: 1000
+  ## Used for Double Entry. Ref: https://reportportal.io/blog/double-entry-in-5.7.2
+  ## Processing logs by Jobs service (log per ms).
+  logProcessing:
+    maxBatchSize: 2000
+    maxBatchTimeout: 6000
   resources:
     requests:
       cpu: 100m
@@ -229,7 +242,7 @@ servicejobs:
 
 migrations:
   repository: reportportal/migrations
-  tag: 5.7.3
+  tag: 5.8.0
   pullPolicy: Always
   resources:
     requests:
@@ -255,7 +268,7 @@ migrations:
 
 serviceanalyzer:
   repository: reportportal/service-auto-analyzer
-  tag: 5.7.4
+  tag: 5.7.5
   name: analyzer
   pullPolicy: Always
   uwsgiWorkers: 2
@@ -321,7 +334,7 @@ serviceanalyzertrain:
 
 metricsgatherer:
   repository: reportportal/service-metrics-gatherer
-  tag: 5.7.3
+  tag: 5.7.4
   name: metrics-gatherer
   loggingLevel: debug
   timeManagement:
@@ -408,8 +421,9 @@ elasticsearch:
   password:
 
 minio:
-  secretName: ""
   enabled: true
+  type: minio
+  secretName: ""
   installdep:
     enable: false
   endpoint: http://<minio-release-name>-minio.default.svc.cluster.local:9000