Docker: Use GreedySlotSelector in Hub and Standalone (#2915)

Author: VietND96

Base/Dockerfile

@@ -203,6 +203,7 @@ ENV SE_BIND_HOST="false" \
     SE_SERVER_PROTOCOL="http" \
     # Boolean value, maps "--reject-unsupported-caps"
     SE_REJECT_UNSUPPORTED_CAPS="false" \
+    SE_DISTRIBUTOR_SLOT_SELECTOR="org.openqa.selenium.grid.distributor.selector.GreedySlotSelector" \
     SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED="true" \
     SE_OTEL_TRACES_EXPORTER="otlp" \
     SE_SUPERVISORD_LOG_LEVEL="info" \

ENV_VARIABLES.md

@@ -154,4 +154,4 @@
 | SE_VIDEO_MAXRATE |  |  |  |
 | SE_NODE_DELETE_SESSION_ON_UI | true | Enable capability to support deleting session on Grid UI | --delete-session-on-ui |
 | SE_UPDATE_CHROME_COMPONENTS |  | Applicable for node-chrome, standalone-chrome (arch linux/amd64). Update the latest version of Chrome and ChromeDriver at the beginning of the container startup. Read more: [#2872](https://github.com/SeleniumHQ/docker-selenium/pull/2872) |  |
-| SE_DISTRIBUTOR_SLOT_SELECTOR |  | Full class name of non-default slot selector. This is used to select a slot in a Node once the Node has been matched. | --slot-selector |
+| SE_DISTRIBUTOR_SLOT_SELECTOR | org.openqa.selenium.grid.distributor.selector.GreedySlotSelector | Full class name of non-default slot selector. This is used to select a slot in a Node once the Node has been matched. Switch to default, use class name `org.openqa.selenium.grid.distributor.selector.DefaultSlotSelector` | --slot-selector |

charts/selenium-grid/CONFIGURATION.md

@@ -411,6 +411,7 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
 | autoscaling.patchObjectFinalizers.imagePullSecret | string | `""` | Custom pull secret for container in patch job |
 | autoscaling.patchObjectFinalizers.resources | object | `{"limits":{"cpu":"200m","memory":"500Mi"},"requests":{"cpu":"100m","memory":"200Mi"}}` | Define resources for container in patch job |
 | autoscaling.patchObjectFinalizers.nodeSelector | object | `{}` | Node selector for the patch job |
+| autoscaling.patchObjectFinalizers.tolerations | list | `[]` | Tolerations for the patch job |
 | autoscaling.scaledOptions | object | `{"maxReplicaCount":24,"minReplicaCount":0,"pollingInterval":20}` | Options for KEDA scaled resources (keep only common options used for both ScaledJob and ScaledObject) |
 | autoscaling.scaledOptions.minReplicaCount | int | `0` | Minimum number of replicas |
 | autoscaling.scaledOptions.maxReplicaCount | int | `24` | Maximum number of replicas |

charts/selenium-grid/values.yaml

@@ -1080,6 +1080,8 @@ autoscaling:
         memory: 500Mi
     # -- Node selector for the patch job
     nodeSelector: {}
+    # -- Tolerations for the patch job
+    tolerations: []
   # -- Options for KEDA scaled resources (keep only common options used for both ScaledJob and ScaledObject)
   scaledOptions:
     # Don't define `triggers` config here, it will apply the same to all node types. Instead, define it under `scaledOptions` of different node type

scripts/generate_list_env_vars/description.yaml

@@ -479,5 +479,6 @@
   cli: ''
 - name: SE_DISTRIBUTOR_SLOT_SELECTOR
   description: Full class name of non-default slot selector. This is used to select
-    a slot in a Node once the Node has been matched.
+    a slot in a Node once the Node has been matched. Switch to default, use class
+    name `org.openqa.selenium.grid.distributor.selector.DefaultSlotSelector`
   cli: --slot-selector

scripts/generate_list_env_vars/value.yaml

@@ -19,7 +19,7 @@
 - name: SE_DISTRIBUTOR_PORT
   default: '5553'
 - name: SE_DISTRIBUTOR_SLOT_SELECTOR
-  default: ''
+  default: org.openqa.selenium.grid.distributor.selector.GreedySlotSelector
 - name: SE_DRAIN_AFTER_SESSION_COUNT
   default: '0'
 - name: SE_ENABLE_BROWSER_LEFTOVERS_CLEANUP