Merge pull request #2384 from QiWang19/clusterimagepolicy-v1-payload

OCPNODE-3006:Add clusterimgepolicy/imagepolicy to payload

Author: openshift-merge-bot[bot]

features.md

@@ -5,6 +5,7 @@
 | 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> | |  |
@@ -58,7 +59,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>  |

features/features.go

@@ -160,7 +160,6 @@ var (
 						contactPerson("sgrunert").
 						productScope(ocpSpecific).
 						enhancementPR(legacyFeatureGateWithoutEnhancement).
-						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 						mustRegister()
 
 	FeatureGateSigstoreImageVerificationPKI = newFeatureGate("SigstoreImageVerificationPKI").

hack/update-payload-crds.sh

@@ -4,6 +4,7 @@ source "$(dirname "${BASH_SOURCE}")/lib/init.sh"
 
 crd_globs="\
     authorization/v1/zz_generated.crd-manifests/*_config-operator_*.crd*yaml\
+    config/v1/zz_generated.crd-manifests/*_config-operator_*.crd*yaml\
     machine/v1/zz_generated.crd-manifests/*.crd*yaml\
     operator/v1/zz_generated.crd-manifests//*_config-operator_*.crd*yaml\
     operator/v1alpha1/zz_generated.crd-manifests//*_config-operator_*.crd*yaml\
@@ -22,28 +23,9 @@ crd_globs="\
     operator/v1/zz_generated.crd-manifests/0000_50_openshift-controller-manager_02_openshiftcontrollermanagers*.crd.yaml
     machineconfiguration/v1/zz_generated.crd-manifests/*.crd.yaml
     operator/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigurations*.crd.yaml
-    config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_clusterimagepolicies*.crd.yaml
-    config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_imagepolicies*.crd.yaml
     config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_clustermonitoring*.crd.yaml
     operator/v1/zz_generated.crd-manifests/*_storage_01_storages*.crd.yaml
     operator/v1/zz_generated.crd-manifests/*_csi-driver_01_clustercsidrivers*.crd.yaml
-    config/v1/zz_generated.crd-manifests/0000_03_config-operator_01_proxies.crd.yaml
-    config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_apiservers-*.crd.yaml
-    config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_authentications-*.crd.yaml
-    config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_consoles.crd.yaml
-    config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_dnses.crd.yaml
-    config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_featuregates.crd.yaml
-    config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_imagecontentpolicies.crd.yaml
-    config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_imagedigestmirrorsets.crd.yaml
-    config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_images-*.crd.yaml
-    config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_imagetagmirrorsets.crd.yaml
-    config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-*.crd.yaml
-    config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_ingresses.crd.yaml
-    config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_networks.crd.yaml
-    config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_nodes-*.crd.yaml
-    config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_oauths.crd.yaml
-    config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_projects.crd.yaml
-    config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_schedulers-*.crd.yaml
     "
 
 # To allow the crd_globs to be sourced in the verify script,