OCPNODE-2436: SigstoreImageVerification featuregate marker for the ClusterImagePolicy and ImagePolicy

config/v1alpha1/tests/clusterimagepolicies.config.openshift.io/ImagePolicy.yaml → config/v1alpha1/tests/clusterimagepolicies.config.openshift.io/SigstoreImageVerification.yaml

@@ -1,7 +1,7 @@
 apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
 name: "ClusterImagePolicy"
 crdName: clusterimagepolicies.config.openshift.io
-featureGate: ImagePolicy
+featureGate: SigstoreImageVerification
 tests:
   onCreate:
     - name: Should be able to create a minimal ImagePolicy with policyType PublicKey

config/v1alpha1/tests/imagepolicies.config.openshift.io/ImagePolicy.yaml → config/v1alpha1/tests/imagepolicies.config.openshift.io/SigstoreImageVerification.yaml

@@ -1,7 +1,7 @@
 apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
 name: "ImagePolicy"
 crdName: imagepolicies.config.openshift.io
-featureGate: ImagePolicy
+featureGate: SigstoreImageVerification
 tests:
   onCreate:
     - name: Should be able to create a minimal ImagePolicy with policyType PublicKey

config/v1alpha1/types_cluster_image_policy.go

@@ -14,7 +14,7 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 // +kubebuilder:subresource:status
 // +openshift:api-approved.openshift.io=https://github.com/openshift/api/pull/1457
 // +openshift:file-pattern=cvoRunLevel=0000_10,operatorName=config-operator,operatorOrdering=01
-// +openshift:enable:FeatureGate=ImagePolicy
+// +openshift:enable:FeatureGate=SigstoreImageVerification
 // +openshift:compatibility-gen:level=4
 type ClusterImagePolicy struct {
 	metav1.TypeMeta `json:",inline"`

config/v1alpha1/types_image_policy.go

@@ -13,7 +13,7 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 // +kubebuilder:subresource:status
 // +openshift:api-approved.openshift.io=https://github.com/openshift/api/pull/1457
 // +openshift:file-pattern=cvoRunLevel=0000_10,operatorName=config-operator,operatorOrdering=01
-// +openshift:enable:FeatureGate=ImagePolicy
+// +openshift:enable:FeatureGate=SigstoreImageVerification
 // +openshift:compatibility-gen:level=4
 type ImagePolicy struct {
 	metav1.TypeMeta `json:",inline"`

config/v1alpha1/zz_generated.featuregated-crd-manifests.yaml

@@ -28,7 +28,7 @@ clusterimagepolicies.config.openshift.io:
   Capability: ""
   Category: ""
   FeatureGates:
-  - ImagePolicy
+  - SigstoreImageVerification
   FilenameOperatorName: config-operator
   FilenameOperatorOrdering: "01"
   FilenameRunLevel: "0000_10"
@@ -41,7 +41,7 @@ clusterimagepolicies.config.openshift.io:
   Scope: Cluster
   ShortNames: null
   TopLevelFeatureGates:
-  - ImagePolicy
+  - SigstoreImageVerification
   Version: v1alpha1
 
 imagepolicies.config.openshift.io:
@@ -51,7 +51,7 @@ imagepolicies.config.openshift.io:
   Capability: ""
   Category: ""
   FeatureGates:
-  - ImagePolicy
+  - SigstoreImageVerification
   FilenameOperatorName: config-operator
   FilenameOperatorOrdering: "01"
   FilenameRunLevel: "0000_10"
@@ -64,7 +64,7 @@ imagepolicies.config.openshift.io:
   Scope: Namespaced
   ShortNames: null
   TopLevelFeatureGates:
-  - ImagePolicy
+  - SigstoreImageVerification
   Version: v1alpha1
 
 insightsdatagathers.config.openshift.io:

config/v1alpha1/zz_generated.featuregated-crd-manifests/clusterimagepolicies.config.openshift.io/ImagePolicy.yaml → config/v1alpha1/zz_generated.featuregated-crd-manifests/clusterimagepolicies.config.openshift.io/SigstoreImageVerification.yaml

@@ -6,7 +6,7 @@ metadata:
     api.openshift.io/filename-cvo-runlevel: "0000_10"
     api.openshift.io/filename-operator: config-operator
     api.openshift.io/filename-ordering: "01"
-    feature-gate.release.openshift.io/ImagePolicy: "true"
+    feature-gate.release.openshift.io/SigstoreImageVerification: "true"
   name: clusterimagepolicies.config.openshift.io
 spec:
   group: config.openshift.io

config/v1alpha1/zz_generated.featuregated-crd-manifests/imagepolicies.config.openshift.io/ImagePolicy.yaml → config/v1alpha1/zz_generated.featuregated-crd-manifests/imagepolicies.config.openshift.io/SigstoreImageVerification.yaml

@@ -6,7 +6,7 @@ metadata:
     api.openshift.io/filename-cvo-runlevel: "0000_10"
     api.openshift.io/filename-operator: config-operator
     api.openshift.io/filename-ordering: "01"
-    feature-gate.release.openshift.io/ImagePolicy: "true"
+    feature-gate.release.openshift.io/SigstoreImageVerification: "true"
   name: imagepolicies.config.openshift.io
 spec:
   group: config.openshift.io

features.md

@@ -23,7 +23,6 @@
 | ExternalRouteCertificate| | | <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>  |
 | GCPClusterHostedDNS| | | <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>  |
 | GCPLabelsTags| | | <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>  |
-| ImagePolicy| | | <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>  |
 | IngressControllerLBSubnetsAWS| | | <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>  |
 | InsightsConfig| | | <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>  |
 | InsightsConfigAPI| | | <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

@@ -447,13 +447,6 @@ var (
 					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 					mustRegister()
 
-	FeatureGateImagePolicy = newFeatureGate("ImagePolicy").
-				reportProblemsToJiraComponent("node").
-				contactPerson("rphillips").
-				productScope(ocpSpecific).
-				enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-				mustRegister()
-
 	FeatureGateNodeDisruptionPolicy = newFeatureGate("NodeDisruptionPolicy").
 					reportProblemsToJiraComponent("MachineConfigOperator").
 					contactPerson("jerzhang").
@@ -575,9 +568,9 @@ var (
 					mustRegister()
 
 	FeatureGateIngressControllerLBSubnetsAWS = newFeatureGate("IngressControllerLBSubnetsAWS").
-					reportProblemsToJiraComponent("Routing").
-					contactPerson("miciah").
-					productScope(ocpSpecific).
-					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-					mustRegister()
+							reportProblemsToJiraComponent("Routing").
+							contactPerson("miciah").
+							productScope(ocpSpecific).
+							enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+							mustRegister()
 )

payload-manifests/featuregates/featureGate-Hypershift-Default.yaml

@@ -67,9 +67,6 @@
                     {
                         "name": "GatewayAPI"
                     },
-                    {
-                        "name": "ImagePolicy"
-                    },
                     {
                         "name": "IngressControllerLBSubnetsAWS"
                     },

payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml

@@ -137,9 +137,6 @@
                     {
                         "name": "HardwareSpeed"
                     },
-                    {
-                        "name": "ImagePolicy"
-                    },
                     {
                         "name": "IngressControllerLBSubnetsAWS"
                     },

payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml

@@ -137,9 +137,6 @@
                     {
                         "name": "HardwareSpeed"
                     },
-                    {
-                        "name": "ImagePolicy"
-                    },
                     {
                         "name": "IngressControllerLBSubnetsAWS"
                     },

payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml

@@ -70,9 +70,6 @@
                     {
                         "name": "GatewayAPI"
                     },
-                    {
-                        "name": "ImagePolicy"
-                    },
                     {
                         "name": "IngressControllerLBSubnetsAWS"
                     },

payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml

@@ -137,9 +137,6 @@
                     {
                         "name": "HardwareSpeed"
                     },
-                    {
-                        "name": "ImagePolicy"
-                    },
                     {
                         "name": "IngressControllerLBSubnetsAWS"
                     },

payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml

@@ -137,9 +137,6 @@
                     {
                         "name": "HardwareSpeed"
                     },
-                    {
-                        "name": "ImagePolicy"
-                    },
                     {
                         "name": "IngressControllerLBSubnetsAWS"
                     },