K8s: Fix deployment template error in video-manager (#2828)

* K8s: Add template for file browser video records service

* K8s: Fix deployment template error in video-manager

---------

Signed-off-by: Viet Nguyen Duc <[email protected]>

Author: VietND96

charts/selenium-grid/templates/jaeger-ingress.yaml

@@ -25,14 +25,14 @@ spec:
   {{- if and (or .Values.tls.enabled .Values.tls.ingress.generateTLS) (tpl .Values.ingress.hostname $) (not .Values.ingress.tls) }}
   tls:
     - hosts:
-        - {{ tpl .Values.ingress.hostname $ }}
+        - {{ tpl .Values.ingress.hostname $ | quote }}
       secretName: {{ include "seleniumGrid.tls.fullname" $ | quote }}
   {{- else if .Values.ingress.tls }}
   tls:
     {{- range .Values.ingress.tls }}
     - hosts:
         {{- range .hosts }}
-        - {{ tpl . $ }}
+        - {{ tpl . $ | quote }}
         {{- end }}
       secretName: {{ tpl (default (include "seleniumGrid.tls.fullname" $) .secretName) $ | quote }}
     {{- end }}

charts/selenium-grid/templates/video-manager/file-browser-deployment.yaml

@@ -58,7 +58,7 @@ spec:
           {{- end }}
           volumeMounts:
           {{- if .Values.videoManager.extraVolumeMounts }}
-            {{- tpl (toYaml .) $ | nindent 12 }}
+            {{- tpl (toYaml .Values.videoManager.extraVolumeMounts) $ | nindent 12 }}
           {{- else }}
             - name: srv
               mountPath: /srv
@@ -113,7 +113,7 @@ spec:
     {{- end }}
       volumes:
       {{- if .Values.videoManager.extraVolumes }}
-        {{ tpl (toYaml .) $ | nindent 8 }}
+        {{- tpl (toYaml .Values.videoManager.extraVolumes) $ | nindent 8 }}
       {{- else }}
         - name: srv
           emptyDir: {}

charts/selenium-grid/templates/video-manager/file-browser-ingress.yaml

@@ -25,14 +25,14 @@ spec:
   {{- if and (or .Values.tls.enabled .Values.tls.ingress.generateTLS) (tpl .Values.ingress.hostname $) (not .Values.ingress.tls) }}
   tls:
     - hosts:
-        - {{ tpl .Values.ingress.hostname $ }}
+        - {{ tpl .Values.ingress.hostname $ | quote }}
       secretName: {{ include "seleniumGrid.tls.fullname" $ | quote }}
   {{- else if .Values.ingress.tls }}
   tls:
     {{- range .Values.ingress.tls }}
     - hosts:
         {{- range .hosts }}
-        - {{ tpl . $ }}
+        - {{ tpl . $ | quote }}
         {{- end }}
       secretName: {{ tpl (default (include "seleniumGrid.tls.fullname" $) .secretName) $ | quote }}
     {{- end }}

tests/charts/bootstrap.sh

@@ -16,7 +16,7 @@ helm package charts/selenium-grid --version 1.0.0-SNAPSHOT -d tests/tests
 
 RELEASE_NAME="selenium"
 
-helm template ${RELEASE_NAME} --values tests/charts/templates/render/dummy.yaml \
+helm template --debug ${RELEASE_NAME} --values tests/charts/templates/render/dummy.yaml \
   --set-file 'nodeConfigMap.extraScripts.setFromCommand\.sh=tests/charts/templates/render/dummy_external.sh' \
   --set-file 'recorderConfigMap.extraScripts.setFromCommand\.sh=tests/charts/templates/render/dummy_external.sh' \
   --set-file 'uploaderConfigMap.extraScripts.setFromCommand\.sh=tests/charts/templates/render/dummy_external.sh' \
@@ -35,7 +35,7 @@ helm package tests/charts/umbrella-charts --version 1.0.0-SNAPSHOT -d tests/test
 
 RELEASE_NAME="test"
 
-helm template ${RELEASE_NAME} --values tests/charts/templates/render/dummy_solution.yaml \
+helm template --debug ${RELEASE_NAME} --values tests/charts/templates/render/dummy_solution.yaml \
   --set-file 'selenium-grid.nodeConfigMap.extraScripts.setFromCommand\.sh=tests/charts/templates/render/dummy_external.sh' \
   --set-file 'selenium-grid.recorderConfigMap.extraScripts.setFromCommand\.sh=tests/charts/templates/render/dummy_external.sh' \
   --set-file 'selenium-grid.uploaderConfigMap.extraScripts.setFromCommand\.sh=tests/charts/templates/render/dummy_external.sh' \

tests/charts/ci/base-recorder-values.yaml

@@ -26,3 +26,14 @@ videoRecorder:
       RCLONE_CONFIG_MYFTP_USER: "seluser"
       RCLONE_CONFIG_MYFTP_PASS: "KkK8RsUIba-MMTBUSnuYIdAKvcnFyLl2pdhQig"
       RCLONE_CONFIG_MYFTP_FTP_CONCURRENCY: "5"
+
+videoManager:
+  enabled: true
+  extraVolumeMounts:
+    - name: srv
+      mountPath: /srv
+      subPath: srv
+  extraVolumes:
+    - name: srv
+      persistentVolumeClaim:
+        claimName: ${TEST_PV_CLAIM_NAME}

tests/charts/templates/render/dummy.yaml

@@ -200,3 +200,14 @@ uploaderConfigMap:
     upload.sh: |
       #!/bin/bash
       echo "This is override script"
+
+videoManager:
+  enabled: true
+  extraVolumeMounts:
+    - name: srv
+      mountPath: /srv
+      subPath: srv
+  extraVolumes:
+    - name: srv
+      persistentVolumeClaim:
+        claimName: my-external-pvc

tests/charts/templates/render/dummy_solution.yaml

@@ -188,3 +188,14 @@ selenium-grid:
       upload.sh: |
         #!/bin/bash
         echo "This is override script"
+
+  videoManager:
+    enabled: true
+    extraVolumeMounts:
+      - name: srv
+        mountPath: /srv
+        subPath: srv
+    extraVolumes:
+      - name: srv
+        persistentVolumeClaim:
+          claimName: my-external-pvc