add back SigstoreImageVerification to techPreview

QiWang19 · QiWang19 · commit 399d65a90320 · 2025-07-28T17:02:28.000-04:00
revert commit 60ac3d5, add back SigstoreImageVerification to techpreview. Signed-off-by: Qi Wang <qiwan@redhat.com>
diff --git a/features.md b/features.md
@@ -5,7 +5,6 @@
 | MachineAPIOperatorDisableMachineHealthCheckController| | | | | |  |
 | MultiArchInstallAzure| | | | | |  |
 | ShortCertRotation| | | | | |  |
-| SigstoreImageVerification| | | | | |  |
 | NoRegistryClusterOperations| | | | <span style="background-color: #519450">Enabled</span> | |  |
 | 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> | |  |
@@ -59,6 +58,7 @@
 | 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,6 +160,7 @@ 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
@@ -47,9 +47,6 @@
                     },
                     {
                         "name": "ShortCertRotation"
-                    },
-                    {
-                        "name": "SigstoreImageVerification"
                     }
                 ],
                 "enabled": [
@@ -275,6 +272,9 @@
                     {
                         "name": "SignatureStores"
                     },
+                    {
+                        "name": "SigstoreImageVerification"
+                    },
                     {
                         "name": "SigstoreImageVerificationPKI"
                     },
diff --git a/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
@@ -63,9 +63,6 @@
                     {
                         "name": "ShortCertRotation"
                     },
-                    {
-                        "name": "SigstoreImageVerification"
-                    },
                     {
                         "name": "VSphereMixedNodeEnv"
                     }
@@ -278,6 +275,9 @@
                     {
                         "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,9 +29,6 @@
                     },
                     {
                         "name": "ShortCertRotation"
-                    },
-                    {
-                        "name": "SigstoreImageVerification"
                     }
                 ],
                 "enabled": [
@@ -275,6 +272,9 @@
                     {
                         "name": "SignatureStores"
                     },
+                    {
+                        "name": "SigstoreImageVerification"
+                    },
                     {
                         "name": "SigstoreImageVerificationPKI"
                     },
diff --git a/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml b/payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
@@ -48,9 +48,6 @@
                     {
                         "name": "ShortCertRotation"
                     },
-                    {
-                        "name": "SigstoreImageVerification"
-                    },
                     {
                         "name": "VSphereMixedNodeEnv"
                     }
@@ -278,6 +275,9 @@
                     {
                         "name": "SignatureStores"
                     },
+                    {
+                        "name": "SigstoreImageVerification"
+                    },
                     {
                         "name": "SigstoreImageVerificationPKI"
                     },

Original file line number	Diff line number	Diff line change
`@@ -47,9 +47,6 @@`
`47`	`47`	`},`
`48`	`48`	`{`
`49`	`49`	`"name": "ShortCertRotation"`
`50`		`- },`
`51`		`- {`
`52`		`- "name": "SigstoreImageVerification"`
`53`	`50`	`}`
`54`	`51`	`],`
`55`	`52`	`"enabled": [`
`@@ -275,6 +272,9 @@`
`275`	`272`	`{`
`276`	`273`	`"name": "SignatureStores"`
`277`	`274`	`},`
	`275`	`+ {`
	`276`	`+ "name": "SigstoreImageVerification"`
	`277`	`+ },`
`278`	`278`	`{`
`279`	`279`	`"name": "SigstoreImageVerificationPKI"`
`280`	`280`	`},`
Original file line number	Diff line number	Diff line change
`@@ -63,9 +63,6 @@`
`63`	`63`	`{`
`64`	`64`	`"name": "ShortCertRotation"`
`65`	`65`	`},`
`66`		`- {`
`67`		`- "name": "SigstoreImageVerification"`
`68`		`- },`
`69`	`66`	`{`
`70`	`67`	`"name": "VSphereMixedNodeEnv"`
`71`	`68`	`}`
`@@ -278,6 +275,9 @@`
`278`	`275`	`{`
`279`	`276`	`"name": "SignatureStores"`
`280`	`277`	`},`
	`278`	`+ {`
	`279`	`+ "name": "SigstoreImageVerification"`
	`280`	`+ },`
`281`	`281`	`{`
`282`	`282`	`"name": "SigstoreImageVerificationPKI"`
`283`	`283`	`},`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,6 @@`
`29`	`29`	`},`
`30`	`30`	`{`
`31`	`31`	`"name": "ShortCertRotation"`
`32`		`- },`
`33`		`- {`
`34`		`- "name": "SigstoreImageVerification"`
`35`	`32`	`}`
`36`	`33`	`],`
`37`	`34`	`"enabled": [`
`@@ -275,6 +272,9 @@`
`275`	`272`	`{`
`276`	`273`	`"name": "SignatureStores"`
`277`	`274`	`},`
	`275`	`+ {`
	`276`	`+ "name": "SigstoreImageVerification"`
	`277`	`+ },`
`278`	`278`	`{`
`279`	`279`	`"name": "SigstoreImageVerificationPKI"`
`280`	`280`	`},`
Original file line number	Diff line number	Diff line change
`@@ -48,9 +48,6 @@`
`48`	`48`	`{`
`49`	`49`	`"name": "ShortCertRotation"`
`50`	`50`	`},`
`51`		`- {`
`52`		`- "name": "SigstoreImageVerification"`
`53`		`- },`
`54`	`51`	`{`
`55`	`52`	`"name": "VSphereMixedNodeEnv"`
`56`	`53`	`}`
`@@ -278,6 +275,9 @@`
`278`	`275`	`{`
`279`	`276`	`"name": "SignatureStores"`
`280`	`277`	`},`
	`278`	`+ {`
	`279`	`+ "name": "SigstoreImageVerification"`
	`280`	`+ },`
`281`	`281`	`{`
`282`	`282`	`"name": "SigstoreImageVerificationPKI"`
`283`	`283`	`},`