From 6ccbc2b7cf684dbdaf77dedcb696ebd2d25493ee Mon Sep 17 00:00:00 2001 From: Pablo Fontanilla Date: Fri, 19 Sep 2025 19:01:24 +0200 Subject: [PATCH 1/2] Promote DualReplica to default --- ...0_10_config-operator_01_infrastructures-Default.crd.yaml | 1 + features.md | 2 +- features/features.go | 2 +- ..._80_machine-config_01_controllerconfigs-Default.crd.yaml | 1 + ...0_10_config-operator_01_infrastructures-Default.crd.yaml | 1 + ..._80_machine-config_01_controllerconfigs-Default.crd.yaml | 1 + .../featuregates/featureGate-Hypershift-Default.yaml | 6 +++--- .../featuregates/featureGate-SelfManagedHA-Default.yaml | 6 +++--- 8 files changed, 12 insertions(+), 8 deletions(-) diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-Default.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-Default.crd.yaml index 4ecbc18e963..30e3afeb02b 100644 --- a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-Default.crd.yaml +++ b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-Default.crd.yaml @@ -1053,6 +1053,7 @@ spec: - HighlyAvailable - HighlyAvailableArbiter - SingleReplica + - DualReplica - External type: string cpuPartitioning: diff --git a/features.md b/features.md index 05172942208..7b19e8202d5 100644 --- a/features.md +++ b/features.md @@ -34,7 +34,6 @@ | ClusterMonitoringConfig| | | Enabled | Enabled | Enabled | Enabled | | ClusterVersionOperatorConfiguration| | | Enabled | Enabled | Enabled | Enabled | | DNSNameResolver| | | Enabled | Enabled | Enabled | Enabled | -| DualReplica| | | Enabled | Enabled | Enabled | Enabled | | DyanmicServiceEndpointIBMCloud| | | Enabled | Enabled | Enabled | Enabled | | DynamicResourceAllocation| | | Enabled | Enabled | Enabled | Enabled | | EtcdBackendQuota| | | Enabled | Enabled | Enabled | Enabled | @@ -80,6 +79,7 @@ | BuildCSIVolumes| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | CPMSMachineNamePrefix| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | ConsolePluginContentSecurityPolicy| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | +| DualReplica| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | GCPClusterHostedDNSInstall| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | GatewayAPI| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | GatewayAPIController| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | diff --git a/features/features.go b/features/features.go index 231bad62b67..f8ea958b3cf 100644 --- a/features/features.go +++ b/features/features.go @@ -724,7 +724,7 @@ var ( contactPerson("jaypoulz"). productScope(ocpSpecific). enhancementPR("https://github.com/openshift/enhancements/pull/1675"). - enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade). + enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade). mustRegister() FeatureGateGatewayAPIController = newFeatureGate("GatewayAPIController"). diff --git a/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml b/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml index 485501e0ace..cff5c11090d 100644 --- a/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml +++ b/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml @@ -1334,6 +1334,7 @@ spec: - HighlyAvailable - HighlyAvailableArbiter - SingleReplica + - DualReplica - External type: string cpuPartitioning: diff --git a/payload-manifests/crds/0000_10_config-operator_01_infrastructures-Default.crd.yaml b/payload-manifests/crds/0000_10_config-operator_01_infrastructures-Default.crd.yaml index 4ecbc18e963..30e3afeb02b 100644 --- a/payload-manifests/crds/0000_10_config-operator_01_infrastructures-Default.crd.yaml +++ b/payload-manifests/crds/0000_10_config-operator_01_infrastructures-Default.crd.yaml @@ -1053,6 +1053,7 @@ spec: - HighlyAvailable - HighlyAvailableArbiter - SingleReplica + - DualReplica - External type: string cpuPartitioning: diff --git a/payload-manifests/crds/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml b/payload-manifests/crds/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml index 485501e0ace..cff5c11090d 100644 --- a/payload-manifests/crds/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml +++ b/payload-manifests/crds/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml @@ -1334,6 +1334,7 @@ spec: - HighlyAvailable - HighlyAvailableArbiter - SingleReplica + - DualReplica - External type: string cpuPartitioning: diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml index a807ed9434d..ed40995a992 100644 --- a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml +++ b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml @@ -76,9 +76,6 @@ { "name": "DNSNameResolver" }, - { - "name": "DualReplica" - }, { "name": "DyanmicServiceEndpointIBMCloud" }, @@ -252,6 +249,9 @@ { "name": "ConsolePluginContentSecurityPolicy" }, + { + "name": "DualReplica" + }, { "name": "ExternalOIDC" }, diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml index 2b94acf2bbe..641fda90f82 100644 --- a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml +++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml @@ -76,9 +76,6 @@ { "name": "DNSNameResolver" }, - { - "name": "DualReplica" - }, { "name": "DyanmicServiceEndpointIBMCloud" }, @@ -252,6 +249,9 @@ { "name": "ConsolePluginContentSecurityPolicy" }, + { + "name": "DualReplica" + }, { "name": "GCPClusterHostedDNSInstall" }, From 9b5881e9b9acaedaa44dfd90ce2c5e03f3b62078 Mon Sep 17 00:00:00 2001 From: Pablo Fontanilla Date: Thu, 9 Oct 2025 13:32:59 +0200 Subject: [PATCH 2/2] Fix missing character --- .../featuregates/featureGate-SelfManagedHA-Default.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml index ef837f41804..9f009252a77 100644 --- a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml +++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml @@ -240,6 +240,7 @@ { "name": "DualReplica" }, + { "name": "ExternalOIDC" }, {