Add support for extra volume mounts in deployment templates

reportportal · Nov 14, 2024 · 1573cb8 · 1573cb8
1 parent aebef48
commit 1573cb8
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 9 deletions.
diff --git a/reportportal/templates/service-api/api-deployment.yaml b/reportportal/templates/service-api/api-deployment.yaml
@@ -218,6 +218,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 }}"

diff --git a/reportportal/templates/service-authorization/uat-deployment.yaml b/reportportal/templates/service-authorization/uat-deployment.yaml
@@ -194,6 +194,9 @@ spec:
             - name: shared-volume
               mountPath: /data/storage
           {{- end }}
+          {{- if .Values.serviceapi.extraVolumeMounts }}
+            {{ toYaml .Values.serviceapi.extraVolumeMounts | nindent 12 }}
+          {{- end }}
     {{- if .Values.uat.nodeSelector }}
       nodeSelector:
         {{- range $key, $value := .Values.uat.nodeSelector }}

diff --git a/reportportal/templates/service-jobs/jobs-deployment.yaml b/reportportal/templates/service-jobs/jobs-deployment.yaml
@@ -190,6 +190,9 @@ spec:
           - name: shared-volume
             mountPath: /data/storage
           {{- end }}
+          {{- if .Values.serviceapi.extraVolumeMounts }}
+            {{ toYaml .Values.serviceapi.extraVolumeMounts | nindent 12 }}
+          {{- end }}
 {{- if .Values.servicejobs.nodeSelector }}
       nodeSelector:
         {{- range $key, $value := .Values.servicejobs.nodeSelector }}

diff --git a/reportportal/templates/service-ui/ui-deployment.yaml b/reportportal/templates/service-ui/ui-deployment.yaml
@@ -58,6 +58,9 @@ spec:
             mountPath: /etc/nginx/nginx.conf
             subPath: nginx.conf
             readOnly: true
+          {{- if .Values.serviceapi.extraVolumeMounts }}
+            {{ toYaml .Values.serviceapi.extraVolumeMounts | nindent 12 }}
+          {{- end }}
       #TODO: delete volumes after release new service-ui version
       volumes:
       - name: ui-nginx-conf

diff --git a/reportportal/templates/statefullset-auto-analyzer/analyzer-statefulset.yaml b/reportportal/templates/statefullset-auto-analyzer/analyzer-statefulset.yaml
@@ -131,6 +131,9 @@ spec:
           - name: shared-volume
             mountPath: /data/storage
           {{- end }}
+          {{- if .Values.serviceapi.extraVolumeMounts }}
+            {{ toYaml .Values.serviceapi.extraVolumeMounts | nindent 12 }}
+          {{- end }}
 {{- if .Values.serviceanalyzer.nodeSelector }}
       nodeSelector:
         {{- range $key, $value := .Values.serviceanalyzer.nodeSelector }}

diff --git a/reportportal/templates/statefullset-auto-analyzer/analyzertrain-statefulset.yaml b/reportportal/templates/statefullset-auto-analyzer/analyzertrain-statefulset.yaml
@@ -131,6 +131,9 @@ spec:
           - name: shared-volume
             mountPath: /data/storage
           {{- end }}
+          {{- if .Values.serviceapi.extraVolumeMounts }}
+            {{ toYaml .Values.serviceapi.extraVolumeMounts | nindent 12 }}
+          {{- end }}
 {{- if .Values.serviceanalyzertrain.nodeSelector }}
       nodeSelector:
         {{- range $key, $value := .Values.serviceanalyzertrain.nodeSelector }}

diff --git a/reportportal/values.yaml b/reportportal/values.yaml
@@ -31,7 +31,7 @@ serviceindex:
       cpu: 200m
       memory: 256Mi
 
-  ## @param extraInitContainers init containers
+  ## @param serviceindex.extraInitContainers init containers
   ##
   extraInitContainers: {}
     # - name: init-container
@@ -80,10 +80,17 @@ serviceui:
       cpu: 200m
       memory: 128Mi
 
-  ## @param extraInitContainers init containers
+  ## @param serviceui.extraInitContainers init containers
   ##
   extraInitContainers: {}
 
+  ## @param serviceui.extraVolumeMounts define the extra volume mounts
+  ##
+  extraVolumeMounts: []
+    # - name: extra-volume
+    #   mountPath: /path/to/mount
+    #   readOnly: true
+
   podLabels: {}
   podAnnotations: {}
   securityContext: {}
@@ -130,9 +137,13 @@ serviceapi:
       cpu: 1000m
       memory: 2Gi
 
-  ## @param extraInitContainers init containers
+  ## @param serviceapi.extraInitContainers init containers
   ##
   extraInitContainers: {}
+
+  ## @param serviceapi.extraVolumeMounts define the extra volume mounts
+  ##
+  extraVolumeMounts: []
 
   ## @param serviceapi.auditLogs.loglevel define log level
   ##
@@ -284,9 +295,13 @@ uat:
   sessionLiveTime: 86400
   samlSessionLiveTime: 4320
 
-  ## @param extraInitContainers init containers
+  ## @param uat.extraInitContainers init containers
   ##
   extraInitContainers: {}
+
+  ## @param uat.extraVolumeMounts define the extra volume mounts
+  ##
+  extraVolumeMounts: []
 
   ## @param uat.superadminInitPasswd define the initial password of the superadmin user for the first launch. This value can't change the password on redeployments
   ## @param uat.superadminInitPasswd.secretName define the secret name for the superadmin password
@@ -405,9 +420,13 @@ servicejobs:
       cpu: 250m
       memory: 512Mi
 
-  ## @param extraInitContainers init containers
+  ## @param servicjobs.extraInitContainers init containers
   ##
   extraInitContainers: {}
+
+  ## @param servicjobs.extraVolumeMounts define the extra volume mounts
+  ##
+  extraVolumeMounts: []
 
   ## @param servicjobs.javaArgs define the configuration for the JVM.
   ## For custom java keystore add parameter: -Djavax.net.ssl.trustStore=/etc/secret-volume/custom-pki.jks
@@ -460,10 +479,14 @@ serviceanalyzer:
       cpu: 500m
       memory: 1Gi
 
-  ## @param extraInitContainers init containers
+  ## @param serviceanalyzer.extraInitContainers init containers
   ##
   extraInitContainers: {}
 
+  ## @param serviceanalyzer.extraVolumeMounts define the extra volume mounts
+  ##
+  extraVolumeMounts: []
+
   podLabels: {}
   podAnnotations: {}
   securityContext: {}
@@ -507,10 +530,14 @@ serviceanalyzertrain:
       cpu: 200m
       memory: 512Mi
 
-  ## @param extraInitContainers init containers
+  ## @param serviceanalyzertrain.extraInitContainers init containers
   ##
   extraInitContainers: {}
 
+  ## @param serviceanalyzertrain.extraVolumeMounts define the extra volume mounts
+  ##
+  extraVolumeMounts: []
+
   podLabels: {}
   podAnnotations: {}
   securityContext: {}
@@ -561,10 +588,10 @@ metricsgatherer:
       cpu: 16m
       memory: 256Mi
 
-  ## @param extraInitContainers init containers
+  ## @param metricsgatherer.extraInitContainers init containers
   ##
   extraInitContainers: {}
-  
+
   podLabels: {}
   podAnnotations: {}
   securityContext: {}