From 69cb2c03c33b65b839e3f041761bb868a5fec312 Mon Sep 17 00:00:00 2001 From: Petr Muller Date: Wed, 23 Jul 2025 17:54:13 +0200 Subject: [PATCH 1/2] OTA-1581: Promote `UpgradeStatus` to Default OTA uses `UpgradeStatus` feature gate name to identify the CLI-side functionality described in OTA-1577 (`oc adm upgrade status` command). The `UpgradeStatus` feature gate does not enable any cluster-side functionality (neither API changes or any controller code). The actual functionality will be enabled in `oc` through https://github.com/openshift/oc/pull/2063. The `UpgradeStatus` feature gate thus serves only as a vehicle to perform the data-driven promotion decision by tying the appropriate test coverage to this name so that the promotion criteria can be automatically checked. Therefore, this PR serves as a formal decision record only, and after it merges, it means https://github.com/openshift/oc/pull/2063 is allowed to merge. --- features/features.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/features.go b/features/features.go index 362ba71cb79..a17dc330b25 100644 --- a/features/features.go +++ b/features/features.go @@ -430,7 +430,7 @@ var ( contactPerson("pmuller"). productScope(ocpSpecific). enhancementPR(legacyFeatureGateWithoutEnhancement). - enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade). + enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade, configv1.Default). mustRegister() FeatureGateTranslateStreamCloseWebsocketRequests = newFeatureGate("TranslateStreamCloseWebsocketRequests"). From 3443c48dea4e63187857bf20c0d20a6a3e71e62b Mon Sep 17 00:00:00 2001 From: Petr Muller Date: Wed, 23 Jul 2025 18:01:25 +0200 Subject: [PATCH 2/2] `make update` --- features.md | 2 +- .../featuregates/featureGate-Hypershift-Default.yaml | 6 +++--- .../featuregates/featureGate-SelfManagedHA-Default.yaml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/features.md b/features.md index 0ca7976298d..05dfe76ad2d 100644 --- a/features.md +++ b/features.md @@ -65,7 +65,6 @@ | SigstoreImageVerificationPKI| | | Enabled | Enabled | Enabled | Enabled | | StoragePerformantSecurityPolicy| | | Enabled | Enabled | Enabled | Enabled | | TranslateStreamCloseWebsocketRequests| | | Enabled | Enabled | Enabled | Enabled | -| UpgradeStatus| | | Enabled | Enabled | Enabled | Enabled | | VSphereConfigurableMaxAllowedBlockVolumesPerNode| | | Enabled | Enabled | Enabled | Enabled | | VSphereHostVMGroupZonal| | | Enabled | Enabled | Enabled | Enabled | | VolumeAttributesClass| | | Enabled | Enabled | Enabled | Enabled | @@ -98,6 +97,7 @@ | ServiceAccountTokenNodeBinding| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | SetEIPForNLBIngressController| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | SigstoreImageVerification| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | +| UpgradeStatus| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | UserNamespacesPodSecurityStandards| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | UserNamespacesSupport| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | | VSphereMultiDisk| Enabled | Enabled | Enabled | Enabled | Enabled | Enabled | diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml index 44ce183259d..7962e9b9a07 100644 --- a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml +++ b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml @@ -205,9 +205,6 @@ { "name": "TranslateStreamCloseWebsocketRequests" }, - { - "name": "UpgradeStatus" - }, { "name": "VSphereConfigurableMaxAllowedBlockVolumesPerNode" }, @@ -309,6 +306,9 @@ { "name": "SigstoreImageVerification" }, + { + "name": "UpgradeStatus" + }, { "name": "UserNamespacesPodSecurityStandards" }, diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml index 1cf67175737..d2ec8ebcd8f 100644 --- a/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml +++ b/payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml @@ -205,9 +205,6 @@ { "name": "TranslateStreamCloseWebsocketRequests" }, - { - "name": "UpgradeStatus" - }, { "name": "VSphereConfigurableMaxAllowedBlockVolumesPerNode" }, @@ -309,6 +306,9 @@ { "name": "SigstoreImageVerification" }, + { + "name": "UpgradeStatus" + }, { "name": "UserNamespacesPodSecurityStandards" },