Prep v2 release/1.21.1 (#22354)

* fix: changelog for xDS load-balancing

* update: ubi9-minimal to 9.6 in Dockerfile

* update: suppress ubi9 container CVEs

* update: suppress ubi9 container CVEs

* remove: .github/workflows in reusable-conditional-skip

Author: sreeram77

.github/workflows/reusable-conditional-skip.yml

@@ -52,6 +52,7 @@ jobs:
             grafana/**
             .changelog/**
             .github/CODEOWNERS
+            .release/security-scan.hcl
       - name: Print changed files
         env:
           SKIPPABLE_CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}

.release/security-scan.hcl

@@ -49,7 +49,13 @@ container {
 				"CVE-2022-49043", # libxml2@0:2.9.13-6.el9_5.2
 				"CVE-2025-46394",
 				"CVE-2024-58251",
-				"CVE-2025-47268"
+				"CVE-2025-47268",
+				"CVE-2025-31115",
+				"CVE-2024-57970",
+				"CVE-2025-3277",
+				"CVE-2025-24528",
+				"CVE-2024-12133",
+				"CVE-2024-12243"
 			]
 			paths = [
 				"internal/tools/proto-gen-rpc-glue/e2e/consul/*",

CHANGELOG.md

@@ -3,7 +3,7 @@
 FEATURES:
 
 * xds: Extend LUA Script support for API Gateway [[GH-22321](https://github.com/hashicorp/consul/issues/22321)]
-* xds: provided a configurable to value to diable XDS session load balancing so that cases where there is a load balancer in front of the consul servers can disable the internal load balancing
+* xds: Added a configurable option to disable XDS session load balancing, intended for scenarios where an external load balancer is used in front of Consul servers, making internal load balancing unnecessary.
 
 IMPROVEMENTS:
 

Dockerfile

@@ -217,7 +217,7 @@ CMD ["agent", "-dev", "-client", "0.0.0.0"]
 
 # Red Hat UBI-based image
 # This target is used to build a Consul image for use on OpenShift.
-FROM registry.access.redhat.com/ubi9-minimal:9.5 as ubi
+FROM registry.access.redhat.com/ubi9-minimal:9.6 as ubi
 
 ARG PRODUCT_VERSION
 ARG PRODUCT_REVISION