Merge pull request #2418 from petr-muller/ota-1580-promote-upgrade-status

openshift-merge-bot[bot] · web-flow · commit 6282350d0c39 · 2025-08-20T10:50:13.000Z
OTA-1580: Promote `UpgradeStatus` to Default
diff --git a/features.md b/features.md
@@ -64,7 +64,6 @@
 | SigstoreImageVerificationPKI| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | StoragePerformantSecurityPolicy| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | TranslateStreamCloseWebsocketRequests| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
-| UpgradeStatus| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | VSphereConfigurableMaxAllowedBlockVolumesPerNode| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | VSphereHostVMGroupZonal| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | VolumeAttributesClass| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
@@ -97,6 +96,7 @@
 | ServiceAccountTokenNodeBinding| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | SetEIPForNLBIngressController| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | SigstoreImageVerification| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
+| UpgradeStatus| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | UserNamespacesPodSecurityStandards| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | UserNamespacesSupport| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | VSphereMultiDisk| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
diff --git a/features/features.go b/features/features.go
@@ -422,7 +422,7 @@ var (
 					contactPerson("pmuller").
 					productScope(ocpSpecific).
 					enhancementPR(legacyFeatureGateWithoutEnhancement).
-					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade, configv1.Default).
 					mustRegister()
 
 	FeatureGateTranslateStreamCloseWebsocketRequests = newFeatureGate("TranslateStreamCloseWebsocketRequests").
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml b/payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
@@ -202,9 +202,6 @@
                     {
                         "name": "TranslateStreamCloseWebsocketRequests"
                     },
-                    {
-                        "name": "UpgradeStatus"
-                    },
                     {
                         "name": "VSphereConfigurableMaxAllowedBlockVolumesPerNode"
                     },
@@ -306,6 +303,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
@@ -202,9 +202,6 @@
                     {
                         "name": "TranslateStreamCloseWebsocketRequests"
                     },
-                    {
-                        "name": "UpgradeStatus"
-                    },
                     {
                         "name": "VSphereConfigurableMaxAllowedBlockVolumesPerNode"
                     },
@@ -306,6 +303,9 @@
                     {
                         "name": "SigstoreImageVerification"
                     },
+                    {
+                        "name": "UpgradeStatus"
+                    },
                     {
                         "name": "UserNamespacesPodSecurityStandards"
                     },

Original file line number	Diff line number	Diff line change
`@@ -202,9 +202,6 @@`
`202`	`202`	`{`
`203`	`203`	`"name": "TranslateStreamCloseWebsocketRequests"`
`204`	`204`	`},`
`205`		`- {`
`206`		`- "name": "UpgradeStatus"`
`207`		`- },`
`208`	`205`	`{`
`209`	`206`	`"name": "VSphereConfigurableMaxAllowedBlockVolumesPerNode"`
`210`	`207`	`},`
`@@ -306,6 +303,9 @@`
`306`	`303`	`{`
`307`	`304`	`"name": "SigstoreImageVerification"`
`308`	`305`	`},`
	`306`	`+ {`
	`307`	`+ "name": "UpgradeStatus"`
	`308`	`+ },`
`309`	`309`	`{`
`310`	`310`	`"name": "UserNamespacesPodSecurityStandards"`
`311`	`311`	`},`