Merge pull request #320 from reportportal/develop

Release 23.1.1
reportportal · Aug 18, 2023 · 6805f9f · 6805f9f
2 parents 66db8de + 2bc8a08
commit 6805f9f
Show file tree

Hide file tree

Showing 11 changed files with 256 additions and 166 deletions.
diff --git a/reportportal/Chart.yaml b/reportportal/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "23.1"
+appVersion: "23.1.1"
 description: ReportPortal.io AI-powered Test Automation Dashboard
 name: reportportal
-version: 5.8.0
+version: 5.8.1
 sources:
   - https://github.com/reportportal/kubernetes
 keywords:
@@ -29,4 +29,4 @@ dependencies:
   - name: minio
     version: 7.1.9
     repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
-    condition: minio.installdep.enable
+    condition: storage.installdep.enable
diff --git a/reportportal/templates/analyzer-statefulset.yaml b/reportportal/templates/analyzer-statefulset.yaml
@@ -21,6 +21,10 @@ spec:
         {{ $key }}: {{ $value | quote }}
         {{- end }}
     spec:
+      {{- with .Values.rp.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       initContainers:
       {{- if .Values.extraInitContainers }}
 {{ toYaml .Values.extraInitContainers | indent 8 }}
@@ -30,29 +34,34 @@ spec:
 {{- if .Values.serviceanalyzer.extraEnvs }}
 {{ toYaml .Values.serviceanalyzer.extraEnvs | indent 8 }}
 {{- end }}
-      {{- if .Values.minio.enabled }}
+        {{- if eq .Values.storage.type "minio"}}
         - name: ANALYZER_BINARYSTORE_TYPE
           value: "minio"
+        - name: ANALYZER_BINARYSTORE_BUCKETPREFIX
+          value: "{{ .Values.storage.bucket.bucketMultiPrefix }}"
         - name: MINIO_SHORT_HOST
-          value: "{{ .Values.minio.endpointshort }}"
-        {{- if .Values.minio.secretName }}
+          value: "{{ .Values.storage.endpointshort }}"
+        {{- if .Values.storage.secretName }}
         - name: MINIO_ACCESS_KEY
           valueFrom:
             secretKeyRef:
-              name: "{{ .Values.minio.secretName }}"
-              key: "{{ .Values.minio.accesskeyName }}"
+              name: "{{ .Values.storage.secretName }}"
+              key: "{{ .Values.storage.accesskeyName }}"
         - name: MINIO_SECRET_KEY
           valueFrom:
             secretKeyRef:
-              name: "{{ .Values.minio.secretName }}"
-              key: "{{ .Values.minio.secretkeyName }}"
-       {{- else }}
+              name: "{{ .Values.storage.secretName }}"
+              key: "{{ .Values.storage.secretkeyName }}"
+        {{- else }}
         - name: MINIO_ACCESS_KEY
-          value: "{{ .Values.minio.accesskey }}"
+          value: "{{ .Values.storage.accesskey }}"
         - name: MINIO_SECRET_KEY
-          value: "{{ .Values.minio.secretkey }}"
-       {{- end }}
-       {{- end }}
+          value: "{{ .Values.storage.secretkey }}"
+        {{- end }}
+        {{- else }}
+        - name: ANALYZER_BINARYSTORE_TYPE
+          value: "filesystem"
+        {{- end }}
         - name: RP_AMQP_PASS
         {{- if .Values.rabbitmq.SecretName }}
           valueFrom:

diff --git a/reportportal/templates/analyzertrain-statefulset.yaml b/reportportal/templates/analyzertrain-statefulset.yaml
@@ -21,6 +21,10 @@ spec:
         {{ $key }}: {{ $value | quote }}
         {{- end }}
     spec:
+      {{- with .Values.rp.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       initContainers:
       {{- if .Values.extraInitContainers }}
 {{ toYaml .Values.extraInitContainers | indent 8 }}
@@ -30,33 +34,38 @@ spec:
 {{- if .Values.serviceanalyzertrain.extraEnvs }}
 {{ toYaml .Values.serviceanalyzertrain.extraEnvs | indent 8 }}
 {{- end }}
-        - name: INSTANCE_TASK_TYPE
-          value: "train"
-        - name: UWSGI_WORKERS
-          value: "1"
-        {{- if .Values.minio.enabled }}
+        {{- if eq .Values.storage.type "minio"}}
         - name: ANALYZER_BINARYSTORE_TYPE
           value: "minio"
+        - name: ANALYZER_BINARYSTORE_BUCKETPREFIX
+          value: "{{ .Values.storage.bucket.bucketMultiPrefix }}"
         - name: MINIO_SHORT_HOST
-          value: "{{ .Values.minio.endpointshort }}"
-        {{- if .Values.minio.secretName }}
+          value: "{{ .Values.storage.endpointshort }}"
+        {{- if .Values.storage.secretName }}
         - name: MINIO_ACCESS_KEY
           valueFrom:
             secretKeyRef:
-              name: "{{ .Values.minio.secretName }}"
-              key: "{{ .Values.minio.accesskeyName }}"
+              name: "{{ .Values.storage.secretName }}"
+              key: "{{ .Values.storage.accesskeyName }}"
         - name: MINIO_SECRET_KEY
           valueFrom:
             secretKeyRef:
-              name: "{{ .Values.minio.secretName }}"
-              key: "{{ .Values.minio.secretkeyName }}"
-       {{- else }}
+              name: "{{ .Values.storage.secretName }}"
+              key: "{{ .Values.storage.secretkeyName }}"
+        {{- else }}
         - name: MINIO_ACCESS_KEY
-          value: "{{ .Values.minio.accesskey }}"
+          value: "{{ .Values.storage.accesskey }}"
         - name: MINIO_SECRET_KEY
-          value: "{{ .Values.minio.secretkey }}"
-       {{- end }}
-       {{- end }}
+          value: "{{ .Values.storage.secretkey }}"
+        {{- end }}
+        {{- else }}
+        - name: ANALYZER_BINARYSTORE_TYPE
+          value: "filesystem"
+        {{- end }}
+        - name: INSTANCE_TASK_TYPE
+          value: "train"
+        - name: UWSGI_WORKERS
+          value: "1"
         - name: RP_AMQP_PASS
         {{- if .Values.rabbitmq.SecretName }}
           valueFrom:

diff --git a/reportportal/templates/api-deployment.yaml b/reportportal/templates/api-deployment.yaml
@@ -20,6 +20,10 @@ spec:
         {{ $key }}: {{ $value | quote }}
         {{- end }}
     spec:
+      {{- with .Values.rp.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       initContainers:
       {{- if .Values.extraInitContainers }}
 {{ toYaml .Values.extraInitContainers | indent 8 }}
@@ -88,45 +92,47 @@ spec:
         {{- else }}
           value: "{{ .Values.postgresql.endpoint.password }}"
         {{- end }}
-        {{- if .Values.minio.enabled }}
-        - name: RP_BINARYSTORE_TYPE
-          value: "{{ .Values.minio.type }}"
-        - name: RP_BINARYSTORE_MINIO_ENDPOINT
-          value: "{{ .Values.minio.endpoint }}"
-        {{- if .Values.minio.region }}
-        - name: RP_BINARYSTORE_MINIO_REGION
-          value: "{{ .Values.minio.region }}"
-        {{- end }}
-        {{- if .Values.minio.secretName }}
-        - name: RP_BINARYSTORE_MINIO_ACCESSKEY
+        {{- if eq .Values.storage.bucket.type "single" }}
+        - name: RP_FEATURE_FLAGS
+          value: "singleBucket"
+        {{- end }}
+        - name: DATASTORE_TYPE
+          value: "{{ .Values.storage.type }}"
+        {{- if eq .Values.storage.type "minio" }}
+        - name: DATASTORE_ENDPOINT
+          value: "{{ .Values.storage.endpoint }}"
+        {{- end }}
+        {{- if .Values.storage.region }}
+        - name: DATASTORE_REGION
+          value: "{{ .Values.storage.region }}"
+        {{- end }}
+        {{- if .Values.storage.secretName }}
+        - name: DATASTORE_ACCESSKEY
           valueFrom:
             secretKeyRef:
-              name: "{{ .Values.minio.secretName }}"
-              key: "{{ .Values.minio.accesskeyName }}"
-        - name: RP_BINARYSTORE_MINIO_SECRETKEY
+              name: "{{ .Values.storage.secretName }}"
+              key: "{{ .Values.storage.accesskeyName }}"
+        - name: DATASTORE_SECRETKEY
           valueFrom:
             secretKeyRef:
-              name: "{{ .Values.minio.secretName }}"
-              key: "{{ .Values.minio.secretkeyName }}"
+              name: "{{ .Values.storage.secretName }}"
+              key: "{{ .Values.storage.secretkeyName }}"
        {{- else }}
-        - name: RP_BINARYSTORE_MINIO_ACCESSKEY
-          value: "{{ .Values.minio.accesskey }}"
-        - name: RP_BINARYSTORE_MINIO_SECRETKEY
-          value: "{{ .Values.minio.secretkey }}"
+        - name: DATASTORE_ACCESSKEY
+          value: "{{ .Values.storage.accesskey }}"
+        - name: DATASTORE_SECRETKEY
+          value: "{{ .Values.storage.secretkey }}"
        {{- end }}
-       {{- if .Values.minio.bucketPrefix }}
-        - name: RP_BINARYSTORE_MINIO_BUCKETPREFIX
-          value: "{{ .Values.minio.bucketPrefix }}"
-       {{- end }}
-       {{- if .Values.minio.defaultBucketName }}
-        - name: RP_BINARYSTORE_MINIO_DEFAULTBUCKETNAME
-          value: "{{ .Values.minio.defaultBucketName }}"
-       {{- end }}
-       {{- if .Values.minio.integrationSaltPath }}
+       {{- if eq .Values.storage.bucket.type "multi" }}
+        - name: DATASTORE_BUCKETPREFIX
+          value: "{{ .Values.storage.bucket.bucketMultiPrefix }}"
+        - name: DATASTORE_BUCKETPOSTFIX
+          value: "{{ .Values.storage.bucket.bucketMultiPostfix }}"
         - name: RP_INTEGRATION_SALT_PATH
-          value: "{{ .Values.minio.integrationSaltPath }}"
-       {{- end }}
+          value: "{{ .Values.storage.bucket.bucketMultiSaltName }}"
        {{- end }}
+        - name: DATASTORE_DEFAULTBUCKETNAME
+          value: "{{ .Values.storage.bucket.bucketDefaultName }}"
         - name: MANAGEMENT_HEALTH_ELASTICSEARCH_ENABLED
           value: "false"
         image: "{{ .Values.serviceapi.repository }}:{{ .Values.serviceapi.tag }}"
@@ -165,6 +171,12 @@ spec:
           failureThreshold: {{ .Values.serviceapi.livenessProbe.failureThreshold | default 5 }}
         {{- end }}
         {{- end }}
+        volumeMounts:
+          {{- if .Values.serviceapi.secret.enabled }}
+          - mountPath: {{ .Values.serviceapi.secret.mountPath }}
+            name: {{ template "reportportal.name" . }}-serviceapi-secret
+            readOnly: {{ .Values.serviceapi.secret.readOnly }}
+          {{- end }}
 {{- if .Values.serviceapi.nodeSelector }}
       nodeSelector:
         {{- range $key, $value := .Values.serviceapi.nodeSelector }}
@@ -178,3 +190,9 @@ spec:
       tolerations:
 {{- toYaml . | nindent 8 }}
 {{- end }}
+      volumes:
+        {{- if .Values.serviceapi.secret.enabled }}
+        - name: {{ template "reportportal.name" . }}-serviceapi-secret
+          secret:
+            secretName: {{ template "reportportal.name" . }}-serviceapi-secret
+        {{- end }}
diff --git a/reportportal/templates/api-secret.yaml b/reportportal/templates/api-secret.yaml
@@ -0,0 +1,14 @@
+{{- if and .Values.serviceapi.secret.enabled .Values.serviceapi.secret.data -}}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "reportportal.name" . }}-serviceapi-secret
+  namespace: {{ .Release.Namespace }}
+  labels:
+{{ include "labels" . | indent 4 }}
+{{- if .Values.serviceapi.podLabels }}
+{{ toYaml .Values.serviceapi.podLabels | indent 4 }}
+{{- end }}
+data:
+{{ toYaml .Values.serviceapi.secret.data | indent 2 }}
+{{- end}}
diff --git a/reportportal/templates/index-deployment.yaml b/reportportal/templates/index-deployment.yaml
@@ -20,6 +20,10 @@ spec:
         {{ $key }}: {{ $value | quote }}
         {{- end }}
     spec:
+      {{- with .Values.rp.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       initContainers:
       {{- if .Values.extraInitContainers }}
 {{ toYaml .Values.extraInitContainers | indent 8 }}

diff --git a/reportportal/templates/jobs-deployment.yaml b/reportportal/templates/jobs-deployment.yaml
@@ -20,6 +20,10 @@ spec:
         {{ $key }}: {{ $value | quote }}
         {{- end }}
     spec:
+      {{- with .Values.rp.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       initContainers:
       {{- if .Values.extraInitContainers }}
 {{ toYaml .Values.extraInitContainers | indent 8 }}
@@ -102,41 +106,47 @@ spec:
         {{- else }}
           value: "{{ .Values.postgresql.endpoint.password }}"
         {{- end }}
-        {{- if .Values.minio.enabled }}
-        - name: DATASTORE_TYPE
-          value: "{{ .Values.minio.type }}"
-        - name: DATASTORE_MINIO_ENDPOINT
-          value: "{{ .Values.minio.endpoint }}"
-        {{- if .Values.minio.bucketPrefix }}
-        - name: DATASTORE_S3_BUCKETPREFIX
-          value: "{{ .Values.minio.bucketPrefix }}"
+        {{- if eq .Values.storage.bucket.type "single" }}
+        - name: RP_FEATURE_FLAGS
+          value: "singleBucket"
         {{- end }}
-        {{- if .Values.minio.defaultBucketName }}
-        - name: RP_BINARYSTORE_MINIO_DEFAULTBUCKETNAME
-          value: "{{ .Values.minio.defaultBucketName }}"
+        - name: DATASTORE_TYPE
+          value: "{{ .Values.storage.type }}"
+        {{- if eq .Values.storage.type "minio" }}
+        - name: DATASTORE_ENDPOINT
+          value: "{{ .Values.storage.endpoint }}"
         {{- end }}
-        {{- if .Values.minio.region }}
-        - name: DATASTORE_MINIO_REGION
-          value: "{{ .Values.minio.region }}"
+        {{- if .Values.storage.region }}
+        - name: DATASTORE_REGION
+          value: "{{ .Values.storage.region }}"
         {{- end }}
-        {{- if .Values.minio.secretName }}
-        - name: DATASTORE_MINIO_ACCESSKEY
+        {{- if .Values.storage.secretName }}
+        - name: DATASTORE_ACCESSKEY
           valueFrom:
             secretKeyRef:
-              name: "{{ .Values.minio.secretName }}"
-              key: "{{ .Values.minio.accesskeyName }}"
-        - name: DATASTORE_MINIO_SECRETKEY
+              name: "{{ .Values.storage.secretName }}"
+              key: "{{ .Values.storage.accesskeyName }}"
+        - name: DATASTORE_SECRETKEY
           valueFrom:
             secretKeyRef:
-              name: "{{ .Values.minio.secretName }}"
-              key: "{{ .Values.minio.secretkeyName }}"
+              name: "{{ .Values.storage.secretName }}"
+              key: "{{ .Values.storage.secretkeyName }}"
        {{- else }}
-        - name: DATASTORE_MINIO_ACCESSKEY
-          value: "{{ .Values.minio.accesskey }}"
-        - name: DATASTORE_MINIO_SECRETKEY
-          value: "{{ .Values.minio.secretkey }}"
+        - name: DATASTORE_ACCESSKEY
+          value: "{{ .Values.storage.accesskey }}"
+        - name: DATASTORE_SECRETKEY
+          value: "{{ .Values.storage.secretkey }}"
        {{- end }}
+       {{- if eq .Values.storage.bucket.type "multi" }}
+        - name: DATASTORE_BUCKETPREFIX
+          value: "{{ .Values.storage.bucket.bucketMultiPrefix }}"
+        - name: DATASTORE_BUCKETPOSTFIX
+          value: "{{ .Values.storage.bucket.bucketMultiPostfix }}"
+        - name: RP_INTEGRATION_SALT_PATH
+          value: "{{ .Values.storage.bucket.bucketMultiSaltName }}"
        {{- end }}
+        - name: DATASTORE_DEFAULTBUCKETNAME
+          value: "{{ .Values.storage.bucket.bucketDefaultName }}"
         - name: RP_PROCESSING_LOG_MAXBATCHSIZE
           value: "{{ .Values.servicejobs.logProcessing.maxBatchSize }}"
         - name: RP_PROCESSING_LOG_MAXBATCHTIMEOUT

diff --git a/reportportal/templates/metrics-gatherer-deployment.yaml b/reportportal/templates/metrics-gatherer-deployment.yaml
@@ -20,6 +20,10 @@ spec:
         {{ $key }}: {{ $value | quote }}
         {{- end }}
     spec:
+      {{- with .Values.rp.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       initContainers:
       {{- if .Values.extraInitContainers }}
 {{ toYaml .Values.extraInitContainers | indent 8 }}