K8s: Resilient Helm config to override SE_DRAIN_AFTER_SESSION_COUNT

[VietND96]

User description

Thanks for contributing to the Docker-Selenium project!
A PR well described will help maintainers to quickly review and merge it

Before submitting your PR, please check our contributing guidelines, applied for this repository.
Avoid large PRs, help reviewers by making them as simple and short as possible.

Description

Fixes #2901

Motivation and Context

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to change)

Checklist

• I have read the contributing document.
• My change requires a change to the documentation.
• I have updated the documentation accordingly.
• I have added tests to cover my changes.
• All new and existing tests passed.

---

PR Type

Enhancement

---

Description

• Add configurable nodeDrainAfterSessionCount parameter for Selenium Grid nodes

• Enable per-node override of drain session count behavior

• Update Helm chart templates and test configurations

• Improve autoscaling behavior with job-based scaling

---

Diagram Walkthrough

flowchart LR
  A["Global Config"] --> B["Node Template"]
  B --> C["Environment Variable"]
  C --> D["SE_DRAIN_AFTER_SESSION_COUNT"]
  E["Per-Node Override"] --> B
  F["Test Configuration"] --> G["Chart Test"]

Loading

File Walkthrough

	Relevant files
Tests	chart_test.sh Add drain session count test configuration                              tests/charts/make/chart_test.sh Add TEST_NODE_DRAIN_AFTER_SESSION_COUNT environment variable with default value 0 Include new parameter in Helm command set for chart testing Update test configurations to use the new drain parameter +2/-0      Makefile Update test targets with drain configuration                          Makefile Add TEST_NODE_DRAIN_AFTER_SESSION_COUNT=3 to autoscaling test configurations Update chart test targets for deployment autoscaling scenarios +2/-2
Enhancement	_helpers.tpl Update pod template with drain session logic                          charts/selenium-grid/templates/_helpers.tpl Add nodeDrainAfterSessionCount variable extraction from values Update SE_DRAIN_AFTER_SESSION_COUNT logic to use max of nodeMaxSessions and nodeDrainAfterSessionCount Maintain backward compatibility with existing KEDA job scaling behavior +2/-1
Documentation	CONFIGURATION.md Document new drain session count configuration                      charts/selenium-grid/CONFIGURATION.md Add documentation for global.seleniumGrid.nodeDrainAfterSessionCount parameter Document per-node override options for all node types (chrome, firefox, edge, relay) Explain relationship with autoscaling and job scaling behavior +5/-0
Configuration changes	values.yaml Add drain session count values configuration                          charts/selenium-grid/values.yaml Add nodeDrainAfterSessionCount: 0 to global selenium grid configuration Add per-node nodeDrainAfterSessionCount override options for all node types Include explanatory comments about autoscaling behavior +12/-0

---

[qodo-merge-pro]

PR Reviewer Guide 🔍

Here are some key observations to aid the review process:

⏱️ Estimated effort to review: 3 🔵🔵🔵⚪⚪

🧪 PR contains tests

🔒 No security concerns identified

⚡ Recommended focus areas for review Logic Complexity The complex ternary expression for SE_DRAIN_AFTER_SESSION_COUNT combines multiple conditions and functions (max, ternary, eq) which could be error-prone and difficult to debug. Consider breaking this into multiple steps or adding validation. value: {{ and (eq (include "seleniumGrid.useKEDA" $) "true") (eq .Values.autoscaling.scalingType "job") | ternary (max $nodeMaxSessions $nodeDrainAfterSessionCount) $nodeDrainAfterSessionCount | quote }} {{- with .node.relayUrl }} Configuration Clarity The comment about precedence behavior when nodeDrainAfterSessionCount > nodeMaxSessions in job scaling could be confusing. The logic should be clearly documented and validated to prevent unexpected scaling behavior. # Noted:In case of autoscaling enabled, with scaling type `job`, Node will be drained following `nodeMaxSessions` by default # If changing `nodeDrainAfterSessionCount` > `nodeMaxSessions` it will take precedence over `nodeMaxSessions` in scaling type `job` # -- Set number of sessions will be executed in a Node before detaching it from Hub and shutting it down

[qodo-merge-pro]

PR Code Suggestions ✨

No code suggestions found for the PR.