diff --git a/Distributor/start-selenium-grid-distributor.sh b/Distributor/start-selenium-grid-distributor.sh index 1e61d1583..ba5dcbecd 100755 --- a/Distributor/start-selenium-grid-distributor.sh +++ b/Distributor/start-selenium-grid-distributor.sh @@ -30,13 +30,13 @@ if [[ -z "${SE_SESSIONS_MAP_PORT}" ]]; then exit 1 fi -if [[ -z "${SE_SESSION_QUEUER_HOST}" ]]; then - echo "SE_SESSION_QUEUER_HOST not set, exiting!" 1>&2 +if [[ -z "${SE_SESSION_QUEUE_HOST}" ]]; then + echo "SE_SESSION_QUEUE_HOST not set, exiting!" 1>&2 exit 1 fi -if [[ -z "${SE_SESSION_QUEUER_PORT}" ]]; then - echo "SE_SESSION_QUEUER_PORT not set, exiting!" 1>&2 +if [[ -z "${SE_SESSION_QUEUE_PORT}" ]]; then + echo "SE_SESSION_QUEUE_PORT not set, exiting!" 1>&2 exit 1 fi @@ -57,7 +57,7 @@ fi java ${JAVA_OPTS} -jar /opt/selenium/selenium-server.jar distributor \ --sessions-host "${SE_SESSIONS_MAP_HOST}" --sessions-port "${SE_SESSIONS_MAP_PORT}" \ - --sessionqueuer-host "${SE_SESSION_QUEUER_HOST}" --sessionqueuer-port "${SE_SESSION_QUEUER_PORT}" \ + --sessionqueue-host "${SE_SESSION_QUEUE_HOST}" --sessionqueue-port "${SE_SESSION_QUEUE_PORT}" \ --publish-events tcp://"${SE_EVENT_BUS_HOST}":"${SE_EVENT_BUS_PUBLISH_PORT}" \ --subscribe-events tcp://"${SE_EVENT_BUS_HOST}":"${SE_EVENT_BUS_SUBSCRIBE_PORT}" \ --bind-bus false \ diff --git a/Makefile b/Makefile index 2612ce0fc..e379877cc 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ all: hub \ distributor \ router \ sessions \ - sessionqueuer \ + sessionqueue \ event_bus \ chrome \ edge \ @@ -33,7 +33,7 @@ generate_all: \ generate_distributor \ generate_router \ generate_sessions \ - generate_sessionqueuer \ + generate_sessionqueue \ generate_event_bus \ generate_node_base \ generate_chrome \ @@ -76,11 +76,11 @@ generate_sessions: sessions: base generate_sessions cd ./Sessions && docker build $(BUILD_ARGS) -t $(NAME)/sessions:$(TAG_VERSION) . -generate_sessionqueuer: - cd ./SessionQueuer && ./generate.sh $(TAG_VERSION) $(NAMESPACE) $(AUTHORS) +generate_sessionqueue: + cd ./SessionQueue && ./generate.sh $(TAG_VERSION) $(NAMESPACE) $(AUTHORS) -sessionqueuer: base generate_sessionqueuer - cd ./SessionQueuer && docker build $(BUILD_ARGS) -t $(NAME)/session-queuer:$(TAG_VERSION) . +sessionqueue: base generate_sessionqueue + cd ./SessionQueue && docker build $(BUILD_ARGS) -t $(NAME)/session-queue:$(TAG_VERSION) . generate_event_bus: cd ./EventBus && ./generate.sh $(TAG_VERSION) $(NAMESPACE) $(AUTHORS) @@ -165,7 +165,7 @@ tag_latest: docker tag $(NAME)/distributor:$(TAG_VERSION) $(NAME)/distributor:latest docker tag $(NAME)/router:$(TAG_VERSION) $(NAME)/router:latest docker tag $(NAME)/sessions:$(TAG_VERSION) $(NAME)/sessions:latest - docker tag $(NAME)/session-queuer:$(TAG_VERSION) $(NAME)/session-queuer:latest + docker tag $(NAME)/session-queue:$(TAG_VERSION) $(NAME)/session-queue:latest docker tag $(NAME)/event-bus:$(TAG_VERSION) $(NAME)/event-bus:latest docker tag $(NAME)/node-base:$(TAG_VERSION) $(NAME)/node-base:latest docker tag $(NAME)/node-chrome:$(TAG_VERSION) $(NAME)/node-chrome:latest @@ -183,7 +183,7 @@ release_latest: docker push $(NAME)/distributor:latest docker push $(NAME)/router:latest docker push $(NAME)/sessions:latest - docker push $(NAME)/session-queuer:latest + docker push $(NAME)/session-queue:latest docker push $(NAME)/event-bus:latest docker push $(NAME)/node-base:latest docker push $(NAME)/node-chrome:latest @@ -201,7 +201,7 @@ tag_major_minor: docker tag $(NAME)/distributor:$(TAG_VERSION) $(NAME)/distributor:$(MAJOR) docker tag $(NAME)/router:$(TAG_VERSION) $(NAME)/router:$(MAJOR) docker tag $(NAME)/sessions:$(TAG_VERSION) $(NAME)/sessions:$(MAJOR) - docker tag $(NAME)/session-queuer:$(TAG_VERSION) $(NAME)/session-queuer:$(MAJOR) + docker tag $(NAME)/session-queue:$(TAG_VERSION) $(NAME)/session-queue:$(MAJOR) docker tag $(NAME)/event-bus:$(TAG_VERSION) $(NAME)/event-bus:$(MAJOR) docker tag $(NAME)/node-base:$(TAG_VERSION) $(NAME)/node-base:$(MAJOR) docker tag $(NAME)/node-chrome:$(TAG_VERSION) $(NAME)/node-chrome:$(MAJOR) @@ -217,7 +217,7 @@ tag_major_minor: docker tag $(NAME)/distributor:$(TAG_VERSION) $(NAME)/distributor:$(MAJOR).$(MINOR) docker tag $(NAME)/router:$(TAG_VERSION) $(NAME)/router:$(MAJOR).$(MINOR) docker tag $(NAME)/sessions:$(TAG_VERSION) $(NAME)/sessions:$(MAJOR).$(MINOR) - docker tag $(NAME)/session-queuer:$(TAG_VERSION) $(NAME)/session-queuer:$(MAJOR).$(MINOR) + docker tag $(NAME)/session-queue:$(TAG_VERSION) $(NAME)/session-queue:$(MAJOR).$(MINOR) docker tag $(NAME)/event-bus:$(TAG_VERSION) $(NAME)/event-bus:$(MAJOR).$(MINOR) docker tag $(NAME)/node-base:$(TAG_VERSION) $(NAME)/node-base:$(MAJOR).$(MINOR) docker tag $(NAME)/node-chrome:$(TAG_VERSION) $(NAME)/node-chrome:$(MAJOR).$(MINOR) @@ -233,7 +233,7 @@ tag_major_minor: docker tag $(NAME)/distributor:$(TAG_VERSION) $(NAME)/distributor:$(MAJOR_MINOR_PATCH) docker tag $(NAME)/router:$(TAG_VERSION) $(NAME)/router:$(MAJOR_MINOR_PATCH) docker tag $(NAME)/sessions:$(TAG_VERSION) $(NAME)/sessions:$(MAJOR_MINOR_PATCH) - docker tag $(NAME)/session-queuer:$(TAG_VERSION) $(NAME)/session-queuer:$(MAJOR_MINOR_PATCH) + docker tag $(NAME)/session-queue:$(TAG_VERSION) $(NAME)/session-queue:$(MAJOR_MINOR_PATCH) docker tag $(NAME)/event-bus:$(TAG_VERSION) $(NAME)/event-bus:$(MAJOR_MINOR_PATCH) docker tag $(NAME)/node-base:$(TAG_VERSION) $(NAME)/node-base:$(MAJOR_MINOR_PATCH) docker tag $(NAME)/node-chrome:$(TAG_VERSION) $(NAME)/node-chrome:$(MAJOR_MINOR_PATCH) @@ -251,7 +251,7 @@ release: tag_major_minor @if ! docker images $(NAME)/distributor | awk '{ print $$2 }' | grep -q -F $(TAG_VERSION); then echo "$(NAME)/distributor version $(TAG_VERSION) is not yet built. Please run 'make build'"; false; fi @if ! docker images $(NAME)/router | awk '{ print $$2 }' | grep -q -F $(TAG_VERSION); then echo "$(NAME)/router version $(TAG_VERSION) is not yet built. Please run 'make build'"; false; fi @if ! docker images $(NAME)/sessions | awk '{ print $$2 }' | grep -q -F $(TAG_VERSION); then echo "$(NAME)/sessions version $(TAG_VERSION) is not yet built. Please run 'make build'"; false; fi - @if ! docker images $(NAME)/session-queuer | awk '{ print $$2 }' | grep -q -F $(TAG_VERSION); then echo "$(NAME)/session-queuer version $(TAG_VERSION) is not yet built. Please run 'make build'"; false; fi + @if ! docker images $(NAME)/session-queue | awk '{ print $$2 }' | grep -q -F $(TAG_VERSION); then echo "$(NAME)/session-queue version $(TAG_VERSION) is not yet built. Please run 'make build'"; false; fi @if ! docker images $(NAME)/event-bus | awk '{ print $$2 }' | grep -q -F $(TAG_VERSION); then echo "$(NAME)/event-bus version $(TAG_VERSION) is not yet built. Please run 'make build'"; false; fi @if ! docker images $(NAME)/node-base | awk '{ print $$2 }' | grep -q -F $(TAG_VERSION); then echo "$(NAME)/node-base version $(TAG_VERSION) is not yet built. Please run 'make build'"; false; fi @if ! docker images $(NAME)/node-chrome | awk '{ print $$2 }' | grep -q -F $(TAG_VERSION); then echo "$(NAME)/node-chrome version $(TAG_VERSION) is not yet built. Please run 'make build'"; false; fi @@ -267,7 +267,7 @@ release: tag_major_minor docker push $(NAME)/distributor:$(TAG_VERSION) docker push $(NAME)/router:$(TAG_VERSION) docker push $(NAME)/sessions:$(TAG_VERSION) - docker push $(NAME)/session-queuer:$(TAG_VERSION) + docker push $(NAME)/session-queue:$(TAG_VERSION) docker push $(NAME)/event-bus:$(TAG_VERSION) docker push $(NAME)/node-base:$(TAG_VERSION) docker push $(NAME)/node-chrome:$(TAG_VERSION) @@ -283,7 +283,7 @@ release: tag_major_minor docker push $(NAME)/distributor:$(MAJOR) docker push $(NAME)/router:$(MAJOR) docker push $(NAME)/sessions:$(MAJOR) - docker push $(NAME)/session-queuer:$(MAJOR) + docker push $(NAME)/session-queue:$(MAJOR) docker push $(NAME)/event-bus:$(MAJOR) docker push $(NAME)/node-base:$(MAJOR) docker push $(NAME)/node-chrome:$(MAJOR) @@ -299,7 +299,7 @@ release: tag_major_minor docker push $(NAME)/distributor:$(MAJOR).$(MINOR) docker push $(NAME)/router:$(MAJOR).$(MINOR) docker push $(NAME)/sessions:$(MAJOR).$(MINOR) - docker push $(NAME)/session-queuer:$(MAJOR).$(MINOR) + docker push $(NAME)/session-queue:$(MAJOR).$(MINOR) docker push $(NAME)/event-bus:$(MAJOR).$(MINOR) docker push $(NAME)/node-base:$(MAJOR).$(MINOR) docker push $(NAME)/node-chrome:$(MAJOR).$(MINOR) @@ -315,7 +315,7 @@ release: tag_major_minor docker push $(NAME)/distributor:$(MAJOR_MINOR_PATCH) docker push $(NAME)/router:$(MAJOR_MINOR_PATCH) docker push $(NAME)/sessions:$(MAJOR_MINOR_PATCH) - docker push $(NAME)/session-queuer:$(MAJOR_MINOR_PATCH) + docker push $(NAME)/session-queue:$(MAJOR_MINOR_PATCH) docker push $(NAME)/event-bus:$(MAJOR_MINOR_PATCH) docker push $(NAME)/node-base:$(MAJOR_MINOR_PATCH) docker push $(NAME)/node-chrome:$(MAJOR_MINOR_PATCH) @@ -397,7 +397,7 @@ test_video: video hub chrome firefox edge generate_distributor \ generate_router \ generate_sessions \ - generate_sessionqueuer \ + generate_sessionqueue \ generate_event_bus \ generate_node_base \ generate_chrome \ @@ -412,7 +412,7 @@ test_video: video hub chrome firefox edge distributor \ router \ sessions \ - sessionqueuer \ + sessionqueue \ event_bus \ node_base \ release \ diff --git a/Router/start-selenium-grid-router.sh b/Router/start-selenium-grid-router.sh index ebd4c7663..01e339ff7 100755 --- a/Router/start-selenium-grid-router.sh +++ b/Router/start-selenium-grid-router.sh @@ -25,13 +25,13 @@ if [[ -z "${SE_DISTRIBUTOR_PORT}" ]]; then exit 1 fi -if [[ -z "${SE_SESSION_QUEUER_HOST}" ]]; then - echo "SE_SESSION_QUEUER_HOST not set, exiting!" 1>&2 +if [[ -z "${SE_SESSION_QUEUE_HOST}" ]]; then + echo "SE_SESSION_QUEUE_HOST not set, exiting!" 1>&2 exit 1 fi -if [[ -z "${SE_SESSION_QUEUER_PORT}" ]]; then - echo "SE_SESSION_QUEUER_PORT not set, exiting!" 1>&2 +if [[ -z "${SE_SESSION_QUEUE_PORT}" ]]; then + echo "SE_SESSION_QUEUE_PORT not set, exiting!" 1>&2 exit 1 fi @@ -52,7 +52,7 @@ fi java ${JAVA_OPTS} -jar /opt/selenium/selenium-server.jar router \ --sessions-host "${SE_SESSIONS_MAP_HOST}" --sessions-port "${SE_SESSIONS_MAP_PORT}" \ --distributor-host "${SE_DISTRIBUTOR_HOST}" --distributor-port "${SE_DISTRIBUTOR_PORT}" \ - --sessionqueuer-host "${SE_SESSION_QUEUER_HOST}" --sessionqueuer-port "${SE_SESSION_QUEUER_PORT}" \ + --sessionqueue-host "${SE_SESSION_QUEUE_HOST}" --sessionqueue-port "${SE_SESSION_QUEUE_PORT}" \ --relax-checks true \ ${HOST_CONFIG} \ ${PORT_CONFIG} \ diff --git a/SessionQueuer/Dockerfile b/SessionQueue/Dockerfile similarity index 72% rename from SessionQueuer/Dockerfile rename to SessionQueue/Dockerfile index 2a62832a2..2c47c57a3 100644 --- a/SessionQueuer/Dockerfile +++ b/SessionQueue/Dockerfile @@ -8,12 +8,12 @@ LABEL authors=SeleniumHQ USER 1200 #======================== -# Selenium SessionQueuer Configuration +# Selenium SessionQueue Configuration #======================== EXPOSE 5559 -COPY start-selenium-grid-session-queuer.sh \ +COPY start-selenium-grid-session-queue.sh \ /opt/bin/ -COPY selenium-grid-session-queuer.conf /etc/supervisor/conf.d/ +COPY selenium-grid-session-queue.conf /etc/supervisor/conf.d/ diff --git a/SessionQueue/Dockerfile.txt b/SessionQueue/Dockerfile.txt new file mode 100644 index 000000000..f831dada8 --- /dev/null +++ b/SessionQueue/Dockerfile.txt @@ -0,0 +1,12 @@ +USER 1200 + +#======================== +# Selenium SessionQueue Configuration +#======================== + +EXPOSE 5559 + +COPY start-selenium-grid-session-queue.sh \ + /opt/bin/ + +COPY selenium-grid-session-queue.conf /etc/supervisor/conf.d/ diff --git a/SessionQueuer/generate.sh b/SessionQueue/generate.sh similarity index 100% rename from SessionQueuer/generate.sh rename to SessionQueue/generate.sh diff --git a/SessionQueuer/selenium-grid-session-queuer.conf b/SessionQueue/selenium-grid-session-queue.conf similarity index 76% rename from SessionQueuer/selenium-grid-session-queuer.conf rename to SessionQueue/selenium-grid-session-queue.conf index 5672dd22e..e82308526 100644 --- a/SessionQueuer/selenium-grid-session-queuer.conf +++ b/SessionQueue/selenium-grid-session-queue.conf @@ -1,9 +1,9 @@ ; Documentation of this file format -> http://supervisord.org/configuration.html -[program:selenium-grid-session-queuer] +[program:selenium-grid-session-queue] priority=0 -command=/opt/bin/start-selenium-grid-session-queuer.sh +command=/opt/bin/start-selenium-grid-session-queue.sh autostart=true autorestart=false startsecs=0 diff --git a/SessionQueuer/start-selenium-grid-session-queuer.sh b/SessionQueue/start-selenium-grid-session-queue.sh similarity index 68% rename from SessionQueuer/start-selenium-grid-session-queuer.sh rename to SessionQueue/start-selenium-grid-session-queue.sh index de706faf0..2621f7077 100755 --- a/SessionQueuer/start-selenium-grid-session-queuer.sh +++ b/SessionQueue/start-selenium-grid-session-queue.sh @@ -3,7 +3,7 @@ # set -e: exit asap if a command exits with a non-zero status set -e -echo "Starting Selenium Grid SessionQueuer..." +echo "Starting Selenium Grid SessionQueue..." if [[ -z "${SE_EVENT_BUS_HOST}" ]]; then echo "SE_EVENT_BUS_HOST not set, exiting!" 1>&2 @@ -24,17 +24,17 @@ if [ ! -z "$SE_OPTS" ]; then echo "Appending Selenium options: ${SE_OPTS}" fi -if [ ! -z "$SE_SESSION_QUEUER_HOST" ]; then - echo "Using SE_SESSION_QUEUER_HOST: ${SE_SESSION_QUEUER_HOST}" - HOST_CONFIG="--host ${SE_SESSION_QUEUER_HOST}" +if [ ! -z "$SE_SESSION_QUEUE_HOST" ]; then + echo "Using SE_SESSION_QUEUE_HOST: ${SE_SESSION_QUEUE_HOST}" + HOST_CONFIG="--host ${SE_SESSION_QUEUE_HOST}" fi -if [ ! -z "$SE_SESSION_QUEUER_PORT" ]; then - echo "Using SE_SESSION_QUEUER_PORT: ${SE_SESSION_QUEUER_PORT}" - PORT_CONFIG="--port ${SE_SESSION_QUEUER_PORT}" +if [ ! -z "$SE_SESSION_QUEUE_PORT" ]; then + echo "Using SE_SESSION_QUEUE_PORT: ${SE_SESSION_QUEUE_PORT}" + PORT_CONFIG="--port ${SE_SESSION_QUEUE_PORT}" fi -java ${JAVA_OPTS} -jar /opt/selenium/selenium-server.jar sessionqueuer \ +java ${JAVA_OPTS} -jar /opt/selenium/selenium-server.jar sessionqueue \ --publish-events tcp://"${SE_EVENT_BUS_HOST}":${SE_EVENT_BUS_PUBLISH_PORT} \ --subscribe-events tcp://"${SE_EVENT_BUS_HOST}":${SE_EVENT_BUS_SUBSCRIBE_PORT} \ ${HOST_CONFIG} \ diff --git a/SessionQueuer/Dockerfile.txt b/SessionQueuer/Dockerfile.txt deleted file mode 100644 index 9905112c8..000000000 --- a/SessionQueuer/Dockerfile.txt +++ /dev/null @@ -1,12 +0,0 @@ -USER 1200 - -#======================== -# Selenium SessionQueuer Configuration -#======================== - -EXPOSE 5559 - -COPY start-selenium-grid-session-queuer.sh \ - /opt/bin/ - -COPY selenium-grid-session-queuer.conf /etc/supervisor/conf.d/ diff --git a/docker-compose-v3-full-grid-dev.yml b/docker-compose-v3-full-grid-dev.yml index c7d0d48af..c3f10630e 100644 --- a/docker-compose-v3-full-grid-dev.yml +++ b/docker-compose-v3-full-grid-dev.yml @@ -27,11 +27,11 @@ services: - SE_EVENT_BUS_PUBLISH_PORT=4442 - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - selenium-session-queuer: - image: selenium/session-queuer:4.0.0-beta-4-prerelease-20210513 + selenium-session-queue: + image: selenium/session-queue:4.0.0-beta-4-prerelease-20210513 volumes: - ./selenium_server_deploy.jar:/opt/selenium/selenium-server.jar - container_name: selenium-session-queuer + container_name: selenium-session-queue ports: - "5559:5559" depends_on: @@ -51,15 +51,15 @@ services: depends_on: - selenium-event-bus - selenium-sessions - - selenium-session-queuer + - 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_QUEUER_HOST=selenium-session-queuer - - SE_SESSION_QUEUER_PORT=5559 + - SE_SESSION_QUEUE_HOST=selenium-session-queue + - SE_SESSION_QUEUE_PORT=5559 selenium-router: image: selenium/router:4.0.0-beta-4-prerelease-20210513 @@ -71,14 +71,14 @@ services: depends_on: - selenium-distributor - selenium-sessions - - selenium-session-queuer + - 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_QUEUER_HOST=selenium-session-queuer - - SE_SESSION_QUEUER_PORT=5559 + - SE_SESSION_QUEUE_HOST=selenium-session-queue + - SE_SESSION_QUEUE_PORT=5559 chrome: image: selenium/node-chrome:4.0.0-beta-4-prerelease-20210513 diff --git a/docker-compose-v3-full-grid.yml b/docker-compose-v3-full-grid.yml index 8e90503d2..8e5cef3a8 100644 --- a/docker-compose-v3-full-grid.yml +++ b/docker-compose-v3-full-grid.yml @@ -23,9 +23,9 @@ services: - SE_EVENT_BUS_PUBLISH_PORT=4442 - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - selenium-session-queuer: - image: selenium/session-queuer:4.0.0-beta-4-prerelease-20210513 - container_name: selenium-session-queuer + selenium-session-queue: + image: selenium/session-queue:4.0.0-beta-4-prerelease-20210513 + container_name: selenium-session-queue ports: - "5559:5559" depends_on: @@ -43,15 +43,15 @@ services: depends_on: - selenium-event-bus - selenium-sessions - - selenium-session-queuer + - 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_QUEUER_HOST=selenium-session-queuer - - SE_SESSION_QUEUER_PORT=5559 + - SE_SESSION_QUEUE_HOST=selenium-session-queue + - SE_SESSION_QUEUE_PORT=5559 selenium-router: image: selenium/router:4.0.0-beta-4-prerelease-20210513 @@ -61,14 +61,14 @@ services: depends_on: - selenium-distributor - selenium-sessions - - selenium-session-queuer + - 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_QUEUER_HOST=selenium-session-queuer - - SE_SESSION_QUEUER_PORT=5559 + - SE_SESSION_QUEUE_HOST=selenium-session-queue + - SE_SESSION_QUEUE_PORT=5559 chrome: image: selenium/node-chrome:4.0.0-beta-4-prerelease-20210513 diff --git a/k8s-deployment-full-grid.yaml b/k8s-deployment-full-grid.yaml index 4655abd23..3ba34cec3 100644 --- a/k8s-deployment-full-grid.yaml +++ b/k8s-deployment-full-grid.yaml @@ -113,18 +113,18 @@ spec: protocol: TCP --- #*************************************** -#SELENIUM SESSION QUEUER +#SELENIUM SESSION QUEUE #*************************************** apiVersion: v1 kind: Service metadata: - name: selenium-session-queuer + name: selenium-session-queue labels: - name: selenium-session-queuer + name: selenium-session-queue component: "selenium-grid-4" spec: selector: - app: selenium-session-queuer + app: selenium-session-queue ports: - name: port1 protocol: TCP @@ -134,26 +134,26 @@ spec: apiVersion: apps/v1 kind: Deployment metadata: - name: selenium-session-queuer-deployment + name: selenium-session-queue-deployment labels: - app: selenium-session-queuer - name: selenium-session-queuer + app: selenium-session-queue + name: selenium-session-queue component: "selenium-grid-4" spec: replicas: 1 selector: matchLabels: - app: selenium-session-queuer + app: selenium-session-queue template: metadata: labels: - app: selenium-session-queuer - name: selenium-session-queuer + app: selenium-session-queue + name: selenium-session-queue component: "selenium-grid-4" spec: containers: - - name: selenium-session-queuer - image: selenium/session-queuer:4.0.0-beta-4-prerelease-20210513 + - name: selenium-session-queue + image: selenium/session-queue:4.0.0-beta-4-prerelease-20210513 env: - name: SE_EVENT_BUS_HOST value: "selenium-event-bus" @@ -219,9 +219,9 @@ spec: value: "selenium-sessions" - name: SE_SESSIONS_MAP_PORT value: "5556" - - name: SE_SESSION_QUEUER_HOST - value: "selenium-session-queuer" - - name: SE_SESSION_QUEUER_PORT + - name: SE_SESSION_QUEUE_HOST + value: "selenium-session-queue" + - name: SE_SESSION_QUEUE_PORT value: "5559" ports: - containerPort: 5553 @@ -279,9 +279,9 @@ spec: value: "selenium-sessions" - name: SE_SESSIONS_MAP_PORT value: "5556" - - name: SE_SESSION_QUEUER_HOST - value: "selenium-session-queuer" - - name: SE_SESSION_QUEUER_PORT + - name: SE_SESSION_QUEUE_HOST + value: "selenium-session-queue" + - name: SE_SESSION_QUEUE_PORT value: "5559" ports: - containerPort: 4444