From 0f3e9ca70020494dad42b63655389a62b02a4184 Mon Sep 17 00:00:00 2001 From: Yassine TIJANI Date: Tue, 2 Apr 2019 16:19:02 +0200 Subject: [PATCH] deprecate count field on Event API --- api/openapi-spec/swagger.json | 4 ++-- pkg/apis/core/types.go | 1 + staging/src/k8s.io/api/core/v1/generated.proto | 1 + staging/src/k8s.io/api/core/v1/types.go | 1 + staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go | 2 +- staging/src/k8s.io/api/events/v1beta1/generated.proto | 1 + staging/src/k8s.io/api/events/v1beta1/types.go | 1 + .../k8s.io/api/events/v1beta1/types_swagger_doc_generated.go | 2 +- 8 files changed, 9 insertions(+), 4 deletions(-) diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index 74c1802e498..841cf10f730 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -7282,7 +7282,7 @@ "description": "Time of the last occurrence observed" }, "state": { - "description": "State of this Series: Ongoing or Finished", + "description": "State of this Series: Ongoing or Finished Deprecated. Planned removal for 1.18", "type": "string" } }, @@ -11330,7 +11330,7 @@ "description": "Time when last Event from the series was seen before last heartbeat." }, "state": { - "description": "Information whether this series is ongoing or finished.", + "description": "Information whether this series is ongoing or finished. Deprecated. Planned removal for 1.18", "type": "string" } }, diff --git a/pkg/apis/core/types.go b/pkg/apis/core/types.go index 157d38ced5f..2043f960b55 100644 --- a/pkg/apis/core/types.go +++ b/pkg/apis/core/types.go @@ -4172,6 +4172,7 @@ type EventSeries struct { // Time of the last occurrence observed LastObservedTime metav1.MicroTime // State of this Series: Ongoing or Finished + // Deprecated. Planned removal for 1.18 State EventSeriesState } diff --git a/staging/src/k8s.io/api/core/v1/generated.proto b/staging/src/k8s.io/api/core/v1/generated.proto index b9d569f5f93..54d57bca715 100644 --- a/staging/src/k8s.io/api/core/v1/generated.proto +++ b/staging/src/k8s.io/api/core/v1/generated.proto @@ -1218,6 +1218,7 @@ message EventSeries { optional k8s.io.apimachinery.pkg.apis.meta.v1.MicroTime lastObservedTime = 2; // State of this Series: Ongoing or Finished + // Deprecated. Planned removal for 1.18 optional string state = 3; } diff --git a/staging/src/k8s.io/api/core/v1/types.go b/staging/src/k8s.io/api/core/v1/types.go index 3af134400cb..b2b71180266 100644 --- a/staging/src/k8s.io/api/core/v1/types.go +++ b/staging/src/k8s.io/api/core/v1/types.go @@ -4701,6 +4701,7 @@ type EventSeries struct { // Time of the last occurrence observed LastObservedTime metav1.MicroTime `json:"lastObservedTime,omitempty" protobuf:"bytes,2,name=lastObservedTime"` // State of this Series: Ongoing or Finished + // Deprecated. Planned removal for 1.18 State EventSeriesState `json:"state,omitempty" protobuf:"bytes,3,name=state"` } diff --git a/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go b/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go index 2c5b04f29e3..1512a9e0329 100644 --- a/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go +++ b/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go @@ -610,7 +610,7 @@ var map_EventSeries = map[string]string{ "": "EventSeries contain information on series of events, i.e. thing that was/is happening continuously for some time.", "count": "Number of occurrences in this series up to the last heartbeat time", "lastObservedTime": "Time of the last occurrence observed", - "state": "State of this Series: Ongoing or Finished", + "state": "State of this Series: Ongoing or Finished Deprecated. Planned removal for 1.18", } func (EventSeries) SwaggerDoc() map[string]string { diff --git a/staging/src/k8s.io/api/events/v1beta1/generated.proto b/staging/src/k8s.io/api/events/v1beta1/generated.proto index b3e565e6749..04eacbb280c 100644 --- a/staging/src/k8s.io/api/events/v1beta1/generated.proto +++ b/staging/src/k8s.io/api/events/v1beta1/generated.proto @@ -116,6 +116,7 @@ message EventSeries { optional k8s.io.apimachinery.pkg.apis.meta.v1.MicroTime lastObservedTime = 2; // Information whether this series is ongoing or finished. + // Deprecated. Planned removal for 1.18 optional string state = 3; } diff --git a/staging/src/k8s.io/api/events/v1beta1/types.go b/staging/src/k8s.io/api/events/v1beta1/types.go index dc48ddb069d..eef45645323 100644 --- a/staging/src/k8s.io/api/events/v1beta1/types.go +++ b/staging/src/k8s.io/api/events/v1beta1/types.go @@ -96,6 +96,7 @@ type EventSeries struct { // Time when last Event from the series was seen before last heartbeat. LastObservedTime metav1.MicroTime `json:"lastObservedTime" protobuf:"bytes,2,opt,name=lastObservedTime"` // Information whether this series is ongoing or finished. + // Deprecated. Planned removal for 1.18 State EventSeriesState `json:"state" protobuf:"bytes,3,opt,name=state"` } diff --git a/staging/src/k8s.io/api/events/v1beta1/types_swagger_doc_generated.go b/staging/src/k8s.io/api/events/v1beta1/types_swagger_doc_generated.go index a15672c191c..bbc91ed9b3a 100644 --- a/staging/src/k8s.io/api/events/v1beta1/types_swagger_doc_generated.go +++ b/staging/src/k8s.io/api/events/v1beta1/types_swagger_doc_generated.go @@ -63,7 +63,7 @@ var map_EventSeries = map[string]string{ "": "EventSeries contain information on series of events, i.e. thing that was/is happening continuously for some time.", "count": "Number of occurrences in this series up to the last heartbeat time", "lastObservedTime": "Time when last Event from the series was seen before last heartbeat.", - "state": "Information whether this series is ongoing or finished.", + "state": "Information whether this series is ongoing or finished. Deprecated. Planned removal for 1.18", } func (EventSeries) SwaggerDoc() map[string]string {