diff --git a/features.md b/features.md
index b8816c2b131..da89e09c1a5 100644
--- a/features.md
+++ b/features.md
@@ -24,6 +24,7 @@
| OLMLifecycleAndCompatibility| | | | Enabled | | | | Enabled |
| ProvisioningRequestAvailable| | | Enabled | Enabled | | | | |
| VSphereMultiVCenterDay2| | | Enabled | Enabled | | | | |
+| RHCOS10DefaultInstall| | Enabled | | Enabled | | | | Enabled |
| AWSClusterHostedDNS| | | Enabled | Enabled | | | Enabled | Enabled |
| AWSClusterHostedDNSInstall| | | Enabled | Enabled | | | Enabled | Enabled |
| AWSDedicatedHosts| | | Enabled | Enabled | | | Enabled | Enabled |
diff --git a/features/features.go b/features/features.go
index 3c7391cc7c3..b8cea0fe292 100644
--- a/features/features.go
+++ b/features/features.go
@@ -891,6 +891,15 @@ var (
enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
mustRegister()
+ FeatureGateRHCOS10DefaultInstall = newFeatureGate("RHCOS10DefaultInstall").
+ reportProblemsToJiraComponent("MachineConfigOperator").
+ contactPerson("zzlotnik").
+ productScope(ocpSpecific).
+ enhancementPR("https://github.com/openshift/enhancements/pull/1874").
+ enable(inClusterProfile(SelfManaged), inVersion(5, greaterThanOrEqual), inDevPreviewNoUpgrade(), inTechPreviewNoUpgrade(), inDefault()).
+ enable(inClusterProfile(SelfManaged), inVersion(5, lessThan), inDevPreviewNoUpgrade(), inTechPreviewNoUpgrade()).
+ mustRegister()
+
FeatureGateCRDCompatibilityRequirementOperator = newFeatureGate("CRDCompatibilityRequirementOperator").
reportProblemsToJiraComponent("Cloud Compute / Cluster API Providers").
contactPerson("ddonati").
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
index ef1d0847574..cf1b574090d 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
@@ -248,6 +248,9 @@
{
"name": "ProvisioningRequestAvailable"
},
+ {
+ "name": "RHCOS10DefaultInstall"
+ },
{
"name": "SELinuxMount"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml
index e92db5a8445..fa74f120962 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml
@@ -58,6 +58,9 @@
{
"name": "OLMLifecycleAndCompatibility"
},
+ {
+ "name": "RHCOS10DefaultInstall"
+ },
{
"name": "ShortCertRotation"
}
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
index ed18a728910..8a4df794205 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
@@ -250,6 +250,9 @@
{
"name": "ProvisioningRequestAvailable"
},
+ {
+ "name": "RHCOS10DefaultInstall"
+ },
{
"name": "SELinuxMount"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml
index 63faea6c81d..830b7c01dab 100644
--- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml
@@ -88,6 +88,9 @@
{
"name": "ProvisioningRequestAvailable"
},
+ {
+ "name": "RHCOS10DefaultInstall"
+ },
{
"name": "ShortCertRotation"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml
index 59c1c23ce8f..dfd625ccef5 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -315,6 +315,9 @@
{
"name": "ProvisioningRequestAvailable"
},
+ {
+ "name": "RHCOS10DefaultInstall"
+ },
{
"name": "RouteExternalCertificate"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
index a2d4c1f29e9..86d7c5a9c3d 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml
@@ -244,6 +244,9 @@
{
"name": "ProvisioningRequestAvailable"
},
+ {
+ "name": "RHCOS10DefaultInstall"
+ },
{
"name": "SELinuxMount"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml
index b2e2e801c9a..704e431b1d8 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml
+++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -318,6 +318,9 @@
{
"name": "OpenShiftPodSecurityAdmission"
},
+ {
+ "name": "RHCOS10DefaultInstall"
+ },
{
"name": "RouteExternalCertificate"
},
diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-4-SelfManagedHA-Default.yaml
similarity index 98%
rename from payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
rename to payload-manifests/featuregates/featureGate-4-SelfManagedHA-Default.yaml
index 54040065f59..a1799d27bc5 100644
--- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
+++ b/payload-manifests/featuregates/featureGate-4-SelfManagedHA-Default.yaml
@@ -5,7 +5,7 @@
"annotations": {
"include.release.openshift.io/self-managed-high-availability": "false-except-for-the-config-operator",
"release.openshift.io/feature-set": "Default",
- "release.openshift.io/major-version": "4,5,6,7,8,9,10"
+ "release.openshift.io/major-version": "4"
},
"name": "cluster"
},
@@ -242,6 +242,9 @@
{
"name": "ProvisioningRequestAvailable"
},
+ {
+ "name": "RHCOS10DefaultInstall"
+ },
{
"name": "SELinuxMount"
},
diff --git a/payload-manifests/featuregates/featureGate-5-10-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-5-10-SelfManagedHA-Default.yaml
new file mode 100644
index 00000000000..c10af084360
--- /dev/null
+++ b/payload-manifests/featuregates/featureGate-5-10-SelfManagedHA-Default.yaml
@@ -0,0 +1,375 @@
+{
+ "apiVersion": "config.openshift.io/v1",
+ "kind": "FeatureGate",
+ "metadata": {
+ "annotations": {
+ "include.release.openshift.io/self-managed-high-availability": "false-except-for-the-config-operator",
+ "release.openshift.io/feature-set": "Default",
+ "release.openshift.io/major-version": "5,6,7,8,9,10"
+ },
+ "name": "cluster"
+ },
+ "spec": {},
+ "status": {
+ "featureGates": [
+ {
+ "disabled": [
+ {
+ "name": "AWSClusterHostedDNS"
+ },
+ {
+ "name": "AWSClusterHostedDNSInstall"
+ },
+ {
+ "name": "AWSDedicatedHosts"
+ },
+ {
+ "name": "AWSDualStackInstall"
+ },
+ {
+ "name": "AWSEuropeanSovereignCloudInstall"
+ },
+ {
+ "name": "AdditionalStorageConfig"
+ },
+ {
+ "name": "AutomatedEtcdBackup"
+ },
+ {
+ "name": "AzureDedicatedHosts"
+ },
+ {
+ "name": "AzureDualStackInstall"
+ },
+ {
+ "name": "AzureMultiDisk"
+ },
+ {
+ "name": "BootcNodeManagement"
+ },
+ {
+ "name": "CBORServingAndStorage"
+ },
+ {
+ "name": "CRDCompatibilityRequirementOperator"
+ },
+ {
+ "name": "CRIOCredentialProviderConfig"
+ },
+ {
+ "name": "ClientsAllowCBOR"
+ },
+ {
+ "name": "ClientsPreferCBOR"
+ },
+ {
+ "name": "ClusterAPIComputeInstall"
+ },
+ {
+ "name": "ClusterAPIControlPlaneInstall"
+ },
+ {
+ "name": "ClusterAPIInstall"
+ },
+ {
+ "name": "ClusterAPIInstallIBMCloud"
+ },
+ {
+ "name": "ClusterAPIMachineManagement"
+ },
+ {
+ "name": "ClusterAPIMachineManagementAWS"
+ },
+ {
+ "name": "ClusterAPIMachineManagementAzure"
+ },
+ {
+ "name": "ClusterAPIMachineManagementBareMetal"
+ },
+ {
+ "name": "ClusterAPIMachineManagementGCP"
+ },
+ {
+ "name": "ClusterAPIMachineManagementOpenStack"
+ },
+ {
+ "name": "ClusterAPIMachineManagementPowerVS"
+ },
+ {
+ "name": "ClusterAPIMachineManagementVSphere"
+ },
+ {
+ "name": "ClusterMonitoringConfig"
+ },
+ {
+ "name": "ClusterUpdateAcceptRisks"
+ },
+ {
+ "name": "ClusterUpdatePreflight"
+ },
+ {
+ "name": "ClusterVersionOperatorConfiguration"
+ },
+ {
+ "name": "ConfidentialCluster"
+ },
+ {
+ "name": "ConfigurablePKI"
+ },
+ {
+ "name": "DNSNameResolver"
+ },
+ {
+ "name": "DyanmicServiceEndpointIBMCloud"
+ },
+ {
+ "name": "EtcdBackendQuota"
+ },
+ {
+ "name": "EventedPLEG"
+ },
+ {
+ "name": "Example"
+ },
+ {
+ "name": "Example2"
+ },
+ {
+ "name": "ExternalOIDCExternalClaimsSourcing"
+ },
+ {
+ "name": "ExternalOIDCWithUpstreamParity"
+ },
+ {
+ "name": "ExternalSnapshotMetadata"
+ },
+ {
+ "name": "GCPCustomAPIEndpoints"
+ },
+ {
+ "name": "GCPCustomAPIEndpointsInstall"
+ },
+ {
+ "name": "GCPDualStackInstall"
+ },
+ {
+ "name": "HyperShiftOnlyDynamicResourceAllocation"
+ },
+ {
+ "name": "ImageModeStatusReporting"
+ },
+ {
+ "name": "IngressControllerDynamicConfigurationManager"
+ },
+ {
+ "name": "IrreconcilableMachineConfig"
+ },
+ {
+ "name": "KMSEncryption"
+ },
+ {
+ "name": "MachineAPIMigration"
+ },
+ {
+ "name": "MachineAPIMigrationAWS"
+ },
+ {
+ "name": "MachineAPIMigrationOpenStack"
+ },
+ {
+ "name": "MachineAPIMigrationVSphere"
+ },
+ {
+ "name": "MachineAPIOperatorDisableMachineHealthCheckController"
+ },
+ {
+ "name": "MaxUnavailableStatefulSet"
+ },
+ {
+ "name": "MinimumKubeletVersion"
+ },
+ {
+ "name": "MixedCPUsAllocation"
+ },
+ {
+ "name": "MultiArchInstallAzure"
+ },
+ {
+ "name": "MultiDiskSetup"
+ },
+ {
+ "name": "NetworkConnect"
+ },
+ {
+ "name": "NetworkObservabilityInstall"
+ },
+ {
+ "name": "NewOLMBoxCutterRuntime"
+ },
+ {
+ "name": "NewOLMCatalogdAPIV1Metas"
+ },
+ {
+ "name": "NewOLMConfigAPI"
+ },
+ {
+ "name": "NewOLMOwnSingleNamespace"
+ },
+ {
+ "name": "NewOLMPreflightPermissionChecks"
+ },
+ {
+ "name": "NoOverlayMode"
+ },
+ {
+ "name": "NoRegistryClusterInstall"
+ },
+ {
+ "name": "NutanixMultiSubnets"
+ },
+ {
+ "name": "OLMLifecycleAndCompatibility"
+ },
+ {
+ "name": "OSStreams"
+ },
+ {
+ "name": "OVNObservability"
+ },
+ {
+ "name": "OnPremDNSRecords"
+ },
+ {
+ "name": "ProvisioningRequestAvailable"
+ },
+ {
+ "name": "SELinuxMount"
+ },
+ {
+ "name": "ShortCertRotation"
+ },
+ {
+ "name": "SignatureStores"
+ },
+ {
+ "name": "TLSAdherence"
+ },
+ {
+ "name": "TLSGroupPreferences"
+ },
+ {
+ "name": "VSphereConfigurableMaxAllowedBlockVolumesPerNode"
+ },
+ {
+ "name": "VSphereMixedNodeEnv"
+ },
+ {
+ "name": "VSphereMultiVCenterDay2"
+ },
+ {
+ "name": "VolumeGroupSnapshot"
+ }
+ ],
+ "enabled": [
+ {
+ "name": "AWSServiceLBNetworkSecurityGroup"
+ },
+ {
+ "name": "AzureClusterHostedDNSInstall"
+ },
+ {
+ "name": "AzureWorkloadIdentity"
+ },
+ {
+ "name": "BootImageSkewEnforcement"
+ },
+ {
+ "name": "BuildCSIVolumes"
+ },
+ {
+ "name": "DualReplica"
+ },
+ {
+ "name": "EVPN"
+ },
+ {
+ "name": "EventTTL"
+ },
+ {
+ "name": "ExternalOIDC"
+ },
+ {
+ "name": "ExternalOIDCWithUIDAndExtraClaimMappings"
+ },
+ {
+ "name": "GatewayAPIWithoutOLM"
+ },
+ {
+ "name": "ImageStreamImportMode"
+ },
+ {
+ "name": "InsightsConfig"
+ },
+ {
+ "name": "InsightsOnDemandDataGather"
+ },
+ {
+ "name": "KMSv1"
+ },
+ {
+ "name": "ManagedBootImagesCPMS"
+ },
+ {
+ "name": "MetricsCollectionProfiles"
+ },
+ {
+ "name": "MutableCSINodeAllocatableCount"
+ },
+ {
+ "name": "MutatingAdmissionPolicy"
+ },
+ {
+ "name": "NewOLM"
+ },
+ {
+ "name": "NewOLMWebhookProviderOpenshiftServiceCA"
+ },
+ {
+ "name": "OpenShiftPodSecurityAdmission"
+ },
+ {
+ "name": "RHCOS10DefaultInstall"
+ },
+ {
+ "name": "RouteExternalCertificate"
+ },
+ {
+ "name": "ServiceAccountTokenNodeBinding"
+ },
+ {
+ "name": "SigstoreImageVerification"
+ },
+ {
+ "name": "SigstoreImageVerificationPKI"
+ },
+ {
+ "name": "StoragePerformantSecurityPolicy"
+ },
+ {
+ "name": "UpgradeStatus"
+ },
+ {
+ "name": "VSphereHostVMGroupZonal"
+ },
+ {
+ "name": "VSphereMultiDisk"
+ },
+ {
+ "name": "VSphereMultiNetworks"
+ }
+ ],
+ "version": ""
+ }
+ ]
+ }
+}