Merge branch 'develop' into feature/add-affinity-support

reportportal · Nov 14, 2024 · 8e882e2 · 8e882e2
2 parents b31c7ad + b0171c9
commit 8e882e2
Show file tree

Hide file tree

Showing 10 changed files with 172 additions and 50 deletions.
diff --git a/reportportal/Chart.yaml b/reportportal/Chart.yaml
@@ -4,7 +4,7 @@ description: |
   ReportPortal.io is a TestOps service, that provides increased capabilities
   to speed up results analysis and reporting through the use of built-in analytic features.
 name: reportportal
-version: 24.2.0
+version: 24.2.1
 sources:
   - https://github.com/reportportal/kubernetes/tree/master/reportportal
 keywords:

diff --git a/reportportal/templates/service-api/api-deployment.yaml b/reportportal/templates/service-api/api-deployment.yaml
@@ -53,8 +53,8 @@ spec:
             limits:
               cpu: 50m
               memory: 100Mi
-      {{- if .Values.extraInitContainers }}
-        {{ toYaml .Values.extraInitContainers | nindent 8 }}
+      {{- if .Values.serviceapi.extraInitContainers }}
+        {{ toYaml .Values.serviceapi.extraInitContainers | nindent 8 }}
       {{- end }}
       containers:
         - name: "{{ $.Values.serviceapi.name | default "api" }}"
@@ -222,6 +222,9 @@ spec:
             - name: shared-volume
               mountPath: /data/storage
           {{- end }}
+          {{- if .Values.serviceapi.extraVolumeMounts }}
+            {{ toYaml .Values.serviceapi.extraVolumeMounts | nindent 12 }}
+          {{- end }}
       {{- if .Values.serviceapi.auditLogs.enable }}
         - name: auditlogstreamer
           image: "{{ if .Values.global.imageRegistry }}{{ .Values.global.imageRegistry }}/{{ .Values.serviceapi.auditLogs.sidecar.image.repository }}:{{ .Values.serviceapi.auditLogs.sidecar.image.tag }}{{ else }}{{ .Values.serviceapi.auditLogs.sidecar.image.repository }}:{{ .Values.serviceapi.auditLogs.sidecar.image.tag }}{{ end }}"
@@ -264,4 +267,7 @@ spec:
         - name: shared-volume
           persistentVolumeClaim:
             claimName: {{ .Release.Name }}-shared-volume-claim
+      {{- end }}
+      {{- if .Values.serviceapi.extraVolumes }}
+        {{ toYaml .Values.serviceapi.extraVolumes | nindent 8 }}
       {{- end }}
diff --git a/reportportal/templates/service-authorization/uat-deployment.yaml b/reportportal/templates/service-authorization/uat-deployment.yaml
@@ -54,8 +54,8 @@ spec:
             limits:
               cpu: 50m
               memory: 100Mi
-      {{- if .Values.extraInitContainers }}
-        {{ toYaml .Values.extraInitContainers | nindent 8 }}
+      {{- if .Values.uat.extraInitContainers }}
+        {{ toYaml .Values.uat.extraInitContainers | nindent 8 }}
       {{- end }}
       containers:
         - name: "{{ $.Values.uat.name | default "uat" }}"
@@ -198,6 +198,9 @@ spec:
             - name: shared-volume
               mountPath: /data/storage
           {{- end }}
+          {{- if .Values.uat.extraVolumeMounts }}
+            {{ toYaml .Values.uat.extraVolumeMounts | nindent 12 }}
+          {{- end }}
     {{- if .Values.uat.nodeSelector }}
       nodeSelector:
         {{- range $key, $value := .Values.uat.nodeSelector }}
@@ -221,4 +224,7 @@ spec:
         - name: shared-volume
           persistentVolumeClaim:
             claimName: {{ .Release.Name }}-shared-volume-claim
+      {{- end }}
+      {{- if .Values.uat.extraVolumes }}
+        {{ toYaml .Values.serviceapi.extraVolumes | nindent 8 }}
       {{- end }}
diff --git a/reportportal/templates/service-index/index-deployment.yaml b/reportportal/templates/service-index/index-deployment.yaml
@@ -31,8 +31,8 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       initContainers:
-      {{- if .Values.extraInitContainers }}
-{{ toYaml .Values.extraInitContainers | indent 8 }}
+      {{- if .Values.serviceindex.extraInitContainers }}
+        {{ toYaml .Values.serviceindex.extraInitContainers | nindent 8 }}
       {{- end }}
       serviceAccountName: {{ .Values.serviceindex.serviceAccountName | default (include "reportportal.serviceAccountName" .) }}
       containers:

diff --git a/reportportal/templates/service-jobs/jobs-deployment.yaml b/reportportal/templates/service-jobs/jobs-deployment.yaml
@@ -42,9 +42,9 @@ spec:
           limits:
             cpu: 50m
             memory: 100Mi
-{{- if .Values.extraInitContainers }}
-{{ toYaml .Values.extraInitContainers | indent 8 }}
-{{- end }}
+      {{- if .Values.servicejobs.extraInitContainers }}
+        {{ toYaml .Values.servicejobs.extraInitContainers | nindent 8 }}
+      {{- end }}
       containers:
       - name: "{{ $.Values.servicejobs.name | default "jobs" }}"
         image: "{{ include "reportportal.image" (dict "Values" .Values "service" "servicejobs") }}"
@@ -194,6 +194,9 @@ spec:
           - name: shared-volume
             mountPath: /data/storage
           {{- end }}
+          {{- if .Values.servicejobs.extraVolumeMounts }}
+            {{ toYaml .Values.servicejobs.extraVolumeMounts | nindent 12 }}
+          {{- end }}
 {{- if .Values.servicejobs.nodeSelector }}
       nodeSelector:
         {{- range $key, $value := .Values.servicejobs.nodeSelector }}
@@ -208,8 +211,11 @@ spec:
 {{- toYaml . | nindent 8 }}
 {{- end }}
       volumes:
-        {{- if eq .Values.storage.type "filesystem" }}
+      {{- if eq .Values.storage.type "filesystem" }}
         - name: shared-volume
           persistentVolumeClaim:
             claimName: {{ .Release.Name }}-shared-volume-claim
-        {{- end }}
+      {{- end }}
+      {{- if .Values.servicejobs.extraVolumes }}
+        {{ toYaml .Values.servicejobs.extraVolumes | nindent 8 }}
+      {{- end }}
diff --git a/reportportal/templates/service-ui/ui-deployment.yaml b/reportportal/templates/service-ui/ui-deployment.yaml
@@ -29,8 +29,8 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       initContainers:
-      {{- if .Values.extraInitContainers }}
-{{ toYaml .Values.extraInitContainers | indent 8 }}
+      {{- if .Values.serviceui.extraInitContainers }}
+        {{ toYaml .Values.serviceui.extraInitContainers | nindent 8 }}
       {{- end }}
       containers:
       - name: {{ $.Values.serviceui.name | default "ui" }}
@@ -62,6 +62,9 @@ spec:
             mountPath: /etc/nginx/nginx.conf
             subPath: nginx.conf
             readOnly: true
+          {{- if .Values.serviceui.extraVolumeMounts }}
+            {{ toYaml .Values.serviceui.extraVolumeMounts | nindent 12 }}
+          {{- end }}
       #TODO: delete volumes after release new service-ui version
       volumes:
       - name: ui-nginx-conf
@@ -70,6 +73,9 @@ spec:
           items:
             - key: nginx.conf
               path: nginx.conf
+        {{- if .Values.serviceui.extraVolumes }}
+          {{ toYaml .Values.serviceui.extraVolumes | nindent 8 }}
+        {{- end }}
 {{- if .Values.serviceui.nodeSelector }}
       nodeSelector:
         {{- range $key, $value := .Values.serviceui.nodeSelector }}

diff --git a/reportportal/templates/statefullset-auto-analyzer/analyzer-statefulset.yaml b/reportportal/templates/statefullset-auto-analyzer/analyzer-statefulset.yaml
@@ -43,9 +43,9 @@ spec:
           limits:
             cpu: 50m
             memory: 100Mi
-{{- if .Values.extraInitContainers }}
-{{ toYaml .Values.extraInitContainers | indent 8 }}
-{{- end }}
+      {{- if .Values.serviceanalyzer.extraInitContainers }}
+        {{ toYaml .Values.serviceanalyzer.extraInitContainers | nindent 8 }}
+      {{- end }}
       containers:
       - name: "{{ $.Values.serviceanalyzer.name | default "analyzer" }}"
         image: "{{ include "reportportal.image" (dict "Values" .Values "service" "serviceanalyzer") }}"
@@ -135,6 +135,9 @@ spec:
           - name: shared-volume
             mountPath: /data/storage
           {{- end }}
+          {{- if .Values.serviceanalyzer.extraVolumeMounts }}
+            {{ toYaml .Values.serviceanalyzer.extraVolumeMounts | nindent 12 }}
+          {{- end }}
 {{- if .Values.serviceanalyzer.nodeSelector }}
       nodeSelector:
         {{- range $key, $value := .Values.serviceanalyzer.nodeSelector }}
@@ -149,8 +152,11 @@ spec:
 {{- toYaml . | nindent 8 }}
 {{- end }}
       volumes:
-        {{- if eq .Values.storage.type "filesystem" }}
+      {{- if eq .Values.storage.type "filesystem" }}
         - name: shared-volume
           persistentVolumeClaim:
             claimName: {{ .Release.Name }}-shared-volume-claim
-        {{- end }}
+      {{- end }}
+      {{- if .Values.serviceanalyzer.extraVolumes }}
+        {{ toYaml .Values.serviceanalyzer.extraVolumes | nindent 8 }}
+      {{- end }}
diff --git a/reportportal/templates/statefullset-auto-analyzer/analyzertrain-statefulset.yaml b/reportportal/templates/statefullset-auto-analyzer/analyzertrain-statefulset.yaml
@@ -43,9 +43,9 @@ spec:
           limits:
             cpu: 50m
             memory: 100Mi
-{{- if .Values.extraInitContainers }}
-{{ toYaml .Values.extraInitContainers | indent 8 }}
-{{- end }}
+      {{- if .Values.serviceanalyzertrain.extraInitContainers }}
+        {{ toYaml .Values.serviceanalyzertrain.extraInitContainers | nindent 8 }}
+      {{- end }}
       containers:
       - name: "{{ $.Values.serviceanalyzertrain.name | default "analyzer-train" }}"
         image: "{{ include "reportportal.image" (dict "Values" .Values "service" "serviceanalyzer") }}"
@@ -135,6 +135,9 @@ spec:
           - name: shared-volume
             mountPath: /data/storage
           {{- end }}
+          {{- if .Values.serviceanalyzertrain.extraVolumeMounts }}
+            {{ toYaml .Values.serviceanalyzertrain.extraVolumeMounts | nindent 12 }}
+          {{- end }}
 {{- if .Values.serviceanalyzertrain.nodeSelector }}
       nodeSelector:
         {{- range $key, $value := .Values.serviceanalyzertrain.nodeSelector }}
@@ -149,8 +152,11 @@ spec:
 {{- toYaml . | nindent 8 }}
 {{- end }}
       volumes:
-        {{- if eq .Values.storage.type "filesystem" }}
+      {{- if eq .Values.storage.type "filesystem" }}
         - name: shared-volume
           persistentVolumeClaim:
             claimName: {{ .Release.Name }}-shared-volume-claim
-        {{- end }}
+      {{- end }}
+      {{- if .Values.serviceanalyzertrain.extraVolumes }}
+        {{ toYaml .Values.serviceanalyzertrain.extraVolumes | nindent 8 }}
+      {{- end }}
diff --git a/reportportal/templates/statefullset-auto-analyzer/metrics-gatherer-deployment.yaml b/reportportal/templates/statefullset-auto-analyzer/metrics-gatherer-deployment.yaml
@@ -42,9 +42,9 @@ spec:
           limits:
             cpu: 50m
             memory: 100Mi
-{{- if .Values.extraInitContainers }}
-{{ toYaml .Values.extraInitContainers | indent 8 }}
-{{- end }}
+      {{- if .Values.metricsgatherer.extraInitContainers }}
+        {{ toYaml .Values.metricsgatherer.extraInitContainers | nindent 8 }}
+      {{- end }}
       containers:
       - name: metrics-gatherer
         image: "{{ include "reportportal.image" (dict "Values" .Values "service" "metricsgatherer") }}"