From 18f3941c24b9ed40eecd384f78778d2ff185c31d Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Fri, 17 Nov 2023 13:35:51 -0800 Subject: [PATCH] Fix list_type_missing in k8s.io/metrics --- api/api-rules/violation_exceptions.list | 2 -- pkg/generated/openapi/zz_generated.openapi.go | 10 ++++++++++ .../metrics/pkg/apis/metrics/v1alpha1/generated.proto | 1 + .../k8s.io/metrics/pkg/apis/metrics/v1alpha1/types.go | 1 + .../metrics/pkg/apis/metrics/v1beta1/generated.proto | 1 + .../k8s.io/metrics/pkg/apis/metrics/v1beta1/types.go | 1 + 6 files changed, 14 insertions(+), 2 deletions(-) diff --git a/api/api-rules/violation_exceptions.list b/api/api-rules/violation_exceptions.list index b50038e5aec..6e489015c7c 100644 --- a/api/api-rules/violation_exceptions.list +++ b/api/api-rules/violation_exceptions.list @@ -36,8 +36,6 @@ API rule violation: list_type_missing,k8s.io/kubelet/config/v1beta1,KubeletConfi API rule violation: list_type_missing,k8s.io/kubelet/config/v1beta1,KubeletConfiguration,ReservedMemory API rule violation: list_type_missing,k8s.io/kubelet/config/v1beta1,KubeletConfiguration,ShutdownGracePeriodByPodPriority API rule violation: list_type_missing,k8s.io/kubelet/config/v1beta1,KubeletConfiguration,TLSCipherSuites -API rule violation: list_type_missing,k8s.io/metrics/pkg/apis/metrics/v1alpha1,PodMetrics,Containers -API rule violation: list_type_missing,k8s.io/metrics/pkg/apis/metrics/v1beta1,PodMetrics,Containers API rule violation: names_match,k8s.io/api/authorization/v1beta1,SubjectAccessReviewSpec,Groups API rule violation: names_match,k8s.io/api/core/v1,AzureDiskVolumeSource,DataDiskURI API rule violation: names_match,k8s.io/api/core/v1,ContainerStatus,LastTerminationState diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go index 8932864538b..27590946a9f 100644 --- a/pkg/generated/openapi/zz_generated.openapi.go +++ b/pkg/generated/openapi/zz_generated.openapi.go @@ -59962,6 +59962,11 @@ func schema_pkg_apis_metrics_v1alpha1_PodMetrics(ref common.ReferenceCallback) c }, }, "containers": { + VendorExtensible: spec.VendorExtensible{ + Extensions: spec.Extensions{ + "x-kubernetes-list-type": "atomic", + }, + }, SchemaProps: spec.SchemaProps{ Description: "Metrics for all containers are collected within the same time window.", Type: []string{"array"}, @@ -60226,6 +60231,11 @@ func schema_pkg_apis_metrics_v1beta1_PodMetrics(ref common.ReferenceCallback) co }, }, "containers": { + VendorExtensible: spec.VendorExtensible{ + Extensions: spec.Extensions{ + "x-kubernetes-list-type": "atomic", + }, + }, SchemaProps: spec.SchemaProps{ Description: "Metrics for all containers are collected within the same time window.", Type: []string{"array"}, diff --git a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/generated.proto b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/generated.proto index d1938a85c48..8772b46535f 100644 --- a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/generated.proto +++ b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/generated.proto @@ -80,6 +80,7 @@ message PodMetrics { optional k8s.io.apimachinery.pkg.apis.meta.v1.Duration window = 3; // Metrics for all containers are collected within the same time window. + // +listType=atomic repeated ContainerMetrics containers = 4; } diff --git a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/types.go b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/types.go index 871a3b1777b..2b033d5020d 100644 --- a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/types.go +++ b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/types.go @@ -76,6 +76,7 @@ type PodMetrics struct { Window metav1.Duration `json:"window" protobuf:"bytes,3,opt,name=window"` // Metrics for all containers are collected within the same time window. + // +listType=atomic Containers []ContainerMetrics `json:"containers" protobuf:"bytes,4,rep,name=containers"` } diff --git a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1/generated.proto b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1/generated.proto index b2c1f6d730c..aa739d21212 100644 --- a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1/generated.proto +++ b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1/generated.proto @@ -80,6 +80,7 @@ message PodMetrics { optional k8s.io.apimachinery.pkg.apis.meta.v1.Duration window = 3; // Metrics for all containers are collected within the same time window. + // +listType=atomic repeated ContainerMetrics containers = 4; } diff --git a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1/types.go b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1/types.go index 530797b5bf6..cdf01aa3d83 100644 --- a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1/types.go +++ b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1/types.go @@ -76,6 +76,7 @@ type PodMetrics struct { Window metav1.Duration `json:"window" protobuf:"bytes,3,opt,name=window"` // Metrics for all containers are collected within the same time window. + // +listType=atomic Containers []ContainerMetrics `json:"containers" protobuf:"bytes,4,rep,name=containers"` }