From 966a78a3b3a3c770bff5041ae25d5d5a79381141 Mon Sep 17 00:00:00 2001 From: Viet Nguyen Duc Date: Mon, 3 Mar 2025 00:30:34 +0000 Subject: [PATCH] Docker: Resolve default component port via env var (#2689) Signed-off-by: Viet Nguyen Duc --- Base/Dockerfile | 4 ++-- Distributor/Dockerfile | 5 +++++ ENV_VARIABLES.md | 14 ++++++-------- EventBus/Dockerfile | 5 ++++- Hub/Dockerfile | 1 + NodeDocker/Dockerfile | 4 +++- Router/Dockerfile | 4 ++++ SessionQueue/Dockerfile | 1 + Sessions/Dockerfile | 3 +++ Sessions/start-selenium-grid-sessions.sh | 12 ++++++------ .../templates/session-map-deployment.yaml | 4 ++-- docker-compose-v3-full-grid-dev.yml | 16 ---------------- ...r-compose-v3-full-grid-external-datastore.yml | 16 ---------------- docker-compose-v3-full-grid-nightly.yml | 16 ---------------- docker-compose-v3-full-grid-secure.yml | 16 ---------------- docker-compose-v3-full-grid-tracing.yml | 16 ---------------- docker-compose-v3-full-grid.yml | 16 ---------------- scripts/generate_list_env_vars/description.yaml | 6 ------ scripts/generate_list_env_vars/value.yaml | 16 ++++++---------- tests/charts/make/chart_setup_env.sh | 4 ++-- 20 files changed, 45 insertions(+), 134 deletions(-) diff --git a/Base/Dockerfile b/Base/Dockerfile index 3b0cf540c1..6b44789335 100644 --- a/Base/Dockerfile +++ b/Base/Dockerfile @@ -13,7 +13,7 @@ ARG GRPC_VERSION=1.70.0 ARG NETTY_VERSION=4.1.118.Final ARG CS_VERSION=2.1.18 ARG POSTGRESQL_VERSION=42.7.5 -ARG ENVSUBST_VERSION=1.4.2-patch.124 +ARG ENVSUBST_VERSION=1.4.3 #Arguments to define the user running Selenium ARG SEL_USER=seluser @@ -161,7 +161,7 @@ COPY --chown="${SEL_UID}:${SEL_GID}" certs/tls.crt certs/tls.key certs/server.jk # Add envsubst binary #=================================================== RUN ARCH=$(if [ "$(dpkg --print-architecture)" = "amd64" ]; then echo "x86_64"; else echo "$(dpkg --print-architecture)"; fi) \ - && curl -fsSL https://github.com/NDViet/envsubst/releases/download/v${ENVSUBST_VERSION}/envsubst-$(uname -s)-${ARCH} -o envsubst \ + && curl -fsSL https://github.com/a8m/envsubst/releases/download/v${ENVSUBST_VERSION}/envsubst-$(uname -s)-${ARCH} -o envsubst \ && chmod +x envsubst \ && mv envsubst /usr/local/bin \ && ln -sf /usr/local/bin/envsubst /usr/bin/envsubst diff --git a/Distributor/Dockerfile b/Distributor/Dockerfile index ca60593e9a..e89631b116 100644 --- a/Distributor/Dockerfile +++ b/Distributor/Dockerfile @@ -23,4 +23,9 @@ ENV SE_SESSION_REQUEST_TIMEOUT="300" \ SE_SESSION_RETRY_INTERVAL="15" \ # In seconds, maps to "--healthcheck-interval" SE_HEALTHCHECK_INTERVAL="120" \ + SE_EVENT_BUS_PUBLISH_PORT="4442" \ + SE_EVENT_BUS_SUBSCRIBE_PORT="4443" \ + SE_SESSIONS_MAP_PORT="5556" \ + SE_SESSION_QUEUE_PORT="5559" \ + SE_DISTRIBUTOR_PORT="5553" \ SE_OTEL_SERVICE_NAME="selenium-distributor" diff --git a/ENV_VARIABLES.md b/ENV_VARIABLES.md index f7646eac0e..413c285f96 100644 --- a/ENV_VARIABLES.md +++ b/ENV_VARIABLES.md @@ -26,8 +26,8 @@ | SE_NODE_GRID_URL | | Node config, public URL of the Grid as a whole (typically the address of the Hub or the Router) | --grid-url | | SE_HUB_HOST | | Hub config, host address the Hub should listen on | --host | | SE_ROUTER_HOST | | Router config, host address the Router should listen on | --host | -| SE_HUB_PORT | | Hub config, port the Hub should listen on (default 4444) | --port | -| SE_ROUTER_PORT | | Router config, port the Router should listen on (default 4444) | --port | +| SE_HUB_PORT | 4444 | Hub config, port the Hub should listen on (default 4444) | --port | +| SE_ROUTER_PORT | 4444 | Router config, port the Router should listen on (default 4444) | --port | | SE_NODE_GRID_GRAPHQL_URL | | Video recording config, GraphQL URL to query test metadata for dynamic file name | | | SE_VIDEO_FILE_NAME_TRIM_REGEX | [:alnum:]-_ | Bash regex to trim the file name if it is too long | | | SE_VIDEO_FILE_NAME_SUFFIX | | Append a suffix session id along with test metadata | | @@ -39,7 +39,7 @@ | SE_RCLONE_ | | | | | SE_OPTS | | | | | SE_EVENT_BUS_HOST | | | | -| SE_EVENT_BUS_PORT | | | | +| SE_EVENT_BUS_PORT | 5557 | | | | SE_LOG_LEVEL | INFO | | | | SE_HTTP_LOGS | false | | | | SE_STRUCTURED_LOGS | false | | | @@ -92,17 +92,15 @@ | SE_HEALTHCHECK_INTERVAL | 120 | | | | SE_RELAX_CHECKS | true | | | | SE_SESSION_QUEUE_HOST | | | | -| SE_SESSION_QUEUE_PORT | | | | +| SE_SESSION_QUEUE_PORT | 5559 | | | | SE_VIDEO_FOLDER | | | | | SE_LOG_LISTEN_GRAPHQL | | | | | SE_NODE_PRESTOP_WAIT_STRATEGY | | | | -| SE_SESSIONS_HOST | | | | -| SE_SESSIONS_PORT | | | | | SE_SESSIONS_MAP_EXTERNAL_DATASTORE | false | | | | SE_SESSIONS_MAP_HOST | | | | -| SE_SESSIONS_MAP_PORT | | | | +| SE_SESSIONS_MAP_PORT | 5556 | | | | SE_DISTRIBUTOR_HOST | | | | -| SE_DISTRIBUTOR_PORT | | | | +| SE_DISTRIBUTOR_PORT | 5553 | | | | SE_GRID_URL | | | | | SE_NODE_DOCKER_CONFIG_FILENAME | | | | | SE_NODE_GRACEFUL_SHUTDOWN | | | | diff --git a/EventBus/Dockerfile b/EventBus/Dockerfile index c3f5ee84c0..c6e07e6dad 100644 --- a/EventBus/Dockerfile +++ b/EventBus/Dockerfile @@ -22,4 +22,7 @@ COPY --chown="${SEL_UID}:${SEL_GID}" start-selenium-grid-eventbus.sh \ COPY selenium-grid-eventbus.conf /etc/supervisor/conf.d/ -ENV SE_OTEL_SERVICE_NAME="selenium-event-bus" +ENV SE_OTEL_SERVICE_NAME="selenium-event-bus" \ + SE_EVENT_BUS_PUBLISH_PORT="4442" \ + SE_EVENT_BUS_SUBSCRIBE_PORT="4443" \ + SE_EVENT_BUS_PORT="5557" diff --git a/Hub/Dockerfile b/Hub/Dockerfile index 0d2d87bb7d..2c56da34c4 100644 --- a/Hub/Dockerfile +++ b/Hub/Dockerfile @@ -22,6 +22,7 @@ ENV SE_SESSION_REQUEST_TIMEOUT="300" \ SE_HEALTHCHECK_INTERVAL="120" \ # Boolean value, maps "--relax-checks" SE_RELAX_CHECKS="true" \ + SE_HUB_PORT="4444" \ SE_OTEL_SERVICE_NAME="selenium-hub" COPY --chown="${SEL_UID}:${SEL_GID}" start-selenium-grid-hub.sh \ diff --git a/NodeDocker/Dockerfile b/NodeDocker/Dockerfile index 113e1d2b5e..b7b7fd5068 100644 --- a/NodeDocker/Dockerfile +++ b/NodeDocker/Dockerfile @@ -29,4 +29,6 @@ COPY --chown="${SEL_UID}:${SEL_GID}" config.toml /opt/selenium/ COPY selenium-grid-docker.conf /etc/supervisor/conf.d/ -ENV SE_OTEL_SERVICE_NAME="selenium-node-docker" +ENV SE_OTEL_SERVICE_NAME="selenium-node-docker" \ + SE_EVENT_BUS_PUBLISH_PORT="4442" \ + SE_EVENT_BUS_SUBSCRIBE_PORT="4443" diff --git a/Router/Dockerfile b/Router/Dockerfile index f9f06423d6..da8dd07485 100644 --- a/Router/Dockerfile +++ b/Router/Dockerfile @@ -14,6 +14,10 @@ USER ${SEL_UID} ENV SE_SESSION_REQUEST_TIMEOUT="300" \ # In seconds, maps to "--session-retry-interval" SE_SESSION_RETRY_INTERVAL="15" \ + SE_DISTRIBUTOR_PORT="5553" \ + SE_SESSIONS_MAP_PORT="5556" \ + SE_SESSION_QUEUE_PORT="5559" \ + SE_ROUTER_PORT="4444" \ SE_OTEL_SERVICE_NAME="selenium-router" EXPOSE 4444 diff --git a/SessionQueue/Dockerfile b/SessionQueue/Dockerfile index 0330c6511e..7c627cc901 100644 --- a/SessionQueue/Dockerfile +++ b/SessionQueue/Dockerfile @@ -14,6 +14,7 @@ USER ${SEL_UID} ENV SE_SESSION_REQUEST_TIMEOUT="300" \ # In seconds, maps to "--session-retry-interval" SE_SESSION_RETRY_INTERVAL="15" \ + SE_SESSION_QUEUE_PORT="5559" \ SE_OTEL_SERVICE_NAME="selenium-session-queue" EXPOSE 5559 diff --git a/Sessions/Dockerfile b/Sessions/Dockerfile index 9f72ecea11..f29911e6fc 100644 --- a/Sessions/Dockerfile +++ b/Sessions/Dockerfile @@ -22,4 +22,7 @@ EXPOSE 5556 ENV SE_OTEL_SERVICE_NAME="selenium-session-map" \ GENERATE_CONFIG="true" \ + SE_EVENT_BUS_PUBLISH_PORT="4442" \ + SE_EVENT_BUS_SUBSCRIBE_PORT="4443" \ + SE_SESSIONS_MAP_PORT="5556" \ SE_SESSIONS_MAP_EXTERNAL_DATASTORE="false" diff --git a/Sessions/start-selenium-grid-sessions.sh b/Sessions/start-selenium-grid-sessions.sh index 776737fab1..771f86b79d 100755 --- a/Sessions/start-selenium-grid-sessions.sh +++ b/Sessions/start-selenium-grid-sessions.sh @@ -41,14 +41,14 @@ if [ ! -z "$SE_OPTS" ]; then echo "Appending Selenium options: ${SE_OPTS}" fi -if [ ! -z "$SE_SESSIONS_HOST" ]; then - echo "Using SE_SESSIONS_HOST: ${SE_SESSIONS_HOST}" - HOST_CONFIG="--host ${SE_SESSIONS_HOST}" +if [ ! -z "${SE_SESSIONS_MAP_HOST}" ]; then + echo "Using SE_SESSIONS_MAP_HOST: ${SE_SESSIONS_MAP_HOST}" + HOST_CONFIG="--host ${SE_SESSIONS_MAP_HOST}" fi -if [ ! -z "$SE_SESSIONS_PORT" ]; then - echo "Using SE_SESSIONS_PORT: ${SE_SESSIONS_PORT}" - PORT_CONFIG="--port ${SE_SESSIONS_PORT}" +if [ ! -z "${SE_SESSIONS_MAP_PORT}" ]; then + echo "Using SE_SESSIONS_MAP_PORT: ${SE_SESSIONS_MAP_PORT}" + PORT_CONFIG="--port ${SE_SESSIONS_MAP_PORT}" fi if [ ! -z "$SE_LOG_LEVEL" ]; then diff --git a/charts/selenium-grid/templates/session-map-deployment.yaml b/charts/selenium-grid/templates/session-map-deployment.yaml index 139827f201..91f2887aca 100644 --- a/charts/selenium-grid/templates/session-map-deployment.yaml +++ b/charts/selenium-grid/templates/session-map-deployment.yaml @@ -47,11 +47,11 @@ spec: fieldPath: status.hostIP - name: SE_OTEL_SERVICE_NAME value: '{{ template "seleniumGrid.sessionMap.fullname" . }}' - - name: SE_SESSIONS_HOST + - name: SE_SESSIONS_MAP_HOST valueFrom: fieldRef: fieldPath: status.podIP - - name: SE_SESSIONS_PORT + - name: SE_SESSIONS_MAP_PORT value: {{ .Values.components.sessionMap.port | quote }} {{- with .Values.components.extraEnvironmentVariables }} {{- tpl (toYaml .) $ | nindent 12 }} diff --git a/docker-compose-v3-full-grid-dev.yml b/docker-compose-v3-full-grid-dev.yml index 70beb0727b..a09e0995ad 100644 --- a/docker-compose-v3-full-grid-dev.yml +++ b/docker-compose-v3-full-grid-dev.yml @@ -1,7 +1,6 @@ # To execute this docker compose yml file use `docker compose -f docker-compose-v3-full-grid-dev.yml up` # Add the `-d` flag at the end for detached execution # To stop the execution, hit Ctrl+C, and then `docker compose -f docker-compose-v3-full-grid-dev.yml down` -version: "3" services: selenium-event-bus: image: selenium/event-bus:4.29.0-20250222 @@ -24,8 +23,6 @@ services: - selenium-event-bus environment: - SE_EVENT_BUS_HOST=selenium-event-bus - - SE_EVENT_BUS_PUBLISH_PORT=4442 - - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 selenium-session-queue: image: selenium/session-queue:4.29.0-20250222 @@ -48,12 +45,8 @@ services: - selenium-session-queue environment: - SE_EVENT_BUS_HOST=selenium-event-bus - - SE_EVENT_BUS_PUBLISH_PORT=4442 - - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - SE_SESSIONS_MAP_HOST=selenium-sessions - - SE_SESSIONS_MAP_PORT=5556 - SE_SESSION_QUEUE_HOST=selenium-session-queue - - SE_SESSION_QUEUE_PORT=5559 selenium-router: image: selenium/router:4.29.0-20250222 @@ -68,11 +61,8 @@ services: - selenium-session-queue environment: - SE_DISTRIBUTOR_HOST=selenium-distributor - - SE_DISTRIBUTOR_PORT=5553 - SE_SESSIONS_MAP_HOST=selenium-sessions - - SE_SESSIONS_MAP_PORT=5556 - SE_SESSION_QUEUE_HOST=selenium-session-queue - - SE_SESSION_QUEUE_PORT=5559 chrome: image: selenium/node-chrome:4.29.0-20250222 @@ -83,8 +73,6 @@ services: - selenium-event-bus environment: - SE_EVENT_BUS_HOST=selenium-event-bus - - SE_EVENT_BUS_PUBLISH_PORT=4442 - - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 edge: image: selenium/node-edge:4.29.0-20250222 @@ -95,8 +83,6 @@ services: - selenium-event-bus environment: - SE_EVENT_BUS_HOST=selenium-event-bus - - SE_EVENT_BUS_PUBLISH_PORT=4442 - - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 firefox: image: selenium/node-firefox:4.29.0-20250222 @@ -107,5 +93,3 @@ services: - selenium-event-bus environment: - SE_EVENT_BUS_HOST=selenium-event-bus - - SE_EVENT_BUS_PUBLISH_PORT=4442 - - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 diff --git a/docker-compose-v3-full-grid-external-datastore.yml b/docker-compose-v3-full-grid-external-datastore.yml index 0f0732d758..6bce11e664 100644 --- a/docker-compose-v3-full-grid-external-datastore.yml +++ b/docker-compose-v3-full-grid-external-datastore.yml @@ -1,7 +1,6 @@ # To execute this docker compose yml file use `docker compose -f docker-compose-v3-full-grid.yml up` # Add the `-d` flag at the end for detached execution # To stop the execution, hit Ctrl+C, and then `docker compose -f docker-compose-v3-full-grid.yml down` -version: "3" services: selenium-event-bus: image: selenium/event-bus:4.29.0-20250222 @@ -20,8 +19,6 @@ services: - selenium-event-bus environment: - SE_EVENT_BUS_HOST=selenium-event-bus - - SE_EVENT_BUS_PUBLISH_PORT=4442 - - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - SE_SESSIONS_MAP_EXTERNAL_DATASTORE=true - SE_SESSIONS_MAP_EXTERNAL_IMPLEMENTATION=org.openqa.selenium.grid.sessionmap.jdbc.JdbcBackedSessionMap - SE_SESSIONS_MAP_EXTERNAL_JDBC_URL=jdbc:postgresql://postgresql:5432/selenium_sessions @@ -68,12 +65,8 @@ services: - selenium-session-queue environment: - SE_EVENT_BUS_HOST=selenium-event-bus - - SE_EVENT_BUS_PUBLISH_PORT=4442 - - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - SE_SESSIONS_MAP_HOST=selenium-sessions - - SE_SESSIONS_MAP_PORT=5556 - SE_SESSION_QUEUE_HOST=selenium-session-queue - - SE_SESSION_QUEUE_PORT=5559 selenium-router: image: selenium/router:4.29.0-20250222 @@ -86,11 +79,8 @@ services: - selenium-session-queue environment: - SE_DISTRIBUTOR_HOST=selenium-distributor - - SE_DISTRIBUTOR_PORT=5553 - SE_SESSIONS_MAP_HOST=selenium-sessions - - SE_SESSIONS_MAP_PORT=5556 - SE_SESSION_QUEUE_HOST=selenium-session-queue - - SE_SESSION_QUEUE_PORT=5559 chrome: image: selenium/node-chrome:4.29.0-20250222 @@ -99,8 +89,6 @@ services: - selenium-event-bus environment: - SE_EVENT_BUS_HOST=selenium-event-bus - - SE_EVENT_BUS_PUBLISH_PORT=4442 - - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 edge: image: selenium/node-edge:4.29.0-20250222 @@ -109,8 +97,6 @@ services: - selenium-event-bus environment: - SE_EVENT_BUS_HOST=selenium-event-bus - - SE_EVENT_BUS_PUBLISH_PORT=4442 - - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 firefox: image: selenium/node-firefox:4.29.0-20250222 @@ -119,5 +105,3 @@ services: - selenium-event-bus environment: - SE_EVENT_BUS_HOST=selenium-event-bus - - SE_EVENT_BUS_PUBLISH_PORT=4442 - - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 diff --git a/docker-compose-v3-full-grid-nightly.yml b/docker-compose-v3-full-grid-nightly.yml index fad04495b4..f0e1538dd6 100644 --- a/docker-compose-v3-full-grid-nightly.yml +++ b/docker-compose-v3-full-grid-nightly.yml @@ -1,7 +1,6 @@ # To execute this docker compose yml file use `docker compose -f docker-compose-v3-full-grid-nightly.yml up --force-recreate` # Add the `-d` flag at the end for detached execution # To stop the execution, hit Ctrl+C, and then `docker compose -f docker-compose-v3-full-grid-nightly.yml down` -version: "3" services: selenium-event-bus: image: selenium/event-bus:nightly @@ -20,8 +19,6 @@ services: - selenium-event-bus environment: - SE_EVENT_BUS_HOST=selenium-event-bus - - SE_EVENT_BUS_PUBLISH_PORT=4442 - - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 selenium-session-queue: image: selenium/session-queue:nightly @@ -40,12 +37,8 @@ services: - selenium-session-queue environment: - SE_EVENT_BUS_HOST=selenium-event-bus - - SE_EVENT_BUS_PUBLISH_PORT=4442 - - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - SE_SESSIONS_MAP_HOST=selenium-sessions - - SE_SESSIONS_MAP_PORT=5556 - SE_SESSION_QUEUE_HOST=selenium-session-queue - - SE_SESSION_QUEUE_PORT=5559 selenium-router: image: selenium/router:nightly @@ -58,11 +51,8 @@ services: - selenium-session-queue environment: - SE_DISTRIBUTOR_HOST=selenium-distributor - - SE_DISTRIBUTOR_PORT=5553 - SE_SESSIONS_MAP_HOST=selenium-sessions - - SE_SESSIONS_MAP_PORT=5556 - SE_SESSION_QUEUE_HOST=selenium-session-queue - - SE_SESSION_QUEUE_PORT=5559 chrome: image: selenium/node-chrome:nightly @@ -71,8 +61,6 @@ services: - selenium-event-bus environment: - SE_EVENT_BUS_HOST=selenium-event-bus - - SE_EVENT_BUS_PUBLISH_PORT=4442 - - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 edge: image: selenium/node-edge:nightly @@ -81,8 +69,6 @@ services: - selenium-event-bus environment: - SE_EVENT_BUS_HOST=selenium-event-bus - - SE_EVENT_BUS_PUBLISH_PORT=4442 - - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 firefox: image: selenium/node-firefox:nightly @@ -91,8 +77,6 @@ services: - selenium-event-bus environment: - SE_EVENT_BUS_HOST=selenium-event-bus - - SE_EVENT_BUS_PUBLISH_PORT=4442 - - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 chrome_video: image: selenium/video:nightly diff --git a/docker-compose-v3-full-grid-secure.yml b/docker-compose-v3-full-grid-secure.yml index dfc389bc25..f0b478b9b6 100644 --- a/docker-compose-v3-full-grid-secure.yml +++ b/docker-compose-v3-full-grid-secure.yml @@ -1,7 +1,6 @@ # To execute this docker compose yml file use `docker compose -f docker-compose-v3-full-grid-secure.yml up` # Add the `-d` flag at the end for detached execution # To stop the execution, hit Ctrl+C, and then `docker compose -f docker-compose-v3-full-grid-secure.yml down` -version: "3" services: selenium-event-bus: image: selenium/event-bus:4.29.0-20250222 @@ -26,8 +25,6 @@ services: - ./charts/selenium-grid/certs:/opt/selenium/secrets environment: - SE_EVENT_BUS_HOST=selenium-event-bus - - SE_EVENT_BUS_PUBLISH_PORT=4442 - - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - SE_ENABLE_TLS=true selenium-session-queue: @@ -53,12 +50,8 @@ services: - ./charts/selenium-grid/certs:/opt/selenium/secrets environment: - SE_EVENT_BUS_HOST=selenium-event-bus - - SE_EVENT_BUS_PUBLISH_PORT=4442 - - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - SE_SESSIONS_MAP_HOST=selenium-sessions - - SE_SESSIONS_MAP_PORT=5556 - SE_SESSION_QUEUE_HOST=selenium-session-queue - - SE_SESSION_QUEUE_PORT=5559 - SE_ENABLE_TLS=true selenium-router: @@ -74,11 +67,8 @@ services: - ./charts/selenium-grid/certs:/opt/selenium/secrets environment: - SE_DISTRIBUTOR_HOST=selenium-distributor - - SE_DISTRIBUTOR_PORT=5553 - SE_SESSIONS_MAP_HOST=selenium-sessions - - SE_SESSIONS_MAP_PORT=5556 - SE_SESSION_QUEUE_HOST=selenium-session-queue - - SE_SESSION_QUEUE_PORT=5559 - SE_ENABLE_TLS=true chrome: @@ -90,8 +80,6 @@ services: - ./charts/selenium-grid/certs:/opt/selenium/secrets environment: - SE_EVENT_BUS_HOST=selenium-event-bus - - SE_EVENT_BUS_PUBLISH_PORT=4442 - - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - SE_ENABLE_TLS=true - SE_NODE_GRID_URL=https://localhost:4444 - SE_SERVER_PROTOCOL=https @@ -105,8 +93,6 @@ services: - ./charts/selenium-grid/certs:/opt/selenium/secrets environment: - SE_EVENT_BUS_HOST=selenium-event-bus - - SE_EVENT_BUS_PUBLISH_PORT=4442 - - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - SE_ENABLE_TLS=true - SE_NODE_GRID_URL=https://localhost:4444 - SE_SERVER_PROTOCOL=https @@ -120,8 +106,6 @@ services: - ./charts/selenium-grid/certs:/opt/selenium/secrets environment: - SE_EVENT_BUS_HOST=selenium-event-bus - - SE_EVENT_BUS_PUBLISH_PORT=4442 - - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - SE_ENABLE_TLS=true - SE_NODE_GRID_URL=https://localhost:4444 - SE_SERVER_PROTOCOL=https diff --git a/docker-compose-v3-full-grid-tracing.yml b/docker-compose-v3-full-grid-tracing.yml index 0cc53e8fc8..cc40723785 100644 --- a/docker-compose-v3-full-grid-tracing.yml +++ b/docker-compose-v3-full-grid-tracing.yml @@ -1,7 +1,6 @@ # To execute this docker compose yml file use `docker compose -f docker-compose-v3-full-grid-tracing.yml up` # Add the `-d` flag at the end for detached execution # To stop the execution, hit Ctrl+C, and then `docker compose -f docker-compose-v3-full-grid-tracing.yml down` -version: "3" services: jaeger: image: jaegertracing/all-in-one:latest @@ -30,8 +29,6 @@ services: - selenium-event-bus environment: - SE_EVENT_BUS_HOST=selenium-event-bus - - SE_EVENT_BUS_PUBLISH_PORT=4442 - - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - SE_ENABLE_TRACING=true - SE_OTEL_TRACES_EXPORTER=otlp - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 @@ -55,12 +52,8 @@ services: - selenium-session-queue environment: - SE_EVENT_BUS_HOST=selenium-event-bus - - SE_EVENT_BUS_PUBLISH_PORT=4442 - - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - SE_SESSIONS_MAP_HOST=selenium-sessions - - SE_SESSIONS_MAP_PORT=5556 - SE_SESSION_QUEUE_HOST=selenium-session-queue - - SE_SESSION_QUEUE_PORT=5559 - SE_ENABLE_TRACING=true - SE_OTEL_TRACES_EXPORTER=otlp - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 @@ -75,11 +68,8 @@ services: - selenium-session-queue environment: - SE_DISTRIBUTOR_HOST=selenium-distributor - - SE_DISTRIBUTOR_PORT=5553 - SE_SESSIONS_MAP_HOST=selenium-sessions - - SE_SESSIONS_MAP_PORT=5556 - SE_SESSION_QUEUE_HOST=selenium-session-queue - - SE_SESSION_QUEUE_PORT=5559 - SE_ENABLE_TRACING=true - SE_OTEL_TRACES_EXPORTER=otlp - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 @@ -90,8 +80,6 @@ services: - selenium-event-bus environment: - SE_EVENT_BUS_HOST=selenium-event-bus - - SE_EVENT_BUS_PUBLISH_PORT=4442 - - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - SE_ENABLE_TRACING=true - SE_OTEL_TRACES_EXPORTER=otlp - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 @@ -102,8 +90,6 @@ services: - selenium-event-bus environment: - SE_EVENT_BUS_HOST=selenium-event-bus - - SE_EVENT_BUS_PUBLISH_PORT=4442 - - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - SE_ENABLE_TRACING=true - SE_OTEL_TRACES_EXPORTER=otlp - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 @@ -114,8 +100,6 @@ services: - selenium-event-bus environment: - SE_EVENT_BUS_HOST=selenium-event-bus - - SE_EVENT_BUS_PUBLISH_PORT=4442 - - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - SE_ENABLE_TRACING=true - SE_OTEL_TRACES_EXPORTER=otlp - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 diff --git a/docker-compose-v3-full-grid.yml b/docker-compose-v3-full-grid.yml index 4e87e5b684..33631e6421 100644 --- a/docker-compose-v3-full-grid.yml +++ b/docker-compose-v3-full-grid.yml @@ -1,7 +1,6 @@ # To execute this docker compose yml file use `docker compose -f docker-compose-v3-full-grid.yml up` # Add the `-d` flag at the end for detached execution # To stop the execution, hit Ctrl+C, and then `docker compose -f docker-compose-v3-full-grid.yml down` -version: "3" services: selenium-event-bus: image: selenium/event-bus:4.29.0-20250222 @@ -20,8 +19,6 @@ services: - selenium-event-bus environment: - SE_EVENT_BUS_HOST=selenium-event-bus - - SE_EVENT_BUS_PUBLISH_PORT=4442 - - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 selenium-session-queue: image: selenium/session-queue:4.29.0-20250222 @@ -40,12 +37,8 @@ services: - selenium-session-queue environment: - SE_EVENT_BUS_HOST=selenium-event-bus - - SE_EVENT_BUS_PUBLISH_PORT=4442 - - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - SE_SESSIONS_MAP_HOST=selenium-sessions - - SE_SESSIONS_MAP_PORT=5556 - SE_SESSION_QUEUE_HOST=selenium-session-queue - - SE_SESSION_QUEUE_PORT=5559 selenium-router: image: selenium/router:4.29.0-20250222 @@ -58,11 +51,8 @@ services: - selenium-session-queue environment: - SE_DISTRIBUTOR_HOST=selenium-distributor - - SE_DISTRIBUTOR_PORT=5553 - SE_SESSIONS_MAP_HOST=selenium-sessions - - SE_SESSIONS_MAP_PORT=5556 - SE_SESSION_QUEUE_HOST=selenium-session-queue - - SE_SESSION_QUEUE_PORT=5559 chrome: image: selenium/node-chrome:4.29.0-20250222 @@ -71,8 +61,6 @@ services: - selenium-event-bus environment: - SE_EVENT_BUS_HOST=selenium-event-bus - - SE_EVENT_BUS_PUBLISH_PORT=4442 - - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 edge: image: selenium/node-edge:4.29.0-20250222 @@ -81,8 +69,6 @@ services: - selenium-event-bus environment: - SE_EVENT_BUS_HOST=selenium-event-bus - - SE_EVENT_BUS_PUBLISH_PORT=4442 - - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 firefox: image: selenium/node-firefox:4.29.0-20250222 @@ -91,5 +77,3 @@ services: - selenium-event-bus environment: - SE_EVENT_BUS_HOST=selenium-event-bus - - SE_EVENT_BUS_PUBLISH_PORT=4442 - - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 diff --git a/scripts/generate_list_env_vars/description.yaml b/scripts/generate_list_env_vars/description.yaml index 85eaf341b2..dc0bfa78e9 100644 --- a/scripts/generate_list_env_vars/description.yaml +++ b/scripts/generate_list_env_vars/description.yaml @@ -290,12 +290,6 @@ - name: SE_NODE_PRESTOP_WAIT_STRATEGY description: '' cli: '' -- name: SE_SESSIONS_HOST - description: '' - cli: '' -- name: SE_SESSIONS_PORT - description: '' - cli: '' - name: SE_SESSIONS_MAP_EXTERNAL_DATASTORE description: '' cli: '' diff --git a/scripts/generate_list_env_vars/value.yaml b/scripts/generate_list_env_vars/value.yaml index bc36aec2b3..b5b278e8b2 100644 --- a/scripts/generate_list_env_vars/value.yaml +++ b/scripts/generate_list_env_vars/value.yaml @@ -17,7 +17,7 @@ - name: SE_DISTRIBUTOR_HOST default: '' - name: SE_DISTRIBUTOR_PORT - default: '' + default: '5553' - name: SE_DRAIN_AFTER_SESSION_COUNT default: '0' - name: SE_ENABLE_BROWSER_LEFTOVERS_CLEANUP @@ -29,7 +29,7 @@ - name: SE_EVENT_BUS_HOST default: '' - name: SE_EVENT_BUS_PORT - default: '' + default: '5557' - name: SE_EVENT_BUS_PUBLISH_PORT default: '4442' - name: SE_EVENT_BUS_SUBSCRIBE_PORT @@ -51,7 +51,7 @@ - name: SE_HUB_HOST default: '' - name: SE_HUB_PORT - default: '' + default: '4444' - name: SE_JAVA_DISABLE_HOSTNAME_VERIFICATION default: 'true' - name: SE_JAVA_HEAP_DUMP @@ -173,7 +173,7 @@ - name: SE_ROUTER_PASSWORD default: '' - name: SE_ROUTER_PORT - default: '' + default: '4444' - name: SE_ROUTER_USERNAME default: '' - name: SE_SCREEN_DEPTH @@ -186,8 +186,6 @@ default: '1920' - name: SE_SERVER_PROTOCOL default: http -- name: SE_SESSIONS_HOST - default: '' - name: SE_SESSIONS_MAP_EXTERNAL_DATASTORE default: 'false' - name: SE_SESSIONS_MAP_EXTERNAL_HOSTNAME @@ -207,13 +205,11 @@ - name: SE_SESSIONS_MAP_HOST default: '' - name: SE_SESSIONS_MAP_PORT - default: '' -- name: SE_SESSIONS_PORT - default: '' + default: '5556' - name: SE_SESSION_QUEUE_HOST default: '' - name: SE_SESSION_QUEUE_PORT - default: '' + default: '5559' - name: SE_SESSION_REQUEST_TIMEOUT default: '300' - name: SE_SESSION_RETRY_INTERVAL diff --git a/tests/charts/make/chart_setup_env.sh b/tests/charts/make/chart_setup_env.sh index c895e2c94c..b2787b1e00 100755 --- a/tests/charts/make/chart_setup_env.sh +++ b/tests/charts/make/chart_setup_env.sh @@ -171,9 +171,9 @@ GOBIN=$HOME/go/bin go install github.com/norwoodj/helm-docs/cmd/helm-docs@latest $HOME/go/bin/helm-docs -h || true echo "===============================" echo "Installing envsubst for AMD64 / ARM64" -ENVSUBST_VERSION="1.4.2-patch.124" +ENVSUBST_VERSION="1.4.3" ARCH=$(if [ "$(dpkg --print-architecture)" = "amd64" ]; then echo "x86_64"; else echo "$(dpkg --print-architecture)"; fi) -curl -fsSL https://github.com/NDViet/envsubst/releases/download/v${ENVSUBST_VERSION}/envsubst-$(uname -s)-${ARCH} -o envsubst +curl -fsSL https://github.com/a8m/envsubst/releases/download/v${ENVSUBST_VERSION}/envsubst-$(uname -s)-${ARCH} -o envsubst chmod +x envsubst sudo mv envsubst /usr/local/bin sudo ln -sf /usr/local/bin/envsubst /usr/bin/envsubst