diff --git a/features.md b/features.md index 37384b47491..c82704b5435 100644 --- a/features.md +++ b/features.md @@ -86,7 +86,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 @@ | MutatingAdmissionPolicy| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | OpenShiftPodSecurityAdmission| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | RouteExternalCertificate| 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 9b1f05f2af8..18b1e0a212e 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 3af7c146216..7f41bc7528f 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml @@ -269,9 +269,6 @@ { "name": "SELinuxMount" }, - { - "name": "SELinuxMountGAReadiness" - }, { "name": "ShortCertRotation" }, @@ -367,6 +364,9 @@ { "name": "RouteExternalCertificate" }, + { + "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 1e80a43b1f9..1142dba6085 100644 --- a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml @@ -271,9 +271,6 @@ { "name": "SELinuxMount" }, - { - "name": "SELinuxMountGAReadiness" - }, { "name": "ShortCertRotation" }, @@ -369,6 +366,9 @@ { "name": "RouteExternalCertificate" }, + { + "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 1f17d75e1b5..bf0f9f4d8ad 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml @@ -260,9 +260,6 @@ { "name": "SELinuxMount" }, - { - "name": "SELinuxMountGAReadiness" - }, { "name": "ShortCertRotation" }, @@ -367,6 +364,9 @@ { "name": "RouteExternalCertificate" }, + { + "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 2ffd2fd8515..21ca79224fa 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml @@ -262,9 +262,6 @@ { "name": "SELinuxMount" }, - { - "name": "SELinuxMountGAReadiness" - }, { "name": "ShortCertRotation" }, @@ -369,6 +366,9 @@ { "name": "RouteExternalCertificate" }, + { + "name": "SELinuxMountGAReadiness" + }, { "name": "ServiceAccountTokenNodeBinding" },