From 209fd8d90a5b410ad9d07de0a186306088bb45e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charles-Edouard=20Br=C3=A9t=C3=A9ch=C3=A9?= Date: Thu, 5 Sep 2024 15:43:10 +0200 Subject: [PATCH] feat: remove remaining yaml markers (#11020) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Charles-Edouard Brétéché --- api/kyverno/v1/common_types.go | 2 +- api/kyverno/v1/image_verification_types.go | 8 ++++---- api/kyverno/v1/spec_types.go | 2 +- api/kyverno/v2beta1/image_verification_types.go | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/api/kyverno/v1/common_types.go b/api/kyverno/v1/common_types.go index 86f48c11e4..43d89b87d4 100644 --- a/api/kyverno/v1/common_types.go +++ b/api/kyverno/v1/common_types.go @@ -220,7 +220,7 @@ type ContextAPICall struct { // Default is an optional arbitrary JSON object that the context may take if the apiCall // returns error // +optional - Default *apiextv1.JSON `json:"default,omitempty" yaml:"default,omitempty"` + Default *apiextv1.JSON `json:"default,omitempty"` // JMESPath is an optional JSON Match Expression that can be used to // transform the JSON response returned from the server. For example diff --git a/api/kyverno/v1/image_verification_types.go b/api/kyverno/v1/image_verification_types.go index dd49e03659..116e808d84 100644 --- a/api/kyverno/v1/image_verification_types.go +++ b/api/kyverno/v1/image_verification_types.go @@ -119,7 +119,7 @@ type ImageVerification struct { // Validation checks conditions across multiple image // verification attestations or context entries - Validation ValidateImageVerification `json:"validate,omitempty" yaml:"validate,omitempty"` + Validation ValidateImageVerification `json:"validate,omitempty"` // Required validates that images are verified i.e. have matched passed a signature or attestation check. // +kubebuilder:default=true @@ -325,7 +325,7 @@ type CTLog struct { // OCI registry and decodes them into a list of Statements. type Attestation struct { // Name is the variable name. - Name string `json:"name,omitempty" yaml:"name,omitempty"` + Name string `json:"name,omitempty"` // Deprecated in favour of 'Type', to be removed soon // +kubebuilder:validation:Optional @@ -366,11 +366,11 @@ type ImageRegistryCredentials struct { type ValidateImageVerification struct { // Message specifies a custom message to be displayed on failure. // +optional - Message string `json:"message,omitempty" yaml:"message,omitempty"` + Message string `json:"message,omitempty"` // Deny defines conditions used to pass or fail a validation rule. // +optional - Deny *Deny `json:"deny,omitempty" yaml:"deny,omitempty"` + Deny *Deny `json:"deny,omitempty"` } func (iv *ImageVerification) GetType() ImageVerificationType { diff --git a/api/kyverno/v1/spec_types.go b/api/kyverno/v1/spec_types.go index a5756dba00..1369d31b7d 100644 --- a/api/kyverno/v1/spec_types.go +++ b/api/kyverno/v1/spec_types.go @@ -75,7 +75,7 @@ type Spec struct { // Enabling this option will extend admission request processing times. The default value is "false". // +optional // +kubebuilder:default=false - EmitWarning *bool `json:"emitWarning,omitempty" yaml:"emitWarning,omitempty"` + EmitWarning *bool `json:"emitWarning,omitempty"` // Admission controls if rules are applied during admission. // Optional. Default value is "true". diff --git a/api/kyverno/v2beta1/image_verification_types.go b/api/kyverno/v2beta1/image_verification_types.go index d134ad82be..5fb687a53e 100644 --- a/api/kyverno/v2beta1/image_verification_types.go +++ b/api/kyverno/v2beta1/image_verification_types.go @@ -60,7 +60,7 @@ type ImageVerification struct { // Validation checks conditions across multiple image // verification attestations or context entries - Validation kyvernov1.ValidateImageVerification `json:"validate,omitempty" yaml:"validate,omitempty"` + Validation kyvernov1.ValidateImageVerification `json:"validate,omitempty"` // Required validates that images are verified i.e. have matched passed a signature or attestation check. // +kubebuilder:default=true