fixup! rename types that were too generic

Author: sanchezl

config/v1/types_cluster_image_policy.go

@@ -52,7 +52,7 @@ type ClusterImagePolicySpec struct {
 	// policy is a required field that contains configuration to allow scopes to be verified, and defines how
 	// images not matching the verification policy will be treated.
 	// +required
-	Policy ImageScopeVerificationPolicy `json:"policy"`
+	Policy *ImageScopeVerificationPolicy `json:"policy,omitempty"`
 }
 
 // +k8s:deepcopy-gen=true

config/v1/types_image_policy.go

@@ -51,7 +51,7 @@ type ImagePolicySpec struct {
 	// policy is a required field that contains configuration to allow scopes to be verified, and defines how
 	// images not matching the verification policy will be treated.
 	// +required
-	Policy ImageScopeVerificationPolicy `json:"policy"`
+	Policy *ImageScopeVerificationPolicy `json:"policy,omitempty"`
 }
 
 // +kubebuilder:validation:XValidation:rule="size(self.split('/')[0].split('.')) == 1 ? self.split('/')[0].split('.')[0].split(':')[0] == 'localhost' : true",message="invalid image scope format, scope must contain a fully qualified domain name or 'localhost'"
@@ -89,7 +89,7 @@ type PolicyRootOfTrust struct {
 	// publicKey defines the root of trust configuration based on a sigstore public key. Optionally include a Rekor public key for Rekor verification.
 	// publicKey is required when policyType is PublicKey, and forbidden otherwise.
 	// +optional
-	PublicKey *PublicKeyVerificationPolicyRootOfTrust `json:"publicKey,omitempty"`
+	PublicKey PublicKeyVerificationPolicyRootOfTrust `json:"publicKey,omitzero,omitempty"`
 	// fulcioCAWithRekor defines the root of trust configuration based on the Fulcio certificate and the Rekor public key.
 	// fulcioCAWithRekor is required when policyType is FulcioCAWithRekor, and forbidden otherwise
 	// For more information about Fulcio and Rekor, please refer to the document at:
@@ -100,7 +100,7 @@ type PolicyRootOfTrust struct {
 	// pki is required when policyType is PKI, and forbidden otherwise.
 	// +optional
 	// +openshift:enable:FeatureGate=SigstoreImageVerificationPKI
-	PKI *CertificateChainVerificationPolicyRootOfTrust `json:"pki,omitempty"`
+	PKI CertificateChainVerificationPolicyRootOfTrust `json:"pki,omitzero,omitempty"`
 }
 
 // +openshift:validation:FeatureGateAwareEnum:featureGate="",enum=PublicKey;FulcioCAWithRekor

config/v1alpha1/types_cluster_image_policy.go

@@ -51,7 +51,7 @@ type ClusterImagePolicySpec struct {
 	// policy contains configuration to allow scopes to be verified, and defines how
 	// images not matching the verification policy will be treated.
 	// +required
-	Policy ImageScopeVerificationPolicy `json:"policy"`
+	Policy *ImageScopeVerificationPolicy `json:"policy,omitempty"`
 }
 
 // +k8s:deepcopy-gen=true

config/v1alpha1/types_image_policy.go

@@ -50,7 +50,7 @@ type ImagePolicySpec struct {
 	// policy contains configuration to allow scopes to be verified, and defines how
 	// images not matching the verification policy will be treated.
 	// +required
-	Policy ImageScopeVerificationPolicy `json:"policy"`
+	Policy *ImageScopeVerificationPolicy `json:"policy,omitempty"`
 }
 
 // +kubebuilder:validation:XValidation:rule="size(self.split('/')[0].split('.')) == 1 ? self.split('/')[0].split('.')[0].split(':')[0] == 'localhost' : true",message="invalid image scope format, scope must contain a fully qualified domain name or 'localhost'"