Drop SigstoreImageVerification from all sets for multi PR merge

QiWang19 · QiWang19 · commit 54e93000e3bf · 2025-07-18T18:53:02.000-04:00
Signed-off-by: Qi Wang &lt;qiwan@redhat.com&gt;
diff --git a/features.md b/features.md
@@ -5,6 +5,7 @@
 | MachineAPIOperatorDisableMachineHealthCheckController| | | | | |  |
 | MultiArchInstallAzure| | | | | |  |
 | ShortCertRotation| | | | | |  |
+| SigstoreImageVerification| | | | | |  |
 | BootImageSkewEnforcement| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | |  |
 | ClusterVersionOperatorConfiguration| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | |  |
 | DualReplica| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | |  |
@@ -55,7 +56,6 @@
 | OVNObservability| | | <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>  |
 | PreconfiguredUDNAddresses| | | <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>  |
 | SignatureStores| | | <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>  |
 | 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>  |
diff --git a/features/features.go b/features/features.go
@@ -160,7 +160,6 @@ var (
 						contactPerson("sgrunert").
 						productScope(ocpSpecific).
 						enhancementPR(legacyFeatureGateWithoutEnhancement).
-						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 						mustRegister()
 
 	FeatureGateSigstoreImageVerificationPKI = newFeatureGate("SigstoreImageVerificationPKI").
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
@@ -44,6 +44,9 @@
                     },
                     {
                         "name": "ShortCertRotation"
+                    },
+                    {
+                        "name": "SigstoreImageVerification"
                     }
                 ],
                 "enabled": [
@@ -269,9 +272,6 @@
                     {
                         "name": "SignatureStores"
                     },
-                    {
-                        "name": "SigstoreImageVerification"
-                    },
                     {
                         "name": "SigstoreImageVerificationPKI"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -60,6 +60,9 @@
                     {
                         "name": "ShortCertRotation"
                     },
+                    {
+                        "name": "SigstoreImageVerification"
+                    },
                     {
                         "name": "VSphereMixedNodeEnv"
                     }
@@ -272,9 +275,6 @@
                     {
                         "name": "SignatureStores"
                     },
-                    {
-                        "name": "SigstoreImageVerification"
-                    },
                     {
                         "name": "SigstoreImageVerificationPKI"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
@@ -29,6 +29,9 @@
                     },
                     {
                         "name": "ShortCertRotation"
+                    },
+                    {
+                        "name": "SigstoreImageVerification"
                     }
                 ],
                 "enabled": [
@@ -269,9 +272,6 @@
                     {
                         "name": "SignatureStores"
                     },
-                    {
-                        "name": "SigstoreImageVerification"
-                    },
                     {
                         "name": "SigstoreImageVerificationPKI"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -45,6 +45,9 @@
                     {
                         "name": "ShortCertRotation"
                     },
+                    {
+                        "name": "SigstoreImageVerification"
+                    },
                     {
                         "name": "VSphereMixedNodeEnv"
                     }
@@ -272,9 +275,6 @@
                     {
                         "name": "SignatureStores"
                     },
-                    {
-                        "name": "SigstoreImageVerification"
-                    },
                     {
                         "name": "SigstoreImageVerificationPKI"
                     },

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,9 @@`
`44`	`44`	`},`
`45`	`45`	`{`
`46`	`46`	`"name": "ShortCertRotation"`
	`47`	`+ },`
	`48`	`+ {`
	`49`	`+ "name": "SigstoreImageVerification"`
`47`	`50`	`}`
`48`	`51`	`],`
`49`	`52`	`"enabled": [`
`@@ -269,9 +272,6 @@`
`269`	`272`	`{`
`270`	`273`	`"name": "SignatureStores"`
`271`	`274`	`},`
`272`		`- {`
`273`		`- "name": "SigstoreImageVerification"`
`274`		`- },`
`275`	`275`	`{`
`276`	`276`	`"name": "SigstoreImageVerificationPKI"`
`277`	`277`	`},`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,9 @@`
`60`	`60`	`{`
`61`	`61`	`"name": "ShortCertRotation"`
`62`	`62`	`},`
	`63`	`+ {`
	`64`	`+ "name": "SigstoreImageVerification"`
	`65`	`+ },`
`63`	`66`	`{`
`64`	`67`	`"name": "VSphereMixedNodeEnv"`
`65`	`68`	`}`
`@@ -272,9 +275,6 @@`
`272`	`275`	`{`
`273`	`276`	`"name": "SignatureStores"`
`274`	`277`	`},`
`275`		`- {`
`276`		`- "name": "SigstoreImageVerification"`
`277`		`- },`
`278`	`278`	`{`
`279`	`279`	`"name": "SigstoreImageVerificationPKI"`
`280`	`280`	`},`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,9 @@`
`29`	`29`	`},`
`30`	`30`	`{`
`31`	`31`	`"name": "ShortCertRotation"`
	`32`	`+ },`
	`33`	`+ {`
	`34`	`+ "name": "SigstoreImageVerification"`
`32`	`35`	`}`
`33`	`36`	`],`
`34`	`37`	`"enabled": [`
`@@ -269,9 +272,6 @@`
`269`	`272`	`{`
`270`	`273`	`"name": "SignatureStores"`
`271`	`274`	`},`
`272`		`- {`
`273`		`- "name": "SigstoreImageVerification"`
`274`		`- },`
`275`	`275`	`{`
`276`	`276`	`"name": "SigstoreImageVerificationPKI"`
`277`	`277`	`},`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,9 @@`
`45`	`45`	`{`
`46`	`46`	`"name": "ShortCertRotation"`
`47`	`47`	`},`
	`48`	`+ {`
	`49`	`+ "name": "SigstoreImageVerification"`
	`50`	`+ },`
`48`	`51`	`{`
`49`	`52`	`"name": "VSphereMixedNodeEnv"`
`50`	`53`	`}`
`@@ -272,9 +275,6 @@`
`272`	`275`	`{`
`273`	`276`	`"name": "SignatureStores"`
`274`	`277`	`},`
`275`		`- {`
`276`		`- "name": "SigstoreImageVerification"`
`277`		`- },`
`278`	`278`	`{`
`279`	`279`	`"name": "SigstoreImageVerificationPKI"`
`280`	`280`	`},`