Skip to content

Commit 62ea271

Browse files
committed
fix(chart): upload.conf is missing in volumeMounts
Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent 84a8e91 commit 62ea271

File tree

3 files changed

+28
-3
lines changed

3 files changed

+28
-3
lines changed

Diff for: charts/selenium-grid/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: selenium-grid
33
description: A Helm chart for creating a Selenium Grid Server in Kubernetes
44
type: application
5-
version: 0.30.1
5+
version: 0.30.2
66
appVersion: 4.20.0-20240505
77
icon: https://github.com/SeleniumHQ/docker-selenium/raw/trunk/logo.png
88
dependencies:

Diff for: charts/selenium-grid/templates/_helpers.tpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ template:
382382
name: {{ template "seleniumGrid.recorder.configmap.fullname" $ }}
383383
- configMapRef:
384384
name: {{ template "seleniumGrid.server.configmap.fullname" $ }}
385-
{{- if and $.Values.videoRecorder.uploader.enabled (not (empty $.Values.videoRecorder.uploader.name)) }}
385+
{{- if and $.Values.videoRecorder.uploader.enabled (empty $.Values.videoRecorder.uploader.name) }}
386386
- secretRef:
387387
name: {{ tpl (default (include "seleniumGrid.common.secrets.fullname" $) $.Values.uploaderConfigMap.secretVolumeMountName) $ }}
388388
{{- end }}
@@ -647,7 +647,7 @@ Define terminationGracePeriodSeconds of the node pod.
647647
mountPath: {{ $.Values.recorderConfigMap.extraScriptsDirectory }}/{{ $fileName }}
648648
subPath: {{ $fileName }}
649649
{{- end }}
650-
{{- if and $.Values.videoRecorder.uploader.enabled (not (empty $.Values.videoRecorder.uploader.name)) }}
650+
{{- if and $.Values.videoRecorder.uploader.enabled (empty $.Values.videoRecorder.uploader.name) }}
651651
{{- range $fileName, $value := .Values.uploaderConfigMap.secretFiles }}
652652
- name: {{ tpl (default (include "seleniumGrid.common.secrets.fullname" $) $.Values.uploaderConfigMap.secretVolumeMountName) $ }}
653653
mountPath: {{ $.Values.uploaderConfigMap.extraScriptsDirectory }}/{{ $fileName }}

Diff for: tests/charts/templates/test.py

+25
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,31 @@ def test_extra_script_import_to_recorder_configmap(self):
183183
count += 1
184184
self.assertEqual(count, len(resources_name), "No recorder config resources found")
185185

186+
def test_upload_conf_mount_to_video_container(self):
187+
resources_name = ['{0}selenium-chrome-node'.format(RELEASE_NAME),
188+
'{0}selenium-edge-node'.format(RELEASE_NAME),
189+
'{0}selenium-firefox-node'.format(RELEASE_NAME),]
190+
is_present = False
191+
for doc in LIST_OF_DOCUMENTS:
192+
if doc['metadata']['name'] in resources_name and doc['kind'] == 'Deployment':
193+
logger.info(f"Assert upload config is mounted to the container")
194+
video_container = None
195+
uploader_container = None
196+
for container in doc['spec']['template']['spec']['containers']:
197+
if container['name'] == 'video':
198+
video_container = container
199+
if container['name'] == 'uploader':
200+
uploader_container = container
201+
list_volume_mounts = None
202+
if uploader_container is not None:
203+
list_volume_mounts = uploader_container['volumeMounts']
204+
else:
205+
list_volume_mounts = video_container['volumeMounts']
206+
for volume in list_volume_mounts:
207+
if volume['mountPath'] == '/opt/bin/upload.conf':
208+
is_present = True
209+
self.assertTrue(is_present, "Volume mount for upload config is not present in the container")
210+
186211
def test_terminationGracePeriodSeconds_in_deployment_autoscaling(self):
187212
resources_name = ['{0}selenium-chrome-node'.format(RELEASE_NAME),]
188213
count = 0

0 commit comments

Comments
 (0)