diff --git a/features.md b/features.md index 3e657b56ef8..1e3041ee9b2 100644 --- a/features.md +++ b/features.md @@ -5,12 +5,12 @@ | EventedPLEG| | | | | | | | MachineAPIOperatorDisableMachineHealthCheckController| | | | | | | | MultiArchInstallAzure| | | | | | | +| NewOLMBoxCutterRuntime| | | | | | | | ShortCertRotation| | | | | | | | ClusterAPIMachineManagementVSphere| | | Enabled | Enabled | | | | Example2| | | Enabled | Enabled | | | | ExternalSnapshotMetadata| | | Enabled | Enabled | | | | IngressControllerDynamicConfigurationManager| | | Enabled | Enabled | | | -| NewOLMBoxCutterRuntime| | | | Enabled | | Enabled | | NewOLMCatalogdAPIV1Metas| | | | Enabled | | Enabled | | NewOLMOwnSingleNamespace| | | | Enabled | | Enabled | | NewOLMPreflightPermissionChecks| | | | Enabled | | Enabled | diff --git a/features/features.go b/features/features.go index 1729dc4e8ce..153af6551a6 100644 --- a/features/features.go +++ b/features/features.go @@ -518,7 +518,6 @@ var ( contactPerson("pegoncal"). productScope(ocpSpecific). enhancementPR("https://github.com/openshift/enhancements/pull/1890"). - enableForClusterProfile(SelfManaged, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade). mustRegister() FeatureGateInsightsOnDemandDataGather = newFeatureGate("InsightsOnDemandDataGather"). diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml index df18ed0234f..892b47a2545 100644 --- a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml @@ -32,6 +32,9 @@ { "name": "MultiArchInstallAzure" }, + { + "name": "NewOLMBoxCutterRuntime" + }, { "name": "ShortCertRotation" } @@ -256,9 +259,6 @@ { "name": "NewOLM" }, - { - "name": "NewOLMBoxCutterRuntime" - }, { "name": "NewOLMCatalogdAPIV1Metas" }, diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml index 21ad8531777..4eb34308f09 100644 --- a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml @@ -44,6 +44,9 @@ { "name": "MultiArchInstallAzure" }, + { + "name": "NewOLMBoxCutterRuntime" + }, { "name": "ProvisioningRequestAvailable" }, @@ -259,9 +262,6 @@ { "name": "NewOLM" }, - { - "name": "NewOLMBoxCutterRuntime" - }, { "name": "NewOLMCatalogdAPIV1Metas" },