Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 8, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1d63c1a
K8s: Add template for file browser video records service
VietND96 Apr 7, 2025
afa58c7
K8s: Fix deployment template error in video-manager
VietND96 May 7, 2025
44ac082
Merge remote-tracking branch 'origin/trunk' into video-manager
VietND96 May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions charts/selenium-grid/templates/jaeger-ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions charts/selenium-grid/templates/video-manager/file-browser-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: {}
Expand Down
4 changes: 2 additions & 2 deletions charts/selenium-grid/templates/video-manager/file-browser-ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions tests/charts/bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' \
Expand All @@ -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' \
Expand Down
11 changes: 11 additions & 0 deletions tests/charts/ci/base-recorder-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
11 changes: 11 additions & 0 deletions tests/charts/templates/render/dummy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 11 additions & 0 deletions tests/charts/templates/render/dummy_solution.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading