From 3a4e49f003d70615e52ada0e6c19fe95f07a96c7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 24 Apr 2026 01:44:41 +0000
Subject: [PATCH 1/2] Update ubuntu Docker tag to v26

---
 .ffmpeg/Dockerfile | 4 ++--
 Base/Dockerfile    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.ffmpeg/Dockerfile b/.ffmpeg/Dockerfile
index 2767bbe83..cf7f49d76 100644
--- a/.ffmpeg/Dockerfile
+++ b/.ffmpeg/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:noble AS builder
+FROM ubuntu:resolute AS builder
 ARG FFMPEG_VERSION="8.1"
 ARG RCLONE_VER="v1.73-stable"
 ARG GO_VERSION="latest"
@@ -80,7 +80,7 @@ RUN cd /usr/local/src \
     && make install
 
 # Final stage
-FROM ubuntu:noble
+FROM ubuntu:resolute
 
 USER root
 
diff --git a/Base/Dockerfile b/Base/Dockerfile
index 1c4c06ccf..10879d97e 100644
--- a/Base/Dockerfile
+++ b/Base/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:noble@sha256:c4a8d5503dfb2a3eb8ab5f807da5bc69a85730fb49b5cfca2330194ebcc41c7b
+FROM ubuntu:resolute@sha256:5e275723f82c67e387ba9e3c24baa0abdcb268917f276a0561c97bef9450d0b4
 ARG AUTHORS=SeleniumHQ
 LABEL authors="${AUTHORS} <docker-selenium@seleniumhq.org>"
 LABEL org.opencontainers.image.source="https://github.com/${AUTHORS}/docker-selenium"

From 2c0c8f94801bf02f4ecb9e493c6246fb216b663a Mon Sep 17 00:00:00 2001
From: Selenium CI Bot <selenium-ci@users.noreply.github.com>
Date: Fri, 24 Apr 2026 01:46:10 +0000
Subject: [PATCH 2/2] [ci] Update chart configuration table

[skip test]
---
 charts/selenium-grid/CONFIGURATION.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/charts/selenium-grid/CONFIGURATION.md b/charts/selenium-grid/CONFIGURATION.md
index 18552e7f9..f4a8488ab 100644
--- a/charts/selenium-grid/CONFIGURATION.md
+++ b/charts/selenium-grid/CONFIGURATION.md
@@ -400,6 +400,26 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
 | monitoring.additionalScrapeConfigs.key | string | `""` |  |
 | monitoring.additionalScrapeConfigs.value | string | `""` |  |
 | monitoring.annotations | object | `{}` |  |
+| monitoring.serviceMonitor | object | `{"annotations":{},"enabled":false,"interval":"30s","labels":{},"metricRelabelings":[],"namespace":"","path":"/metrics","relabelings":[],"scrapeTimeout":"10s"}` | ServiceMonitor configuration for Prometheus Operator |
+| monitoring.serviceMonitor.enabled | bool | `false` | Enable ServiceMonitor resource |
+| monitoring.serviceMonitor.namespace | string | `""` | Namespace to deploy the ServiceMonitor into (defaults to release namespace) |
+| monitoring.serviceMonitor.labels | object | `{}` | Additional labels for the ServiceMonitor |
+| monitoring.serviceMonitor.annotations | object | `{}` | Additional annotations for the ServiceMonitor |
+| monitoring.serviceMonitor.path | string | `"/metrics"` | Metrics scrape path |
+| monitoring.serviceMonitor.interval | string | `"30s"` | Scrape interval |
+| monitoring.serviceMonitor.scrapeTimeout | string | `"10s"` | Scrape timeout |
+| monitoring.serviceMonitor.relabelings | list | `[]` | RelabelConfigs to apply to samples before scraping |
+| monitoring.serviceMonitor.metricRelabelings | list | `[]` | MetricRelabelConfigs to apply to samples before ingestion |
+| monitoring.podMonitor | object | `{"annotations":{},"enabled":false,"interval":"30s","labels":{},"metricRelabelings":[],"namespace":"","path":"/metrics","relabelings":[],"scrapeTimeout":"10s"}` | PodMonitor configuration for Prometheus Operator (alternative to ServiceMonitor) |
+| monitoring.podMonitor.enabled | bool | `false` | Enable PodMonitor resource |
+| monitoring.podMonitor.namespace | string | `""` | Namespace to deploy the PodMonitor into (defaults to release namespace) |
+| monitoring.podMonitor.labels | object | `{}` | Additional labels for the PodMonitor |
+| monitoring.podMonitor.annotations | object | `{}` | Additional annotations for the PodMonitor |
+| monitoring.podMonitor.path | string | `"/metrics"` | Metrics scrape path |
+| monitoring.podMonitor.interval | string | `"30s"` | Scrape interval |
+| monitoring.podMonitor.scrapeTimeout | string | `"10s"` | Scrape timeout |
+| monitoring.podMonitor.relabelings | list | `[]` | RelabelConfigs to apply to samples before scraping |
+| monitoring.podMonitor.metricRelabelings | list | `[]` | MetricRelabelConfigs to apply to samples before ingestion |
 | autoscaling.enabled | bool | `false` | Enable autoscaling. Implies installing KEDA |
 | autoscaling.enableWithExistingKEDA | bool | `false` | Enable autoscaling without automatically installing KEDA |
 | autoscaling.scalingType | string | `"job"` | Which type of KEDA scaling to use: job or deployment |