Merge pull request #444 from reportportal/develop

Release 24.2.2
reportportal · Dec 12, 2024 · 69e5a23 · 69e5a23
2 parents 45bd684 + e215b86
commit 69e5a23
Show file tree

Hide file tree

Showing 14 changed files with 255 additions and 99 deletions.
diff --git a/.github/workflows/helm-checks.yaml b/.github/workflows/helm-checks.yaml
@@ -0,0 +1,28 @@
+name: Lint Chart
+
+on: pull_request
+
+jobs:
+  lint-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Set up Helm
+        uses: azure/[email protected]
+        with:
+          version: v3.14.4
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+          check-latest: true
+
+      - name: Set up chart-testing
+        uses: helm/[email protected]
+
+      - name: Run chart-testing (lint)
+        run: ct lint --charts ./reportportal --target-branch ${{ github.event.repository.default_branch }}
diff --git a/docs/gcp-managed-cert-config.md b/docs/gcp-managed-cert-config.md
@@ -94,7 +94,7 @@ kubectl edit ingress ${APP_NAME}-gateway-ingress
 Update the Ingress resource to reference the `ManagedCertificate` resource:
 
 ```bash
-kubectl annotate ingress ${APP_NAME}-gateway-ingress networking.gke.io/manage-certificates=gcp-managed-certificate
+kubectl annotate ingress ${APP_NAME}-gateway-ingress networking.gke.io/managed-certificates=gcp-managed-certificate
 ```
 
 ## Check the status of the certificate
@@ -128,7 +128,7 @@ If you want to disable HTTP Load Balancing, you can do it after the certificate
 is attached to the Ingress resource:
 
 ```bash
-kubectl annotate ingress ${APP_NAME}-gateway-ingress kubernetes.io/ingress.allow-http: "false"
+kubectl annotate ingress ${APP_NAME}-gateway-ingress kubernetes.io/ingress.allow-http=false
 ```
 
 ## Clean up

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.1
+version: 24.2.2
 sources:
   - https://github.com/reportportal/kubernetes/tree/master/reportportal
 keywords:

diff --git a/reportportal/templates/hooks/upgrade/pre-upgrade-cleanup.yaml b/reportportal/templates/hooks/upgrade/pre-upgrade-cleanup.yaml
@@ -21,10 +21,10 @@ spec:
       restartPolicy: OnFailure
       containers:
       - name: delete-job
-        image: bitnami/kubectl:latest
+        image: "{{ include "reportportal.image" (dict "Values" .Values "service" "kubectl") }}"
         command:
         - /bin/sh
         - -c
         - |
           kubectl delete job {{ include "reportportal.fullname" . }}-migrations --ignore-not-found=true
-{{- end }}
+{{- end }}
diff --git a/reportportal/templates/service-api/api-deployment.yaml b/reportportal/templates/service-api/api-deployment.yaml
@@ -21,6 +21,10 @@ spec:
         {{ $key }}: {{ $value | quote }}
         {{- end }}
     spec:
+    {{- with .Values.serviceapi.affinity }}
+      affinity:
+        {{ toYaml . | nindent 8 }}
+    {{- end }}
     {{- with .Values.serviceapi.hostAliases }}
       hostAliases:
         {{- range . }}
@@ -49,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" }}"
@@ -218,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 }}"
@@ -260,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
@@ -22,6 +22,10 @@ spec:
         {{ $key }}: {{ $value | quote }}
         {{- end }}
     spec:
+    {{- with .Values.uat.affinity }}
+      affinity:
+        {{ toYaml . | nindent 8 }}
+    {{- end }}
     {{- with .Values.uat.hostAliases }}
       hostAliases:
         {{- range . }}
@@ -50,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" }}"
@@ -194,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 }}
@@ -217,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
@@ -22,13 +22,17 @@ spec:
         {{ $key }}: {{ $value | quote }}
         {{- end }}
     spec:
+      {{- with .Values.serviceindex.affinity }}
+      affinity:
+        {{ toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.global.imagePullSecrets }}
       imagePullSecrets:
         {{- 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
@@ -20,6 +20,10 @@ spec:
         {{ $key }}: {{ $value | quote }}
         {{- end }}
     spec:
+      {{- with .Values.servicejobs.affinity }}
+      affinity:
+        {{ toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.global.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
@@ -38,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") }}"
@@ -190,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 }}
@@ -204,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-migrations/migrations-job.yaml b/reportportal/templates/service-migrations/migrations-job.yaml
@@ -17,6 +17,10 @@ spec:
         {{- end }}
     spec:
       restartPolicy: OnFailure
+      {{- with .Values.migrations.affinity }}
+      affinity:
+        {{ toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.global.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}

diff --git a/reportportal/templates/service-ui/ui-deployment.yaml b/reportportal/templates/service-ui/ui-deployment.yaml
@@ -20,13 +20,17 @@ spec:
         {{ $key }}: {{ $value | quote }}
         {{- end }}
     spec:
+      {{- with .Values.serviceui.affinity }}
+      affinity:
+        {{ toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.global.imagePullSecrets }}
       imagePullSecrets:
         {{- 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" }}
@@ -58,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
@@ -66,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
@@ -21,6 +21,10 @@ spec:
         {{ $key }}: {{ $value | quote }}
         {{- end }}
     spec:
+      {{- with .Values.serviceanalyzer.affinity }}
+      affinity:
+        {{ toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.global.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
@@ -39,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") }}"
@@ -131,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 }}
@@ -145,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
@@ -21,6 +21,10 @@ spec:
         {{ $key }}: {{ $value | quote }}
         {{- end }}
     spec:
+      {{- with .Values.serviceanalyzertrain.affinity }}
+      affinity:
+        {{ toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.global.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
@@ -39,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") }}"
@@ -131,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 }}
@@ -145,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
@@ -20,6 +20,10 @@ spec:
         {{ $key }}: {{ $value | quote }}
         {{- end }}
     spec:
+      {{- with .Values.metricsgatherer.affinity }}
+      affinity:
+        {{ toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.global.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
@@ -38,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") }}"