From c90338d381e3ff3b41d4cafad3dd0d182a12b777 Mon Sep 17 00:00:00 2001 From: Allen Ray Date: Tue, 14 Apr 2026 09:21:10 -0400 Subject: [PATCH] features: disable psa --- features.md | 2 +- features/features.go | 2 +- .../featuregates/featureGate-4-10-Hypershift-Default.yaml | 6 +++--- .../featuregates/featureGate-4-10-Hypershift-OKD.yaml | 6 +++--- .../featureGate-4-10-SelfManagedHA-Default.yaml | 6 +++--- .../featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/features.md b/features.md index 8112c57f728..c0177af8762 100644 --- a/features.md +++ b/features.md @@ -82,6 +82,7 @@ | OSStreams| | | Enabled | Enabled | | | Enabled | Enabled | | OVNObservability| | | Enabled | Enabled | | | Enabled | Enabled | | OnPremDNSRecords| | | Enabled | Enabled | | | Enabled | Enabled | +| OpenShiftPodSecurityAdmission| | | Enabled | Enabled | | | Enabled | Enabled | | SELinuxMount| | | Enabled | Enabled | | | Enabled | Enabled | | SignatureStores| | | Enabled | Enabled | | | Enabled | Enabled | | TLSAdherence| | | Enabled | Enabled | | | Enabled | Enabled | @@ -106,7 +107,6 @@ | ManagedBootImagesCPMS| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | MetricsCollectionProfiles| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | MutableCSINodeAllocatableCount| 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 | | ServiceAccountTokenNodeBinding| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | SigstoreImageVerification| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | diff --git a/features/features.go b/features/features.go index 5d148165cc5..752c17ef0e8 100644 --- a/features/features.go +++ b/features/features.go @@ -104,7 +104,7 @@ var ( contactPerson("ibihim"). productScope(ocpSpecific). enhancementPR("https://github.com/openshift/enhancements/pull/899"). - enable(inDefault(), inOKD(), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()). + enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()). mustRegister() FeatureGateBuildCSIVolumes = newFeatureGate("BuildCSIVolumes"). diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml index c1d43a43bc4..7af3d655eea 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": "OnPremDNSRecords" }, + { + "name": "OpenShiftPodSecurityAdmission" + }, { "name": "ProvisioningRequestAvailable" }, @@ -334,9 +337,6 @@ { "name": "MutableCSINodeAllocatableCount" }, - { - "name": "OpenShiftPodSecurityAdmission" - }, { "name": "RouteExternalCertificate" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml b/payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml index 8c603acea37..e0c2b4ce1b9 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": "OnPremDNSRecords" }, + { + "name": "OpenShiftPodSecurityAdmission" + }, { "name": "ProvisioningRequestAvailable" }, @@ -336,9 +339,6 @@ { "name": "MutableCSINodeAllocatableCount" }, - { - "name": "OpenShiftPodSecurityAdmission" - }, { "name": "RouteExternalCertificate" }, diff --git a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml index 4f43aef34ef..6d29f9647f0 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml @@ -245,6 +245,9 @@ { "name": "OnPremDNSRecords" }, + { + "name": "OpenShiftPodSecurityAdmission" + }, { "name": "ProvisioningRequestAvailable" }, @@ -334,9 +337,6 @@ { "name": "NewOLMWebhookProviderOpenshiftServiceCA" }, - { - "name": "OpenShiftPodSecurityAdmission" - }, { "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 596cc8ad492..730a25d0a21 100644 --- a/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml +++ b/payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml @@ -247,6 +247,9 @@ { "name": "OnPremDNSRecords" }, + { + "name": "OpenShiftPodSecurityAdmission" + }, { "name": "ProvisioningRequestAvailable" }, @@ -336,9 +339,6 @@ { "name": "NewOLMWebhookProviderOpenshiftServiceCA" }, - { - "name": "OpenShiftPodSecurityAdmission" - }, { "name": "RouteExternalCertificate" },