From 4e1d766e7b8f28ef222177004da7630830441b41 Mon Sep 17 00:00:00 2001 From: stefanonardo Date: Mon, 29 Jun 2026 16:14:49 +0200 Subject: [PATCH] Promote CRDCompatibilityRequirementOperator feature gate to Default --- ...ter-version-operator_01_clusterversions-Default.crd.yaml | 3 +++ ...cluster-version-operator_01_clusterversions-OKD.crd.yaml | 3 +++ features.md | 2 +- features/features.go | 2 +- .../featuregates/featureGate-4-10-Hypershift-Default.yaml | 6 +++--- .../featuregates/featureGate-4-10-Hypershift-OKD.yaml | 6 +++--- .../featureGate-4-10-SelfManagedHA-Default.yaml | 6 +++--- .../featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml | 6 +++--- 8 files changed, 20 insertions(+), 14 deletions(-) diff --git a/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-Default.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-Default.crd.yaml index 430a39025ff..ca2c72d7afa 100644 --- a/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-Default.crd.yaml +++ b/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-Default.crd.yaml @@ -95,6 +95,7 @@ spec: - Ingress - CloudControllerManager - OperatorLifecycleManagerV1 + - CompatibilityRequirements type: string type: array x-kubernetes-list-type: atomic @@ -346,6 +347,7 @@ spec: - Ingress - CloudControllerManager - OperatorLifecycleManagerV1 + - CompatibilityRequirements type: string type: array x-kubernetes-list-type: atomic @@ -373,6 +375,7 @@ spec: - Ingress - CloudControllerManager - OperatorLifecycleManagerV1 + - CompatibilityRequirements type: string type: array x-kubernetes-list-type: atomic diff --git a/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-OKD.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-OKD.crd.yaml index 1ae333ddc69..a76ee6144f2 100644 --- a/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-OKD.crd.yaml +++ b/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-OKD.crd.yaml @@ -95,6 +95,7 @@ spec: - Ingress - CloudControllerManager - OperatorLifecycleManagerV1 + - CompatibilityRequirements type: string type: array x-kubernetes-list-type: atomic @@ -346,6 +347,7 @@ spec: - Ingress - CloudControllerManager - OperatorLifecycleManagerV1 + - CompatibilityRequirements type: string type: array x-kubernetes-list-type: atomic @@ -373,6 +375,7 @@ spec: - Ingress - CloudControllerManager - OperatorLifecycleManagerV1 + - CompatibilityRequirements type: string type: array x-kubernetes-list-type: atomic diff --git a/features.md b/features.md index 2959484d4ea..2415b8c79e2 100644 --- a/features.md +++ b/features.md @@ -38,7 +38,6 @@ | AzureMultiDisk| | | Enabled | Enabled | | | Enabled | Enabled | | BootcNodeManagement| | | Enabled | Enabled | | | Enabled | Enabled | | CBORServingAndStorage| | | Enabled | Enabled | | | Enabled | Enabled | -| CRDCompatibilityRequirementOperator| | | Enabled | Enabled | | | Enabled | Enabled | | CRIOCredentialProviderConfig| | | Enabled | Enabled | | | Enabled | Enabled | | ClientsPreferCBOR| | | Enabled | Enabled | | | Enabled | Enabled | | ClusterAPIInstallIBMCloud| | | Enabled | Enabled | | | Enabled | Enabled | @@ -98,6 +97,7 @@ | AzureWorkloadIdentity| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | BootImageSkewEnforcement| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | BuildCSIVolumes| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | +| CRDCompatibilityRequirementOperator| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | DualReplica| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | EVPN| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | EventTTL| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | diff --git a/features/features.go b/features/features.go index 1a5afd67844..688916be9ee 100644 --- a/features/features.go +++ b/features/features.go @@ -925,7 +925,7 @@ var ( contactPerson("ddonati"). productScope(ocpSpecific). enhancementPR("https://github.com/openshift/enhancements/pull/1845"). - enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()). + enable(inDefault(), inOKD(), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()). mustRegister() FeatureGateOnPremDNSRecords = newFeatureGate("OnPremDNSRecords"). reportProblemsToJiraComponent("Networking / On-Prem DNS"). diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml index f1123581cf1..fe43dad3d14 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml @@ -50,9 +50,6 @@ { "name": "CBORServingAndStorage" }, - { - "name": "CRDCompatibilityRequirementOperator" - }, { "name": "CRIOCredentialProviderConfig" }, @@ -307,6 +304,9 @@ { "name": "BuildCSIVolumes" }, + { + "name": "CRDCompatibilityRequirementOperator" + }, { "name": "DualReplica" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml index e154666dc3d..4cab9aba164 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml @@ -52,9 +52,6 @@ { "name": "CBORServingAndStorage" }, - { - "name": "CRDCompatibilityRequirementOperator" - }, { "name": "CRIOCredentialProviderConfig" }, @@ -309,6 +306,9 @@ { "name": "BuildCSIVolumes" }, + { + "name": "CRDCompatibilityRequirementOperator" + }, { "name": "DualReplica" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml index 22c94f4ed05..63873ac277c 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml @@ -47,9 +47,6 @@ { "name": "CBORServingAndStorage" }, - { - "name": "CRDCompatibilityRequirementOperator" - }, { "name": "CRIOCredentialProviderConfig" }, @@ -301,6 +298,9 @@ { "name": "BuildCSIVolumes" }, + { + "name": "CRDCompatibilityRequirementOperator" + }, { "name": "DualReplica" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml index 5ca60953611..07b9f9a0c21 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml @@ -49,9 +49,6 @@ { "name": "CBORServingAndStorage" }, - { - "name": "CRDCompatibilityRequirementOperator" - }, { "name": "CRIOCredentialProviderConfig" }, @@ -303,6 +300,9 @@ { "name": "BuildCSIVolumes" }, + { + "name": "CRDCompatibilityRequirementOperator" + }, { "name": "DualReplica" },