From fe15e4dae8e1978c95e6108656a38b659c74b3b6 Mon Sep 17 00:00:00 2001 From: Maciej Szulik Date: Tue, 16 Feb 2021 22:11:11 +0100 Subject: [PATCH] Update batch API to get rid of API violations --- api/api-rules/violation_exceptions.list | 2 -- staging/src/k8s.io/api/batch/v1/types.go | 1 + staging/src/k8s.io/api/batch/v1beta1/types.go | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/api-rules/violation_exceptions.list b/api/api-rules/violation_exceptions.list index 3b89f73ac3a..80b4f55b7c8 100644 --- a/api/api-rules/violation_exceptions.list +++ b/api/api-rules/violation_exceptions.list @@ -65,8 +65,6 @@ API rule violation: list_type_missing,k8s.io/api/autoscaling/v2beta2,HPAScalingR API rule violation: list_type_missing,k8s.io/api/autoscaling/v2beta2,HorizontalPodAutoscalerSpec,Metrics API rule violation: list_type_missing,k8s.io/api/autoscaling/v2beta2,HorizontalPodAutoscalerStatus,Conditions API rule violation: list_type_missing,k8s.io/api/autoscaling/v2beta2,HorizontalPodAutoscalerStatus,CurrentMetrics -API rule violation: list_type_missing,k8s.io/api/batch/v1,JobStatus,Conditions -API rule violation: list_type_missing,k8s.io/api/batch/v1beta1,CronJobStatus,Active API rule violation: list_type_missing,k8s.io/api/core/v1,AvoidPods,PreferAvoidPods API rule violation: list_type_missing,k8s.io/api/core/v1,Capabilities,Add API rule violation: list_type_missing,k8s.io/api/core/v1,Capabilities,Drop diff --git a/staging/src/k8s.io/api/batch/v1/types.go b/staging/src/k8s.io/api/batch/v1/types.go index c148d77b6e3..3478ef32d41 100644 --- a/staging/src/k8s.io/api/batch/v1/types.go +++ b/staging/src/k8s.io/api/batch/v1/types.go @@ -176,6 +176,7 @@ type JobStatus struct { // +optional // +patchMergeKey=type // +patchStrategy=merge + // +listType=atomic Conditions []JobCondition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"` // Represents time when the job was acknowledged by the job controller. diff --git a/staging/src/k8s.io/api/batch/v1beta1/types.go b/staging/src/k8s.io/api/batch/v1beta1/types.go index 6f49cc2a3f5..07b411b6fdf 100644 --- a/staging/src/k8s.io/api/batch/v1beta1/types.go +++ b/staging/src/k8s.io/api/batch/v1beta1/types.go @@ -156,6 +156,7 @@ const ( type CronJobStatus struct { // A list of pointers to currently running jobs. // +optional + // +listType=atomic Active []v1.ObjectReference `json:"active,omitempty" protobuf:"bytes,1,rep,name=active"` // Information when was the last time the job was successfully scheduled.