From 67426b0dd3d26c7e15d6453f5cafb5752d8077a4 Mon Sep 17 00:00:00 2001 From: Qi Wang Date: Thu, 14 May 2026 17:17:55 -0400 Subject: [PATCH 1/2] Promote CRIOCredentialProviderConfig feature gate Default Signed-off-by: Qi Wang --- ...rator_01_criocredentialproviderconfigs.crd.yaml | 2 +- features.md | 2 +- features/features.go | 14 +++++++------- ...rator_01_criocredentialproviderconfigs.crd.yaml | 2 +- .../featureGate-4-10-Hypershift-Default.yaml | 6 +++--- .../featureGate-4-10-Hypershift-OKD.yaml | 6 +++--- .../featureGate-4-10-SelfManagedHA-Default.yaml | 6 +++--- .../featureGate-4-10-SelfManagedHA-OKD.yaml | 6 +++--- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_criocredentialproviderconfigs.crd.yaml b/config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_criocredentialproviderconfigs.crd.yaml index 0e12b8cc45b..d33ad105259 100644 --- a/config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_criocredentialproviderconfigs.crd.yaml +++ b/config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_criocredentialproviderconfigs.crd.yaml @@ -6,7 +6,7 @@ metadata: api.openshift.io/merged-by-featuregates: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" - release.openshift.io/feature-set: CustomNoUpgrade,DevPreviewNoUpgrade,TechPreviewNoUpgrade + release.openshift.io/feature-set: CustomNoUpgrade,Default,DevPreviewNoUpgrade,TechPreviewNoUpgrade name: criocredentialproviderconfigs.config.openshift.io spec: group: config.openshift.io diff --git a/features.md b/features.md index b8816c2b131..b4b42ac2986 100644 --- a/features.md +++ b/features.md @@ -37,7 +37,6 @@ | 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 | | ClusterAPIMachineManagement| | | Enabled | Enabled | | | Enabled | Enabled | @@ -92,6 +91,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 | +| CRIOCredentialProviderConfig| 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 3c7391cc7c3..45aca9c9164 100644 --- a/features/features.go +++ b/features/features.go @@ -159,7 +159,7 @@ var ( contactPerson("QiWang"). productScope(ocpSpecific). enhancementPR("https://github.com/openshift/enhancements/pull/1861"). - enable(inDevPreviewNoUpgrade(), inTechPreviewNoUpgrade()). + enable(inDefault(), inOKD(), inDevPreviewNoUpgrade(), inTechPreviewNoUpgrade()). mustRegister() FeatureGateVSphereHostVMGroupZonal = newFeatureGate("VSphereHostVMGroupZonal"). @@ -465,12 +465,12 @@ var ( mustRegister() FeatureGateOLMLifecycleAndCompatibility = newFeatureGate("OLMLifecycleAndCompatibility"). - reportProblemsToJiraComponent("olm"). - contactPerson("joelanford"). - productScope(ocpSpecific). - enhancementPR("https://github.com/openshift/enhancements/pull/1991"). - enable(inClusterProfile(SelfManaged), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()). - mustRegister() + reportProblemsToJiraComponent("olm"). + contactPerson("joelanford"). + productScope(ocpSpecific). + enhancementPR("https://github.com/openshift/enhancements/pull/1991"). + enable(inClusterProfile(SelfManaged), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()). + mustRegister() FeatureGateInsightsOnDemandDataGather = newFeatureGate("InsightsOnDemandDataGather"). reportProblemsToJiraComponent("insights"). diff --git a/payload-manifests/crds/0000_10_config-operator_01_criocredentialproviderconfigs.crd.yaml b/payload-manifests/crds/0000_10_config-operator_01_criocredentialproviderconfigs.crd.yaml index 0e12b8cc45b..d33ad105259 100644 --- a/payload-manifests/crds/0000_10_config-operator_01_criocredentialproviderconfigs.crd.yaml +++ b/payload-manifests/crds/0000_10_config-operator_01_criocredentialproviderconfigs.crd.yaml @@ -6,7 +6,7 @@ metadata: api.openshift.io/merged-by-featuregates: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" - release.openshift.io/feature-set: CustomNoUpgrade,DevPreviewNoUpgrade,TechPreviewNoUpgrade + release.openshift.io/feature-set: CustomNoUpgrade,Default,DevPreviewNoUpgrade,TechPreviewNoUpgrade name: criocredentialproviderconfigs.config.openshift.io spec: group: config.openshift.io diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml index ef1d0847574..8ebdc5abeb6 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml @@ -56,9 +56,6 @@ { "name": "CRDCompatibilityRequirementOperator" }, - { - "name": "CRIOCredentialProviderConfig" - }, { "name": "ClientsAllowCBOR" }, @@ -289,6 +286,9 @@ { "name": "BuildCSIVolumes" }, + { + "name": "CRIOCredentialProviderConfig" + }, { "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 ed18a728910..6d80dee5e27 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml @@ -58,9 +58,6 @@ { "name": "CRDCompatibilityRequirementOperator" }, - { - "name": "CRIOCredentialProviderConfig" - }, { "name": "ClientsAllowCBOR" }, @@ -291,6 +288,9 @@ { "name": "BuildCSIVolumes" }, + { + "name": "CRIOCredentialProviderConfig" + }, { "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 54040065f59..ea35a835718 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml @@ -53,9 +53,6 @@ { "name": "CRDCompatibilityRequirementOperator" }, - { - "name": "CRIOCredentialProviderConfig" - }, { "name": "ClientsAllowCBOR" }, @@ -286,6 +283,9 @@ { "name": "BuildCSIVolumes" }, + { + "name": "CRIOCredentialProviderConfig" + }, { "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 a2d4c1f29e9..60d3ef70374 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml @@ -55,9 +55,6 @@ { "name": "CRDCompatibilityRequirementOperator" }, - { - "name": "CRIOCredentialProviderConfig" - }, { "name": "ClientsAllowCBOR" }, @@ -288,6 +285,9 @@ { "name": "BuildCSIVolumes" }, + { + "name": "CRIOCredentialProviderConfig" + }, { "name": "DualReplica" }, From c6b79ac76262153f7784ac2527f469e31c2860fd Mon Sep 17 00:00:00 2001 From: Qi Wang Date: Mon, 1 Jun 2026 17:03:53 -0400 Subject: [PATCH 2/2] test query 5.0 not 5.0-okd --- tools/codegen/cmd/featuregate-test-analyzer.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/codegen/cmd/featuregate-test-analyzer.go b/tools/codegen/cmd/featuregate-test-analyzer.go index 725c0057b77..75e51835650 100644 --- a/tools/codegen/cmd/featuregate-test-analyzer.go +++ b/tools/codegen/cmd/featuregate-test-analyzer.go @@ -823,7 +823,13 @@ func getLatestRelease() (string, error) { return "", fmt.Errorf("no releases found") } + // Only consider OCP releases (e.g. "4.18", "5.0"), skip OKD ("5.0-okd"), + // HCM ("aro-integration"), and other non-OCP releases. + ocpRelease := regexp.MustCompile(`^\d+\.\d+$`) for _, release := range result.Releases { + if !ocpRelease.MatchString(release) { + continue + } if dates, ok := result.Dates[release]; ok { if dates.DevelopmentStart != nil && !dates.DevelopmentStart.IsZero() && time.Now().After(*dates.DevelopmentStart) { return release, nil