diff --git a/features.md b/features.md index 1114b69d9b5..e106e634d56 100644 --- a/features.md +++ b/features.md @@ -83,7 +83,6 @@ | OLMLifecycleAndCompatibility| | Enabled | | Enabled | | Enabled | | Enabled | | OVNObservability| | | Enabled | Enabled | | | Enabled | Enabled | | OnPremDNSRecords| | | Enabled | Enabled | | | Enabled | Enabled | -| SELinuxMount| | | Enabled | Enabled | | | Enabled | Enabled | | SignatureStores| | | Enabled | Enabled | | | Enabled | Enabled | | TLSAdherence| | | Enabled | Enabled | | | Enabled | Enabled | | TLSGroupPreferences| | | Enabled | Enabled | | | Enabled | Enabled | @@ -116,6 +115,7 @@ | MutatingAdmissionPolicy| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | OSStreams| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | OpenShiftPodSecurityAdmission| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | +| SELinuxMount| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | SELinuxMountGAReadiness| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | ServiceAccountTokenNodeBinding| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | StoragePerformantSecurityPolicy| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | diff --git a/features/features.go b/features/features.go index 7ff6c4c3ed1..5384fd76ecb 100644 --- a/features/features.go +++ b/features/features.go @@ -711,7 +711,7 @@ var ( contactPerson("jsafrane"). productScope(kubernetes). enhancementPR("https://github.com/kubernetes/enhancements/issues/1710"). - enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()). + enable(inDefault(), inOKD(), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()). mustRegister() FeatureGateDualReplica = newFeatureGate("DualReplica"). diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml index 1a99619ff09..3b19b9e1a5e 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml @@ -257,9 +257,6 @@ { "name": "ProvisioningRequestAvailable" }, - { - "name": "SELinuxMount" - }, { "name": "ShortCertRotation" }, @@ -364,6 +361,9 @@ { "name": "OpenShiftPodSecurityAdmission" }, + { + "name": "SELinuxMount" + }, { "name": "SELinuxMountGAReadiness" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml index ed750c9b289..8c1044e25d6 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml @@ -259,9 +259,6 @@ { "name": "ProvisioningRequestAvailable" }, - { - "name": "SELinuxMount" - }, { "name": "ShortCertRotation" }, @@ -366,6 +363,9 @@ { "name": "OpenShiftPodSecurityAdmission" }, + { + "name": "SELinuxMount" + }, { "name": "SELinuxMountGAReadiness" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml index 82c0505a113..cc27ae4d808 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml @@ -245,9 +245,6 @@ { "name": "ProvisioningRequestAvailable" }, - { - "name": "SELinuxMount" - }, { "name": "ShortCertRotation" }, @@ -364,6 +361,9 @@ { "name": "OpenShiftPodSecurityAdmission" }, + { + "name": "SELinuxMount" + }, { "name": "SELinuxMountGAReadiness" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml index ec1ed473d2e..e6db3bc40f2 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml @@ -247,9 +247,6 @@ { "name": "ProvisioningRequestAvailable" }, - { - "name": "SELinuxMount" - }, { "name": "ShortCertRotation" }, @@ -366,6 +363,9 @@ { "name": "OpenShiftPodSecurityAdmission" }, + { + "name": "SELinuxMount" + }, { "name": "SELinuxMountGAReadiness" },