diff --git a/features.md b/features.md index e3007e75f09..35fd140f025 100644 --- a/features.md +++ b/features.md @@ -81,6 +81,7 @@ | OSStreams| | | Enabled | Enabled | | | Enabled | Enabled | | OVNObservability| | | Enabled | Enabled | | | Enabled | Enabled | | OnPremDNSRecords| | | Enabled | Enabled | | | Enabled | Enabled | +| RHCOS10DefaultInstall| | Enabled | | Enabled | | Enabled | | Enabled | | SELinuxMount| | | Enabled | Enabled | | | Enabled | Enabled | | SignatureStores| | | Enabled | Enabled | | | Enabled | Enabled | | TLSAdherence| | | Enabled | Enabled | | | Enabled | Enabled | diff --git a/features/features.go b/features/features.go index a911c56f18c..e10f1dcd782 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(), inOKD()). + 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 5ee9176976e..de78ea30894 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml @@ -251,6 +251,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 06d04285930..cc99e9a4526 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml @@ -61,6 +61,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 68fb4d6325a..cdfb6dce0cb 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml @@ -253,6 +253,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 d4602121176..0e84f0e4ddf 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml @@ -91,6 +91,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 d9d7fced666..8f8f70b3ffd 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-DevPreviewNoUpgrade.yaml @@ -318,6 +318,9 @@ { "name": "ProvisioningRequestAvailable" }, + { + "name": "RHCOS10DefaultInstall" + }, { "name": "RouteExternalCertificate" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml index 811b4dc25fb..828e5f50430 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml @@ -321,6 +321,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 e67864f8c5e..16917f932c9 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" }, @@ -245,6 +245,9 @@ { "name": "ProvisioningRequestAvailable" }, + { + "name": "RHCOS10DefaultInstall" + }, { "name": "SELinuxMount" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml b/payload-manifests/featuregates/featureGate-4-SelfManagedHA-OKD.yaml similarity index 98% rename from payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml rename to payload-manifests/featuregates/featureGate-4-SelfManagedHA-OKD.yaml index 12f9219c81b..bd0c71594a9 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml +++ b/payload-manifests/featuregates/featureGate-4-SelfManagedHA-OKD.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": "OKD", - "release.openshift.io/major-version": "4,5,6,7,8,9,10" + "release.openshift.io/major-version": "4" }, "name": "cluster" }, @@ -247,6 +247,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..0ef0fda7ca2 --- /dev/null +++ b/payload-manifests/featuregates/featureGate-5-10-SelfManagedHA-Default.yaml @@ -0,0 +1,378 @@ +{ + "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": "MutableTopology" + }, + { + "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": "" + } + ] + } +} diff --git a/payload-manifests/featuregates/featureGate-5-10-SelfManagedHA-OKD.yaml b/payload-manifests/featuregates/featureGate-5-10-SelfManagedHA-OKD.yaml new file mode 100644 index 00000000000..b07e8b8773a --- /dev/null +++ b/payload-manifests/featuregates/featureGate-5-10-SelfManagedHA-OKD.yaml @@ -0,0 +1,380 @@ +{ + "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": "OKD", + "release.openshift.io/major-version": "5,6,7,8,9,10" + }, + "name": "cluster" + }, + "spec": { + "featureSet": "OKD" + }, + "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": "MutableTopology" + }, + { + "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": "" + } + ] + } +}