Feat: support grid basic auth on helm chart (#1894)

* implement basic auth in helm chart

Updated helm chart templates to allow basic auth to be enabled/disabled
through values.yaml

* implement basic auth in helm chart

Updated helm chart templates to allow basic auth to be enabled/disabled
through values.yaml

---------

Co-authored-by: Trung Le <[email protected]>
Co-authored-by: Diego Molina <[email protected]>

Author: 3 people

charts/selenium-grid/templates/_helpers.tpl

@@ -186,17 +186,17 @@ Get the url of the grid. If the external url can be figured out from the ingress
 */}}
 {{- define "seleniumGrid.url" -}}
 {{- if and .Values.ingress.enabled .Values.ingress.hostname (ne .Values.ingress.hostname "selenium-grid.local") -}}
-http{{if .Values.ingress.tls}}s{{end}}://{{.Values.ingress.hostname}}
+http{{if .Values.ingress.tls}}s{{end}}://{{- if eq .Values.basicAuth.enabled true}}{{ .Values.basicAuth.username}}:{{ .Values.basicAuth.password}}@{{- end}}{{.Values.ingress.hostname}}
 {{- else -}}
-http://{{ include ($.Values.isolateComponents | ternary "seleniumGrid.router.fullname" "seleniumGrid.hub.fullname") $ }}.{{ .Release.Namespace }}:{{ $.Values.components.router.port }}
+http://{{- if eq .Values.basicAuth.enabled true}}{{ .Values.basicAuth.username}}:{{ .Values.basicAuth.password}}@{{- end}}{{ include ($.Values.isolateComponents | ternary "seleniumGrid.router.fullname" "seleniumGrid.hub.fullname") $ }}.{{ .Release.Namespace }}:{{ $.Values.components.router.port }}
 {{- end }}
 {{- end -}}
 
 {{/*
 Graphql Url of the hub or the router
 */}}
 {{- define "seleniumGrid.graphqlURL" -}}
-http://{{ include ($.Values.isolateComponents | ternary "seleniumGrid.router.fullname" "seleniumGrid.hub.fullname") $ }}.{{ .Release.Namespace }}:{{ $.Values.components.router.port }}/graphql
+http://{{- if eq .Values.basicAuth.enabled true}}{{ .Values.basicAuth.username}}:{{ .Values.basicAuth.password}}@{{- end}}{{ include ($.Values.isolateComponents | ternary "seleniumGrid.router.fullname" "seleniumGrid.hub.fullname") $ }}.{{ .Release.Namespace }}:{{ $.Values.components.router.port }}/graphql
 {{- end -}}
 
 {{/*

charts/selenium-grid/templates/hub-deployment.yaml

@@ -64,6 +64,12 @@ spec:
           env:
             - name: SE_SUB_PATH
               value: {{ .Values.hub.subPath }}
+            {{- if eq .Values.basicAuth.enabled true}}
+            - name: ROUTER_USERNAME
+              value: {{ .Values.basicAuth.username }}
+            - name: ROUTER_PASSWORD
+              value: {{ .Values.basicAuth.username }}
+            {{- end }}
           {{- with .Values.hub.extraEnvironmentVariables }}
             {{- tpl (toYaml .) $ | nindent 12 }}
           {{- end }}

charts/selenium-grid/templates/router-deployment.yaml

@@ -44,6 +44,12 @@ spec:
               value: {{ .Values.components.sessionQueue.port | quote }}
             - name: SE_SUB_PATH
               value: {{ .Values.components.subPath }}
+            {{- if eq .Values.basicAuth.enabled true}}
+            - name: ROUTER_USERNAME
+              value: {{ .Values.basicAuth.username }}
+            - name: ROUTER_PASSWORD
+              value: {{ .Values.basicAuth.password }}
+            {{- end }}
           {{- with .Values.components.extraEnvironmentVariables }}
             {{- tpl (toYaml .) $ | nindent 12 }}
           {{- end }}

charts/selenium-grid/values.yaml

@@ -5,7 +5,16 @@ global:
     # Image tag for browser's nodes
     nodesImageTag: 4.11.0-20230801
     # Pull secret for all components, can be overridden individually
-    imagePullSecret: ""
+    imagePullSecret: ""    
+
+# Basic auth settings for Selenium Grid
+basicAuth:
+      # Enable or disable basic auth
+      enabled: true
+      # Username for basic auth
+      username: admin
+      # Password for basic auth
+      password: admin    
 
 # Deploy Router, Distributor, EventBus, SessionMap and Nodes separately
 isolateComponents: false