Skip to content

Commit 83f6c08

Browse files
VietND96VietND96
authored
K8s: Set K8s node IP to all components via env var KUBERNETES_NODE_HOST_IP (#2668)
* K8s: Set K8s node IP to all components via env var KUBERNETES_NODE_HOST_IP * Utilize `envsubst` to get nested env variable --------- Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent bcbb628 commit 83f6c08

21 files changed

+72
-10
lines changed

Diff for: ‎Base/Dockerfile

+10
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ ARG GRPC_VERSION=1.69.0
1313
ARG NETTY_VERSION=4.1.117.Final
1414
ARG CS_VERSION=2.1.18
1515
ARG POSTGRESQL_VERSION=42.7.5
16+
ARG ENVSUBST_VERSION=1.4.2
1617

1718
#Arguments to define the user running Selenium
1819
ARG SEL_USER=seluser
@@ -154,6 +155,15 @@ ARG CERT_TRUST_ATTR=TCu,Cu,Tu
154155
COPY --chown="${SEL_UID}:${SEL_GID}" certs/add-cert-helper.sh certs/add-jks-helper.sh /opt/bin/
155156
COPY --chown="${SEL_UID}:${SEL_GID}" certs/tls.crt certs/tls.key certs/server.jks certs/server.pass /opt/selenium/secrets/
156157

158+
#===================================================
159+
# Add envsubst binary
160+
#===================================================
161+
RUN ARCH=$(if [ "$(dpkg --print-architecture)" = "amd64" ]; then echo "x86_64"; else echo "$(dpkg --print-architecture)"; fi) \
162+
&& curl -fsSL https://github.com/a8m/envsubst/releases/download/v${ENVSUBST_VERSION}/envsubst-$(uname -s)-${ARCH} -o envsubst \
163+
&& chmod +x envsubst \
164+
&& mv envsubst /usr/local/bin \
165+
&& ln -sf /usr/local/bin/envsubst /usr/bin/envsubst
166+
157167
#===================================================
158168
# Run the following commands as non-privileged user
159169
#===================================================

Diff for: ‎Distributor/start-selenium-grid-distributor.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
164164
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.traces.exporter=${SE_OTEL_TRACES_EXPORTER}"
165165
fi
166166
if [ -n "$SE_OTEL_EXPORTER_ENDPOINT" ]; then
167-
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.otlp.endpoint=${SE_OTEL_EXPORTER_ENDPOINT}"
167+
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.otlp.endpoint=$(envsubst < <(echo ${SE_OTEL_EXPORTER_ENDPOINT}))"
168168
fi
169169
if [ -n "$SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED" ]; then
170170
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"

Diff for: ‎EventBus/start-selenium-grid-eventbus.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
9494
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.traces.exporter=${SE_OTEL_TRACES_EXPORTER}"
9595
fi
9696
if [ -n "$SE_OTEL_EXPORTER_ENDPOINT" ]; then
97-
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.otlp.endpoint=${SE_OTEL_EXPORTER_ENDPOINT}"
97+
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.otlp.endpoint=$(envsubst < <(echo ${SE_OTEL_EXPORTER_ENDPOINT}))"
9898
fi
9999
if [ -n "$SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED" ]; then
100100
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"

Diff for: ‎Hub/start-selenium-grid-hub.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
144144
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.traces.exporter=${SE_OTEL_TRACES_EXPORTER}"
145145
fi
146146
if [ -n "$SE_OTEL_EXPORTER_ENDPOINT" ]; then
147-
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.otlp.endpoint=${SE_OTEL_EXPORTER_ENDPOINT}"
147+
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.otlp.endpoint=$(envsubst < <(echo ${SE_OTEL_EXPORTER_ENDPOINT}))"
148148
fi
149149
if [ -n "$SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED" ]; then
150150
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"

Diff for: ‎Makefile

+2
Original file line numberDiff line numberDiff line change
@@ -965,6 +965,7 @@ chart_test_autoscaling_deployment_https:
965965

966966
chart_test_autoscaling_deployment:
967967
PLATFORMS=$(PLATFORMS) TEST_EXISTING_KEDA=true RELEASE_NAME=selenium CHART_ENABLE_TRACING=true TEST_PATCHED_KEDA=$(TEST_PATCHED_KEDA) AUTOSCALING_COOLDOWN_PERIOD=30 \
968+
TRACING_EXPORTER_ENDPOINT="http://\$$KUBERNETES_NODE_HOST_IP:4317" \
968969
SECURE_CONNECTION_SERVER=true SECURE_USE_EXTERNAL_CERT=true SERVICE_TYPE_NODEPORT=true SELENIUM_GRID_PROTOCOL=https SELENIUM_GRID_HOST=$$(hostname -I | cut -d' ' -f1) SELENIUM_GRID_PORT=31444 \
969970
SELENIUM_GRID_AUTOSCALING_MIN_REPLICA=1 SET_MAX_REPLICAS=3 TEST_DELAY_AFTER_TEST=2 SELENIUM_GRID_MONITORING=false \
970971
VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) KEDA_BASED_NAME=$(KEDA_BASED_NAME) KEDA_BASED_TAG=$(KEDA_BASED_TAG) NAMESPACE=$(NAMESPACE) BINDING_VERSION=$(BINDING_VERSION) BASE_VERSION=$(BASE_VERSION) \
@@ -981,6 +982,7 @@ chart_test_autoscaling_job_https:
981982

982983
chart_test_autoscaling_job_hostname:
983984
PLATFORMS=$(PLATFORMS) CHART_ENABLE_TRACING=true CHART_ENABLE_BASIC_AUTH=true BASIC_AUTH_EMBEDDED_URL=true TEST_PATCHED_KEDA=$(TEST_PATCHED_KEDA) TEST_MULTIPLE_PLATFORMS=true \
985+
TRACING_EXPORTER_ENDPOINT="http://\$$KUBERNETES_NODE_HOST_IP:4317" \
984986
SECURE_INGRESS_ONLY_DEFAULT=true SECURE_USE_EXTERNAL_CERT=true SELENIUM_GRID_PROTOCOL=https SELENIUM_GRID_HOST=$$(hostname -I | cut -d' ' -f1) SELENIUM_GRID_PORT=443 \
985987
VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) KEDA_BASED_NAME=$(KEDA_BASED_NAME) KEDA_BASED_TAG=$(KEDA_BASED_TAG) NAMESPACE=$(NAMESPACE) BINDING_VERSION=$(BINDING_VERSION) BASE_VERSION=$(BASE_VERSION) \
986988
TEMPLATE_OUTPUT_FILENAME="k8s_enableTracing_basicAuth_secureIngress_externalCerts_ingressPublicIP_autoScaling_originKEDA_scaledJob_subPath.yaml" \

Diff for: ‎NodeBase/start-selenium-node.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
143143
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.traces.exporter=${SE_OTEL_TRACES_EXPORTER}"
144144
fi
145145
if [ -n "$SE_OTEL_EXPORTER_ENDPOINT" ]; then
146-
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.otlp.endpoint=${SE_OTEL_EXPORTER_ENDPOINT}"
146+
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.otlp.endpoint=$(envsubst < <(echo ${SE_OTEL_EXPORTER_ENDPOINT}))"
147147
fi
148148
if [ -n "$SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED" ]; then
149149
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"

Diff for: ‎NodeDocker/start-selenium-grid-docker.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
111111
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.traces.exporter=${SE_OTEL_TRACES_EXPORTER}"
112112
fi
113113
if [ -n "$SE_OTEL_EXPORTER_ENDPOINT" ]; then
114-
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.otlp.endpoint=${SE_OTEL_EXPORTER_ENDPOINT}"
114+
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.otlp.endpoint=$(envsubst < <(echo ${SE_OTEL_EXPORTER_ENDPOINT}))"
115115
fi
116116
if [ -n "$SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED" ]; then
117117
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"

Diff for: ‎Router/start-selenium-grid-router.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
145145
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.traces.exporter=${SE_OTEL_TRACES_EXPORTER}"
146146
fi
147147
if [ -n "$SE_OTEL_EXPORTER_ENDPOINT" ]; then
148-
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.otlp.endpoint=${SE_OTEL_EXPORTER_ENDPOINT}"
148+
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.otlp.endpoint=$(envsubst < <(echo ${SE_OTEL_EXPORTER_ENDPOINT}))"
149149
fi
150150
if [ -n "$SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED" ]; then
151151
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"

Diff for: ‎SessionQueue/start-selenium-grid-session-queue.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
9898
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.traces.exporter=${SE_OTEL_TRACES_EXPORTER}"
9999
fi
100100
if [ -n "$SE_OTEL_EXPORTER_ENDPOINT" ]; then
101-
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.otlp.endpoint=${SE_OTEL_EXPORTER_ENDPOINT}"
101+
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.otlp.endpoint=$(envsubst < <(echo ${SE_OTEL_EXPORTER_ENDPOINT}))"
102102
fi
103103
if [ -n "$SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED" ]; then
104104
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"

Diff for: ‎Sessions/start-selenium-grid-sessions.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
120120
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.traces.exporter=${SE_OTEL_TRACES_EXPORTER}"
121121
fi
122122
if [ -n "$SE_OTEL_EXPORTER_ENDPOINT" ]; then
123-
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.otlp.endpoint=${SE_OTEL_EXPORTER_ENDPOINT}"
123+
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.otlp.endpoint=$(envsubst < <(echo ${SE_OTEL_EXPORTER_ENDPOINT}))"
124124
fi
125125
if [ -n "$SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED" ]; then
126126
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"

Diff for: ‎Standalone/start-selenium-standalone.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
143143
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.traces.exporter=${SE_OTEL_TRACES_EXPORTER}"
144144
fi
145145
if [ -n "$SE_OTEL_EXPORTER_ENDPOINT" ]; then
146-
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.otlp.endpoint=${SE_OTEL_EXPORTER_ENDPOINT}"
146+
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.otlp.endpoint=$(envsubst < <(echo ${SE_OTEL_EXPORTER_ENDPOINT}))"
147147
fi
148148
if [ -n "$SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED" ]; then
149149
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"

Diff for: ‎StandaloneDocker/start-selenium-grid-docker.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
112112
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.traces.exporter=${SE_OTEL_TRACES_EXPORTER}"
113113
fi
114114
if [ -n "$SE_OTEL_EXPORTER_ENDPOINT" ]; then
115-
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.otlp.endpoint=${SE_OTEL_EXPORTER_ENDPOINT}"
115+
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.otlp.endpoint=$(envsubst < <(echo ${SE_OTEL_EXPORTER_ENDPOINT}))"
116116
fi
117117
if [ -n "$SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED" ]; then
118118
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"

Diff for: ‎charts/selenium-grid/README.md

+16
Original file line numberDiff line numberDiff line change
@@ -1040,6 +1040,22 @@ tracing:
10401040
By default, the exporter is set to `otlp`. It is wide compatibility with many tracing backends.
10411041
Read more: [vendors](https://opentelemetry.io/ecosystem/vendors/) native support OpenTelemetry and guidelines on [integration](https://opentelemetry.io/ecosystem/integrations/)
10421042

1043+
In case your observability collector agents running on the Kubernetes Nodes as Daemonsets, you can to set `tracing.exporterEndpoint` point to IP address for Kubernetes node. For example:
1044+
1045+
```yaml
1046+
tracing:
1047+
enabledWithExistingEndpoint: true
1048+
exporterEndpoint: 'http://$KUBERNETES_NODE_HOST_IP:4317'
1049+
```
1050+
1051+
In each component deployment, we already exposed the environment variable `KUBERNETES_NODE_HOST_IP` to get the IP address of the Kubernetes node where the component is running. So, you can use environment variable pattern in the value of `tracing.exporterEndpoint` as above.
1052+
1053+
Note: If you set value via Helm CLI, ensure to escape the `$` character in the value to prevent it confused with the shell variable. For example:
1054+
1055+
```bash
1056+
helm upgrade -i $RELEASENAME -n $NAMESPACE --set tracing.exporterEndpoint="http://\$KUBERNETES_NODE_HOST_IP:4317" [...]
1057+
```
1058+
10431059
### Configuration of Session Map using External Datastore
10441060

10451061
Feature [documentation](https://www.selenium.dev/documentation/grid/advanced_features/external_datastore/). It requires the Grid deployed in distributed mode. The feature is disabled by default.

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

+4
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,10 @@ template:
343343
image: {{ printf "%s/%s:%s" $nodeImageRegistry .node.imageName $nodeImageTag }}
344344
imagePullPolicy: {{ .node.imagePullPolicy }}
345345
env:
346+
- name: KUBERNETES_NODE_HOST_IP
347+
valueFrom:
348+
fieldRef:
349+
fieldPath: status.hostIP
346350
- name: SE_NODE_MAX_SESSIONS
347351
value: {{ $nodeMaxSessions | quote }}
348352
{{- if gt $nodeMaxSessions 1 }}

Diff for: ‎charts/selenium-grid/templates/distributor-deployment.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ spec:
4343
image: {{ printf "%s/%s:%s" $imageRegistry .Values.components.distributor.imageName $imageTag }}
4444
imagePullPolicy: {{ .Values.components.distributor.imagePullPolicy }}
4545
env:
46+
- name: KUBERNETES_NODE_HOST_IP
47+
valueFrom:
48+
fieldRef:
49+
fieldPath: status.hostIP
4650
- name: SE_OTEL_SERVICE_NAME
4751
value: '{{ template "seleniumGrid.distributor.fullname" . }}'
4852
- name: SE_DISTRIBUTOR_HOST

Diff for: ‎charts/selenium-grid/templates/event-bus-deployment.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ spec:
4747
- containerPort: {{ .Values.components.eventBus.subscribePort }}
4848
protocol: TCP
4949
env:
50+
- name: KUBERNETES_NODE_HOST_IP
51+
valueFrom:
52+
fieldRef:
53+
fieldPath: status.hostIP
5054
- name: SE_OTEL_SERVICE_NAME
5155
value: '{{ template "seleniumGrid.eventBus.fullname" . }}'
5256
- name: SE_EVENT_BUS_HOST

Diff for: ‎charts/selenium-grid/templates/hub-deployment.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,10 @@ spec:
104104
{{- end }}
105105
{{- end }}
106106
env:
107+
- name: KUBERNETES_NODE_HOST_IP
108+
valueFrom:
109+
fieldRef:
110+
fieldPath: status.hostIP
107111
- name: SE_OTEL_SERVICE_NAME
108112
value: '{{ template "seleniumGrid.hub.fullname" . }}'
109113
- name: SE_HUB_HOST

Diff for: ‎charts/selenium-grid/templates/router-deployment.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ spec:
4141
image: {{ printf "%s/%s:%s" $imageRegistry .Values.components.router.imageName $imageTag }}
4242
imagePullPolicy: {{ .Values.components.router.imagePullPolicy }}
4343
env:
44+
- name: KUBERNETES_NODE_HOST_IP
45+
valueFrom:
46+
fieldRef:
47+
fieldPath: status.hostIP
4448
- name: SE_OTEL_SERVICE_NAME
4549
value: '{{ template "seleniumGrid.router.fullname" . }}'
4650
- name: SE_ROUTER_HOST

Diff for: ‎charts/selenium-grid/templates/session-map-deployment.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ spec:
4141
image: {{ printf "%s/%s:%s" $imageRegistry .Values.components.sessionMap.imageName $imageTag }}
4242
imagePullPolicy: {{ .Values.components.sessionMap.imagePullPolicy }}
4343
env:
44+
- name: KUBERNETES_NODE_HOST_IP
45+
valueFrom:
46+
fieldRef:
47+
fieldPath: status.hostIP
4448
- name: SE_OTEL_SERVICE_NAME
4549
value: '{{ template "seleniumGrid.sessionMap.fullname" . }}'
4650
- name: SE_SESSIONS_HOST

Diff for: ‎charts/selenium-grid/templates/session-queue-deployment.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ spec:
4040
image: {{ printf "%s/%s:%s" $imageRegistry .Values.components.sessionQueue.imageName $imageTag }}
4141
imagePullPolicy: {{ .Values.components.sessionQueue.imagePullPolicy }}
4242
env:
43+
- name: KUBERNETES_NODE_HOST_IP
44+
valueFrom:
45+
fieldRef:
46+
fieldPath: status.hostIP
4347
- name: SE_OTEL_SERVICE_NAME
4448
value: '{{ template "seleniumGrid.sessionQueue.fullname" . }}'
4549
- name: SE_SESSION_QUEUE_HOST

Diff for: ‎tests/charts/make/chart_test.sh

+6
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,12 @@ HELM_COMMAND_SET_IMAGES=" \
181181
--set edgeNode.nodeMaxSessions=${MAX_SESSIONS_EDGE} \
182182
"
183183

184+
if [ -n "${TRACING_EXPORTER_ENDPOINT}" ]; then
185+
HELM_COMMAND_SET_IMAGES="${HELM_COMMAND_SET_IMAGES} \
186+
--set tracing.exporterEndpoint=\\"${TRACING_EXPORTER_ENDPOINT}\\" \
187+
"
188+
fi
189+
184190
if [ "${SELENIUM_GRID_AUTOSCALING}" = "true" ] && [ "${TEST_EXISTING_KEDA}" = "true" ]; then
185191
HELM_COMMAND_SET_IMAGES="${HELM_COMMAND_SET_IMAGES} \
186192
--set autoscaling.enabled=false \

0 commit comments

Comments
 (0)