diff --git a/features.md b/features.md index a1777c7e325..7c5d724d974 100644 --- a/features.md +++ b/features.md @@ -85,7 +85,6 @@ | OVNObservability| | | Enabled | Enabled | | | Enabled | Enabled | | OnPremDNSRecords| | | Enabled | Enabled | | | Enabled | Enabled | | SELinuxMount| | | Enabled | Enabled | | | Enabled | Enabled | -| SELinuxMountGAReadiness| | | Enabled | Enabled | | | Enabled | Enabled | | SignatureStores| | | Enabled | Enabled | | | Enabled | Enabled | | TLSAdherence| | | Enabled | Enabled | | | Enabled | Enabled | | TLSGroupPreferences| | | Enabled | Enabled | | | Enabled | Enabled | @@ -117,6 +116,7 @@ | MutableCSINodeAllocatableCount| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | MutatingAdmissionPolicy| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | OpenShiftPodSecurityAdmission| 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 | | SigstoreImageVerification| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | SigstoreImageVerificationPKI| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | diff --git a/features/features.go b/features/features.go index 428d48e1ab8..29901a120e3 100644 --- a/features/features.go +++ b/features/features.go @@ -1058,7 +1058,7 @@ var ( contactPerson("jsafrane"). productScope(ocpSpecific). enhancementPR("https://github.com/openshift/enhancements/pull/2010"). - enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()). + enable(inDefault(), inOKD(), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()). mustRegister() FeatureGateKarpenterOperator = newFeatureGate("KarpenterOperator"). diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml index 8f58a610a58..601e5aca3df 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml @@ -266,9 +266,6 @@ { "name": "SELinuxMount" }, - { - "name": "SELinuxMountGAReadiness" - }, { "name": "ShortCertRotation" }, @@ -367,6 +364,9 @@ { "name": "OpenShiftPodSecurityAdmission" }, + { + "name": "SELinuxMountGAReadiness" + }, { "name": "ServiceAccountTokenNodeBinding" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml index bdadade414f..450f721e046 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml @@ -268,9 +268,6 @@ { "name": "SELinuxMount" }, - { - "name": "SELinuxMountGAReadiness" - }, { "name": "ShortCertRotation" }, @@ -369,6 +366,9 @@ { "name": "OpenShiftPodSecurityAdmission" }, + { + "name": "SELinuxMountGAReadiness" + }, { "name": "ServiceAccountTokenNodeBinding" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml index 14a34489294..cc8ef8efb72 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml @@ -251,9 +251,6 @@ { "name": "SELinuxMount" }, - { - "name": "SELinuxMountGAReadiness" - }, { "name": "ShortCertRotation" }, @@ -367,6 +364,9 @@ { "name": "OpenShiftPodSecurityAdmission" }, + { + "name": "SELinuxMountGAReadiness" + }, { "name": "ServiceAccountTokenNodeBinding" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml index ddb612857c2..02e070be1f5 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml @@ -253,9 +253,6 @@ { "name": "SELinuxMount" }, - { - "name": "SELinuxMountGAReadiness" - }, { "name": "ShortCertRotation" }, @@ -369,6 +366,9 @@ { "name": "OpenShiftPodSecurityAdmission" }, + { + "name": "SELinuxMountGAReadiness" + }, { "name": "ServiceAccountTokenNodeBinding" },