From 7fc3ef1fec05949c7d036aa300fd3da5bb5a789b Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Thu, 16 Nov 2023 11:45:16 -0800 Subject: [PATCH] Fix list_type_missing in api/imagepolicy --- api/api-rules/violation_exceptions.list | 1 - pkg/generated/openapi/zz_generated.openapi.go | 5 +++++ staging/src/k8s.io/api/imagepolicy/v1alpha1/generated.proto | 1 + staging/src/k8s.io/api/imagepolicy/v1alpha1/types.go | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/api/api-rules/violation_exceptions.list b/api/api-rules/violation_exceptions.list index 4c7b5a8e634..4011ab39f49 100644 --- a/api/api-rules/violation_exceptions.list +++ b/api/api-rules/violation_exceptions.list @@ -1,4 +1,3 @@ -API rule violation: list_type_missing,k8s.io/api/imagepolicy/v1alpha1,ImageReviewSpec,Containers API rule violation: list_type_missing,k8s.io/api/networking/v1,IPBlock,Except API rule violation: list_type_missing,k8s.io/api/networking/v1,IngressLoadBalancerStatus,Ingress API rule violation: list_type_missing,k8s.io/api/networking/v1,NetworkPolicyEgressRule,Ports diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go index dec784ec261..fb84cef9a54 100644 --- a/pkg/generated/openapi/zz_generated.openapi.go +++ b/pkg/generated/openapi/zz_generated.openapi.go @@ -37939,6 +37939,11 @@ func schema_k8sio_api_imagepolicy_v1alpha1_ImageReviewSpec(ref common.ReferenceC Type: []string{"object"}, Properties: map[string]spec.Schema{ "containers": { + VendorExtensible: spec.VendorExtensible{ + Extensions: spec.Extensions{ + "x-kubernetes-list-type": "atomic", + }, + }, SchemaProps: spec.SchemaProps{ Description: "Containers is a list of a subset of the information in each container of the Pod being created.", Type: []string{"array"}, diff --git a/staging/src/k8s.io/api/imagepolicy/v1alpha1/generated.proto b/staging/src/k8s.io/api/imagepolicy/v1alpha1/generated.proto index 51328dde218..fd55972f203 100644 --- a/staging/src/k8s.io/api/imagepolicy/v1alpha1/generated.proto +++ b/staging/src/k8s.io/api/imagepolicy/v1alpha1/generated.proto @@ -54,6 +54,7 @@ message ImageReviewContainerSpec { message ImageReviewSpec { // Containers is a list of a subset of the information in each container of the Pod being created. // +optional + // +listType=atomic repeated ImageReviewContainerSpec containers = 1; // Annotations is a list of key-value pairs extracted from the Pod's annotations. diff --git a/staging/src/k8s.io/api/imagepolicy/v1alpha1/types.go b/staging/src/k8s.io/api/imagepolicy/v1alpha1/types.go index 151ffb1e9a3..19ac2b536f9 100644 --- a/staging/src/k8s.io/api/imagepolicy/v1alpha1/types.go +++ b/staging/src/k8s.io/api/imagepolicy/v1alpha1/types.go @@ -45,6 +45,7 @@ type ImageReview struct { type ImageReviewSpec struct { // Containers is a list of a subset of the information in each container of the Pod being created. // +optional + // +listType=atomic Containers []ImageReviewContainerSpec `json:"containers,omitempty" protobuf:"bytes,1,rep,name=containers"` // Annotations is a list of key-value pairs extracted from the Pod's annotations. // It only includes keys which match the pattern `*.image-policy.k8s.io/*`.