Merge pull request #90449 from wojtek-t/remove_events_deprecated_field

Remove events deprecated field

api/openapi-spec/swagger.json

@@ -6393,10 +6393,6 @@
         "lastObservedTime": {
           "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.MicroTime",
           "description": "Time of the last occurrence observed"
-        },
-        "state": {
-          "description": "State of this Series: Ongoing or Finished Deprecated. Planned removal for 1.18",
-          "type": "string"
         }
       },
       "type": "object"
@@ -10778,16 +10774,11 @@
         "lastObservedTime": {
           "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.MicroTime",
           "description": "Time when last Event from the series was seen before last heartbeat."
-        },
-        "state": {
-          "description": "Information whether this series is ongoing or finished. Deprecated. Planned removal for 1.18",
-          "type": "string"
         }
       },
       "required": [
         "count",
-        "lastObservedTime",
+        "lastObservedTime"
-        "state"
       ],
       "type": "object"
     },

pkg/apis/core/types.go

@@ -4521,21 +4521,8 @@ type EventSeries struct {
 	Count int32
 	// Time of the last occurrence observed
 	LastObservedTime metav1.MicroTime
-	// State of this Series: Ongoing or Finished
-	// Deprecated. Planned removal for 1.18
-	State EventSeriesState
 }
 
-// EventSeriesState defines the state of event series
-type EventSeriesState string
-
-// These are valid values of event series state
-const (
-	EventSeriesStateOngoing  EventSeriesState = "Ongoing"
-	EventSeriesStateFinished EventSeriesState = "Finished"
-	EventSeriesStateUnknown  EventSeriesState = "Unknown"
-)
-
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // EventList is a list of events.

pkg/apis/core/v1/zz_generated.conversion.go

@@ -3585,7 +3585,6 @@ func Convert_core_EventList_To_v1_EventList(in *core.EventList, out *v1.EventLis
 func autoConvert_v1_EventSeries_To_core_EventSeries(in *v1.EventSeries, out *core.EventSeries, s conversion.Scope) error {
 	out.Count = in.Count
 	out.LastObservedTime = in.LastObservedTime
-	out.State = core.EventSeriesState(in.State)
 	return nil
 }
 
@@ -3597,7 +3596,6 @@ func Convert_v1_EventSeries_To_core_EventSeries(in *v1.EventSeries, out *core.Ev
 func autoConvert_core_EventSeries_To_v1_EventSeries(in *core.EventSeries, out *v1.EventSeries, s conversion.Scope) error {
 	out.Count = in.Count
 	out.LastObservedTime = in.LastObservedTime
-	out.State = v1.EventSeriesState(in.State)
 	return nil
 }
 

pkg/apis/events/v1beta1/zz_generated.conversion.go

@@ -153,7 +153,6 @@ func Convert_core_EventList_To_v1beta1_EventList(in *core.EventList, out *v1beta
 func autoConvert_v1beta1_EventSeries_To_core_EventSeries(in *v1beta1.EventSeries, out *core.EventSeries, s conversion.Scope) error {
 	out.Count = in.Count
 	out.LastObservedTime = in.LastObservedTime
-	out.State = core.EventSeriesState(in.State)
 	return nil
 }
 
@@ -165,7 +164,6 @@ func Convert_v1beta1_EventSeries_To_core_EventSeries(in *v1beta1.EventSeries, ou
 func autoConvert_core_EventSeries_To_v1beta1_EventSeries(in *core.EventSeries, out *v1beta1.EventSeries, s conversion.Scope) error {
 	out.Count = in.Count
 	out.LastObservedTime = in.LastObservedTime
-	out.State = v1beta1.EventSeriesState(in.State)
 	return nil
 }
 

staging/src/k8s.io/api/core/v1/generated.proto

@@ -1455,10 +1455,6 @@ message EventSeries {
 
   // Time of the last occurrence observed
   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;
 }
 
 // EventSource contains information for an event.

staging/src/k8s.io/api/core/v1/types.go

@@ -5215,19 +5215,10 @@ type EventSeries struct {
 	Count int32 `json:"count,omitempty" protobuf:"varint,1,name=count"`
 	// 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
+	// +k8s:deprecated=state,protobuf=3
-	State EventSeriesState `json:"state,omitempty" protobuf:"bytes,3,name=state"`
 }
 
-type EventSeriesState string
-
-const (
-	EventSeriesStateOngoing  EventSeriesState = "Ongoing"
-	EventSeriesStateFinished EventSeriesState = "Finished"
-	EventSeriesStateUnknown  EventSeriesState = "Unknown"
-)
-
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // EventList is a list of events.

staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go

@@ -663,7 +663,6 @@ 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 Deprecated. Planned removal for 1.18",
 }
 
 func (EventSeries) SwaggerDoc() map[string]string {

staging/src/k8s.io/api/events/v1beta1/generated.pb.go

@@ -139,58 +139,56 @@ func init() {
 }
 
 var fileDescriptor_4f97f691c32a5ac8 = []byte{
-	// 801 bytes of a gzipped FileDescriptorProto
+	// 774 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0xcd, 0x6e, 0xdb, 0x46,
-	0x10, 0x16, 0x13, 0x4b, 0xb2, 0x56, 0x49, 0x2c, 0x6f, 0x0e, 0xde, 0xb8, 0x00, 0xa5, 0x2a, 0x40,
+	0x10, 0x16, 0x13, 0x4b, 0xb2, 0x56, 0x49, 0x2c, 0x6f, 0x0e, 0xde, 0xb8, 0x00, 0x25, 0x28, 0x40,
-	0x20, 0x14, 0x08, 0x59, 0x07, 0x45, 0xdb, 0x6b, 0x18, 0xb9, 0x45, 0x02, 0xbb, 0x01, 0xd6, 0x3e,
+	0x20, 0x14, 0x08, 0x59, 0x07, 0x45, 0xd1, 0x6b, 0x18, 0xb9, 0x45, 0x02, 0xbb, 0x01, 0x36, 0x3e,
 	0x15, 0x3d, 0x64, 0x45, 0x4d, 0x68, 0x56, 0xe2, 0x2e, 0xb1, 0xbb, 0x12, 0xe0, 0x5b, 0x2f, 0x05,
-	0x7a, 0xec, 0x33, 0xf4, 0x09, 0xfa, 0x18, 0x3e, 0xe6, 0x98, 0x93, 0x50, 0xb3, 0x6f, 0xd1, 0x53,
+	0x7a, 0xec, 0x33, 0xf4, 0xd6, 0x5b, 0x1f, 0xc3, 0xc7, 0x1c, 0x7d, 0x12, 0x6a, 0xf6, 0x45, 0x0a,
-	0xc1, 0xe5, 0x4a, 0x94, 0xf5, 0x83, 0xa8, 0xe8, 0x4d, 0x9c, 0xf9, 0x7e, 0x66, 0x66, 0x47, 0x83,
+	0x2e, 0x57, 0xa2, 0xac, 0x1f, 0x58, 0x45, 0x6f, 0xe2, 0xcc, 0xf7, 0x33, 0x33, 0x3b, 0x1a, 0x14,
-	0x82, 0xd1, 0xb7, 0xca, 0x8b, 0x85, 0x3f, 0x9a, 0x0c, 0x40, 0x72, 0xd0, 0xa0, 0xfc, 0x29, 0xf0,
+	0x8c, 0xbe, 0x55, 0x5e, 0x2c, 0xfc, 0xd1, 0x64, 0x00, 0x92, 0x83, 0x06, 0xe5, 0x4f, 0x81, 0x0f,
-	0xa1, 0x90, 0xbe, 0x4d, 0xb0, 0x34, 0xf6, 0x61, 0x0a, 0x5c, 0x2b, 0x7f, 0x7a, 0x32, 0x00, 0xcd,
+	0x85, 0xf4, 0x6d, 0x82, 0xa5, 0xb1, 0x0f, 0x53, 0xe0, 0x5a, 0xf9, 0xd3, 0x93, 0x01, 0x68, 0x76,
-	0x4e, 0xfc, 0x08, 0x38, 0x48, 0xa6, 0x61, 0xe8, 0xa5, 0x52, 0x68, 0x81, 0x9f, 0x14, 0x50, 0x8f,
+	0xe2, 0x47, 0xc0, 0x41, 0x32, 0x0d, 0x43, 0x2f, 0x95, 0x42, 0x0b, 0xfc, 0xac, 0x80, 0x7a, 0x2c,
-	0xa5, 0xb1, 0x57, 0x40, 0x3d, 0x0b, 0x3d, 0x7e, 0x1e, 0xc5, 0xfa, 0x6a, 0x32, 0xf0, 0x42, 0x91,
+	0x8d, 0xbd, 0x02, 0xea, 0x59, 0xe8, 0xf1, 0xcb, 0x28, 0xd6, 0x97, 0x93, 0x81, 0x17, 0x8a, 0xc4,
-	0xf8, 0x91, 0x88, 0x84, 0x6f, 0x18, 0x83, 0xc9, 0x7b, 0xf3, 0x65, 0x3e, 0xcc, 0xaf, 0x42, 0xe9,
+	0x8f, 0x44, 0x24, 0x7c, 0xc3, 0x18, 0x4c, 0x3e, 0x99, 0x2f, 0xf3, 0x61, 0x7e, 0x15, 0x4a, 0xc7,
-	0xb8, 0xbb, 0x64, 0x1a, 0x0a, 0x09, 0xfe, 0x74, 0xcd, 0xed, 0xf8, 0xab, 0x12, 0x93, 0xb0, 0xf0,
+	0xdd, 0x25, 0xd3, 0x50, 0x48, 0xf0, 0xa7, 0x6b, 0x6e, 0xc7, 0x5f, 0x97, 0x98, 0x84, 0x85, 0x97,
-	0x2a, 0xe6, 0x20, 0xaf, 0xfd, 0x74, 0x14, 0xe5, 0x01, 0xe5, 0x27, 0xa0, 0xd9, 0x26, 0x96, 0xbf,
+	0x31, 0x07, 0x79, 0xe5, 0xa7, 0xa3, 0x28, 0x0f, 0x28, 0x3f, 0x01, 0xcd, 0x36, 0xb1, 0xfc, 0x6d,
-	0x8d, 0x25, 0x27, 0x5c, 0xc7, 0x09, 0xac, 0x11, 0xbe, 0xfe, 0x14, 0x41, 0x85, 0x57, 0x90, 0xb0,
+	0x2c, 0x39, 0xe1, 0x3a, 0x4e, 0x60, 0x8d, 0xf0, 0xcd, 0x7d, 0x04, 0x15, 0x5e, 0x42, 0xc2, 0x56,
-	0x55, 0x5e, 0xf7, 0x8f, 0x06, 0xaa, 0x9e, 0xe6, 0x43, 0xc0, 0xef, 0xd0, 0x7e, 0x5e, 0xcd, 0x90,
+	0x79, 0xdd, 0x3f, 0x1a, 0xa8, 0x7a, 0x9a, 0x0f, 0x01, 0x7f, 0x44, 0xfb, 0x79, 0x35, 0x43, 0xa6,
-	0x69, 0x46, 0x9c, 0x8e, 0xd3, 0x6b, 0xbe, 0xf8, 0xd2, 0x2b, 0x27, 0xb5, 0x10, 0xf5, 0xd2, 0x51,
+	0x19, 0x71, 0x3a, 0x4e, 0xaf, 0xf9, 0xea, 0x2b, 0xaf, 0x9c, 0xd4, 0x42, 0xd4, 0x4b, 0x47, 0x51,
-	0x94, 0x07, 0x94, 0x97, 0xa3, 0xbd, 0xe9, 0x89, 0xf7, 0x76, 0xf0, 0x33, 0x84, 0xfa, 0x1c, 0x34,
+	0x1e, 0x50, 0x5e, 0x8e, 0xf6, 0xa6, 0x27, 0xde, 0xfb, 0xc1, 0xcf, 0x10, 0xea, 0x73, 0xd0, 0x2c,
-	0x0b, 0xf0, 0xcd, 0xac, 0x5d, 0xc9, 0x66, 0x6d, 0x54, 0xc6, 0xe8, 0x42, 0x15, 0xbf, 0x43, 0x0d,
+	0xc0, 0xd7, 0xb3, 0x76, 0x25, 0x9b, 0xb5, 0x51, 0x19, 0xa3, 0x0b, 0x55, 0xfc, 0x11, 0x35, 0xcc,
-	0x33, 0xef, 0xcb, 0x38, 0x01, 0x72, 0xcf, 0x58, 0xf8, 0xbb, 0x59, 0x9c, 0xc7, 0xa1, 0x14, 0x39,
+	0xbc, 0x2f, 0xe2, 0x04, 0xc8, 0x03, 0x63, 0xe1, 0xef, 0x66, 0x71, 0x1e, 0x87, 0x52, 0xe4, 0xb4,
-	0x2d, 0x38, 0xb4, 0x0e, 0x8d, 0xd3, 0xb9, 0x12, 0x2d, 0x45, 0xf1, 0x1b, 0x54, 0x53, 0x20, 0x63,
+	0xe0, 0xd0, 0x3a, 0x34, 0x4e, 0xe7, 0x4a, 0xb4, 0x14, 0xc5, 0xef, 0x50, 0x4d, 0x81, 0x8c, 0x41,
-	0x50, 0xe4, 0xbe, 0x91, 0x7f, 0xe6, 0x6d, 0x7d, 0x6b, 0xcf, 0x08, 0x5c, 0x18, 0x74, 0x80, 0xb2,
+	0x91, 0x87, 0x46, 0xfe, 0x85, 0xb7, 0xf5, 0xad, 0x3d, 0x23, 0xf0, 0xc1, 0xa0, 0x03, 0x94, 0xcd,
-	0x59, 0xbb, 0x56, 0xfc, 0xa6, 0x56, 0x01, 0x9f, 0xa3, 0xc7, 0x12, 0x52, 0x21, 0x75, 0xcc, 0xa3,
+	0xda, 0xb5, 0xe2, 0x37, 0xb5, 0x0a, 0xf8, 0x1c, 0x3d, 0x95, 0x90, 0x0a, 0xa9, 0x63, 0x1e, 0xbd,
-	0x57, 0x82, 0x6b, 0x29, 0xc6, 0x63, 0x90, 0x64, 0xaf, 0xe3, 0xf4, 0x1a, 0xc1, 0x67, 0xb6, 0x8c,
+	0x11, 0x5c, 0x4b, 0x31, 0x1e, 0x83, 0x24, 0x7b, 0x1d, 0xa7, 0xd7, 0x08, 0xbe, 0xb0, 0x65, 0x3c,
-	0xc7, 0x74, 0x1d, 0x42, 0x37, 0xf1, 0xf0, 0xf7, 0xe8, 0x70, 0x11, 0x7e, 0xcd, 0x95, 0x66, 0x3c,
+	0xa5, 0xeb, 0x10, 0xba, 0x89, 0x87, 0xbf, 0x47, 0x87, 0x8b, 0xf0, 0x5b, 0xae, 0x34, 0xe3, 0x21,
-	0x04, 0x52, 0x35, 0x62, 0x4f, 0xac, 0xd8, 0x21, 0x5d, 0x05, 0xd0, 0x75, 0x0e, 0x7e, 0x86, 0x6a,
+	0x90, 0xaa, 0x11, 0x7b, 0x66, 0xc5, 0x0e, 0xe9, 0x2a, 0x80, 0xae, 0x73, 0xf0, 0x0b, 0x54, 0x63,
-	0x2c, 0xd4, 0xb1, 0xe0, 0xa4, 0x66, 0xd8, 0x8f, 0x2c, 0xbb, 0xf6, 0xd2, 0x44, 0xa9, 0xcd, 0xe6,
+	0xa1, 0x8e, 0x05, 0x27, 0x35, 0xc3, 0x7e, 0x62, 0xd9, 0xb5, 0xd7, 0x26, 0x4a, 0x6d, 0x36, 0xc7,
-	0x38, 0x09, 0x4c, 0x09, 0x4e, 0xea, 0x77, 0x71, 0xd4, 0x44, 0xa9, 0xcd, 0xe2, 0x4b, 0xd4, 0x90,
+	0x49, 0x60, 0x4a, 0x70, 0x52, 0xbf, 0x8b, 0xa3, 0x26, 0x4a, 0x6d, 0x16, 0x5f, 0xa0, 0x86, 0x84,
-	0x10, 0x31, 0x39, 0x8c, 0x79, 0x44, 0xf6, 0xcd, 0xd8, 0x9e, 0x2e, 0x8f, 0x2d, 0x5f, 0xec, 0xf2,
+	0x88, 0xc9, 0x61, 0xcc, 0x23, 0xb2, 0x6f, 0xc6, 0xf6, 0x7c, 0x79, 0x6c, 0xf9, 0x62, 0x97, 0xcf,
-	0x99, 0x29, 0xbc, 0x07, 0x09, 0x3c, 0x5c, 0x7a, 0x09, 0x3a, 0x67, 0xd3, 0x52, 0x08, 0xbf, 0x41,
+	0x4c, 0xe1, 0x13, 0x48, 0xe0, 0xe1, 0xd2, 0x4b, 0xd0, 0x39, 0x9b, 0x96, 0x42, 0xf8, 0x1d, 0xaa,
-	0x75, 0x09, 0xe3, 0x7c, 0xd1, 0x48, 0x63, 0x77, 0xcd, 0x66, 0x36, 0x6b, 0xd7, 0x69, 0xc1, 0xa3,
+	0x4b, 0x18, 0xe7, 0x8b, 0x46, 0x1a, 0xbb, 0x6b, 0x36, 0xb3, 0x59, 0xbb, 0x4e, 0x0b, 0x1e, 0x9d,
-	0x73, 0x01, 0xdc, 0x41, 0x7b, 0x5c, 0x68, 0x20, 0xc8, 0xf4, 0xf1, 0xc0, 0xfa, 0xee, 0xfd, 0x20,
+	0x0b, 0xe0, 0x0e, 0xda, 0xe3, 0x42, 0x03, 0x41, 0xa6, 0x8f, 0x47, 0xd6, 0x77, 0xef, 0x07, 0xa1,
-	0x34, 0x50, 0x93, 0xc9, 0x11, 0xfa, 0x3a, 0x05, 0xd2, 0xbc, 0x8b, 0xb8, 0xbc, 0x4e, 0x81, 0x9a,
+	0x81, 0x9a, 0x4c, 0x8e, 0xd0, 0x57, 0x29, 0x90, 0xe6, 0x5d, 0xc4, 0xc5, 0x55, 0x0a, 0xd4, 0x64,
-	0x0c, 0x06, 0xd4, 0x1a, 0x42, 0x2a, 0x21, 0xcc, 0x15, 0x2f, 0xc4, 0x44, 0x86, 0x40, 0x1e, 0x98,
+	0x30, 0xa0, 0xd6, 0x10, 0x52, 0x09, 0x61, 0xae, 0xf8, 0x41, 0x4c, 0x64, 0x08, 0xe4, 0x91, 0x29,
-	0xc2, 0xda, 0x9b, 0x0a, 0x2b, 0x96, 0xc3, 0xc0, 0x02, 0x62, 0xe5, 0x5a, 0xfd, 0x15, 0x01, 0xba,
+	0xac, 0xbd, 0xa9, 0xb0, 0x62, 0x39, 0x0c, 0x2c, 0x20, 0x56, 0xae, 0xd5, 0x5f, 0x11, 0xa0, 0x6b,
-	0x26, 0x89, 0x7f, 0x73, 0x10, 0x29, 0x83, 0xdf, 0xc5, 0x52, 0x99, 0xc5, 0x54, 0x9a, 0x25, 0x29,
+	0x92, 0xf8, 0x37, 0x07, 0x91, 0x32, 0xf8, 0x5d, 0x2c, 0x95, 0x59, 0x4c, 0xa5, 0x59, 0x92, 0x92,
-	0x79, 0x68, 0xfc, 0xbe, 0xd8, 0x6d, 0xe5, 0xcd, 0xb6, 0x77, 0xac, 0x35, 0xe9, 0x6f, 0xd1, 0xa4,
+	0xc7, 0xc6, 0xef, 0xcb, 0xdd, 0x56, 0xde, 0x6c, 0x7b, 0xc7, 0x5a, 0x93, 0xfe, 0x16, 0x4d, 0xba,
-	0x5b, 0xdd, 0xf0, 0xaf, 0x0e, 0x3a, 0x2a, 0x93, 0x67, 0x6c, 0xb9, 0x92, 0x47, 0xff, 0xb9, 0x92,
+	0xd5, 0x0d, 0xff, 0xea, 0xa0, 0xa3, 0x32, 0x79, 0xc6, 0x96, 0x2b, 0x79, 0xf2, 0x9f, 0x2b, 0x69,
-	0xb6, 0xad, 0xe4, 0xa8, 0xbf, 0x59, 0x92, 0x6e, 0xf3, 0xc2, 0x2f, 0xd1, 0x41, 0x99, 0x7a, 0x25,
+	0xdb, 0x4a, 0x8e, 0xfa, 0x9b, 0x25, 0xe9, 0x36, 0x2f, 0xfc, 0x1a, 0x1d, 0x94, 0xa9, 0x37, 0x62,
-	0x26, 0x5c, 0x93, 0x83, 0x8e, 0xd3, 0xab, 0x06, 0x47, 0x56, 0xf2, 0xa0, 0x7f, 0x37, 0x4d, 0x57,
+	0xc2, 0x35, 0x39, 0xe8, 0x38, 0xbd, 0x6a, 0x70, 0x64, 0x25, 0x0f, 0xfa, 0x77, 0xd3, 0x74, 0x15,
-	0xf1, 0xdd, 0x3f, 0x1d, 0x54, 0xfc, 0xdf, 0xcf, 0x62, 0xa5, 0xf1, 0x4f, 0x6b, 0x87, 0xca, 0xdb,
+	0xdf, 0xfd, 0xcb, 0x41, 0xc5, 0xff, 0xfd, 0x2c, 0x56, 0x1a, 0xff, 0xb4, 0x76, 0xa8, 0xbc, 0xdd,
-	0xad, 0x91, 0x9c, 0x6d, 0xce, 0x54, 0xcb, 0x3a, 0xef, 0xcf, 0x23, 0x4b, 0x47, 0xea, 0x14, 0x55,
+	0x1a, 0xc9, 0xd9, 0xe6, 0x4c, 0xb5, 0xac, 0xf3, 0xfe, 0x3c, 0xb2, 0x74, 0xa4, 0x4e, 0x51, 0x35,
-	0x63, 0x0d, 0x89, 0x22, 0xf7, 0x3a, 0xf7, 0x7b, 0xcd, 0x17, 0x9d, 0x4f, 0x5d, 0x90, 0xe0, 0xa1,
+	0xd6, 0x90, 0x28, 0xf2, 0xa0, 0xf3, 0xb0, 0xd7, 0x7c, 0xd5, 0xb9, 0xef, 0x82, 0x04, 0x8f, 0xad,
-	0x15, 0xab, 0xbe, 0xce, 0x69, 0xb4, 0x60, 0x77, 0x33, 0x07, 0x35, 0x97, 0x2e, 0x0c, 0x7e, 0x8a,
+	0x58, 0xf5, 0x6d, 0x4e, 0xa3, 0x05, 0xbb, 0xfb, 0xa7, 0x83, 0x9a, 0x4b, 0x17, 0x06, 0x3f, 0x47,
-	0xaa, 0xa1, 0xe9, 0xdd, 0x31, 0xbd, 0x2f, 0x48, 0x45, 0xc7, 0x45, 0x0e, 0x4f, 0x50, 0x6b, 0xcc,
+	0xd5, 0xd0, 0xf4, 0xee, 0x98, 0xde, 0x17, 0xa4, 0xa2, 0xe3, 0x22, 0x87, 0x27, 0xa8, 0x35, 0x66,
-	0x94, 0x7e, 0x3b, 0x50, 0x20, 0xa7, 0x30, 0xfc, 0x3f, 0x77, 0x72, 0xb1, 0xb4, 0x67, 0x2b, 0x82,
+	0x4a, 0xbf, 0x1f, 0x28, 0x90, 0x53, 0x18, 0xfe, 0x9f, 0x3b, 0xb9, 0x58, 0xda, 0xb3, 0x15, 0x41,
-	0x74, 0xcd, 0x02, 0x7f, 0x83, 0xaa, 0x4a, 0x33, 0x0d, 0xe6, 0x68, 0x36, 0x82, 0xcf, 0xe7, 0xb5,
+	0xba, 0x66, 0x11, 0xbc, 0xbc, 0xbe, 0x75, 0x2b, 0x9f, 0x6f, 0xdd, 0xca, 0xcd, 0xad, 0x5b, 0xf9,
-	0x5d, 0xe4, 0xc1, 0x7f, 0x66, 0xed, 0xd6, 0x52, 0x23, 0x26, 0x46, 0x0b, 0x7c, 0xf0, 0xfc, 0xe6,
+	0x25, 0x73, 0x9d, 0xeb, 0xcc, 0x75, 0x3e, 0x67, 0xae, 0x73, 0x93, 0xb9, 0xce, 0xdf, 0x99, 0xeb,
-	0xd6, 0xad, 0x7c, 0xb8, 0x75, 0x2b, 0x1f, 0x6f, 0xdd, 0xca, 0x2f, 0x99, 0xeb, 0xdc, 0x64, 0xae,
+	0xfc, 0xfe, 0x8f, 0x5b, 0xf9, 0xb1, 0x6e, 0xdb, 0xfe, 0x37, 0x00, 0x00, 0xff, 0xff, 0xfc, 0xc9,
-	0xf3, 0x21, 0x73, 0x9d, 0x8f, 0x99, 0xeb, 0xfc, 0x95, 0xb9, 0xce, 0xef, 0x7f, 0xbb, 0x95, 0x1f,
+	0x09, 0x14, 0x84, 0x07, 0x00, 0x00,
-	0xeb, 0x76, 0x5e, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x25, 0x9b, 0x14, 0x4d, 0xbd, 0x07, 0x00,
-	0x00,
 }
 
 func (m *Event) Marshal() (dAtA []byte, err error) {
@@ -400,11 +398,6 @@ func (m *EventSeries) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
-	i -= len(m.State)
-	copy(dAtA[i:], m.State)
-	i = encodeVarintGenerated(dAtA, i, uint64(len(m.State)))
-	i--
-	dAtA[i] = 0x1a
 	{
 		size, err := m.LastObservedTime.MarshalToSizedBuffer(dAtA[:i])
 		if err != nil {
@@ -500,8 +493,6 @@ func (m *EventSeries) Size() (n int) {
 	n += 1 + sovGenerated(uint64(m.Count))
 	l = m.LastObservedTime.Size()
 	n += 1 + l + sovGenerated(uint64(l))
-	l = len(m.State)
-	n += 1 + l + sovGenerated(uint64(l))
 	return n
 }
 
@@ -558,7 +549,6 @@ func (this *EventSeries) String() string {
 	s := strings.Join([]string{`&EventSeries{`,
 		`Count:` + fmt.Sprintf("%v", this.Count) + `,`,
 		`LastObservedTime:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.LastObservedTime), "MicroTime", "v1.MicroTime", 1), `&`, ``, 1) + `,`,
-		`State:` + fmt.Sprintf("%v", this.State) + `,`,
 		`}`,
 	}, "")
 	return s
@@ -1306,38 +1296,6 @@ func (m *EventSeries) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 3:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field State", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowGenerated
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				stringLen |= uint64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthGenerated
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthGenerated
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.State = EventSeriesState(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipGenerated(dAtA[iNdEx:])

staging/src/k8s.io/api/events/v1beta1/generated.proto

@@ -114,9 +114,5 @@ message EventSeries {
 
   // Time when last Event from the series was seen before last heartbeat.
   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;
 }
 

staging/src/k8s.io/api/events/v1beta1/types.go

@@ -95,19 +95,10 @@ type EventSeries struct {
 	Count int32 `json:"count" protobuf:"varint,1,opt,name=count"`
 	// 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
+	// +k8s:deprecated=state,protobuf=3
-	State EventSeriesState `json:"state" protobuf:"bytes,3,opt,name=state"`
 }
 
-type EventSeriesState string
-
-const (
-	EventSeriesStateOngoing  EventSeriesState = "Ongoing"
-	EventSeriesStateFinished EventSeriesState = "Finished"
-	EventSeriesStateUnknown  EventSeriesState = "Unknown"
-)
-
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // EventList is a list of Event objects.

staging/src/k8s.io/api/events/v1beta1/types_swagger_doc_generated.go

@@ -63,7 +63,6 @@ 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. Deprecated. Planned removal for 1.18",
 }
 
 func (EventSeries) SwaggerDoc() map[string]string {

staging/src/k8s.io/api/testdata/HEAD/core.v1.Event.json

@@ -69,7 +69,7 @@
     "kind": "31",
     "namespace": "32",
     "name": "33",
-    "uid": "ʤ脽ěĂ凗蓏Ŋ蛊ĉy緅縕\u003eŽ",
+    "uid": "5ƗǸƢ6/ʕVŚ(ĿȊ甞",
     "apiVersion": "34",
     "resourceVersion": "35",
     "fieldPath": "36"

staging/src/k8s.io/api/testdata/HEAD/core.v1.Event.yaml

@@ -51,7 +51,7 @@ related:
   name: "33"
   namespace: "32"
   resourceVersion: "35"
-  uid: ʤ脽ěĂ凗蓏Ŋ蛊ĉy緅縕>Ž
+  uid: 5ƗǸƢ6/ʕVŚ(ĿȊ甞
 reportingComponent: "37"
 reportingInstance: "38"
 series:

staging/src/k8s.io/api/testdata/HEAD/events.k8s.io.v1beta1.Event.json

@@ -43,8 +43,7 @@
   "eventTime": "2482-03-20T23:11:25.602224Z",
   "series": {
     "count": -1971381490,
-    "lastObservedTime": "2429-02-18T17:57:56.343118Z",
+    "lastObservedTime": "2429-02-18T17:57:56.343118Z"
-    "state": "鯹)晿\u003c"
   },
   "reportingController": "19",
   "reportingInstance": "20",
@@ -54,7 +53,7 @@
     "kind": "23",
     "namespace": "24",
     "name": "25",
-    "uid": "Ĩɘ.蘯6ċV夸eɑeʤ脽ěĂ",
+    "uid": "鯹)晿\u003c",
     "apiVersion": "26",
     "resourceVersion": "27",
     "fieldPath": "28"
@@ -63,7 +62,7 @@
     "kind": "29",
     "namespace": "30",
     "name": "31",
-    "uid": "蓏Ŋ",
+    "uid": ",c鮽ort昍řČ扷5ƗǸƢ6/ʕ",
     "apiVersion": "32",
     "resourceVersion": "33",
     "fieldPath": "34"
@@ -74,7 +73,7 @@
     "component": "37",
     "host": "38"
   },
-  "deprecatedFirstTimestamp": "2964-12-12T12:04:40Z",
+  "deprecatedFirstTimestamp": "2235-03-09T09:44:15Z",
-  "deprecatedLastTimestamp": "2452-08-27T22:01:15Z",
+  "deprecatedLastTimestamp": "2964-12-12T12:04:40Z",
-  "deprecatedCount": 1804227960
+  "deprecatedCount": -180456314
 }

staging/src/k8s.io/api/testdata/HEAD/events.k8s.io.v1beta1.Event.yaml

@@ -1,8 +1,8 @@
 action: "21"
 apiVersion: events.k8s.io/v1beta1
-deprecatedCount: 1804227960
+deprecatedCount: -180456314
-deprecatedFirstTimestamp: "2964-12-12T12:04:40Z"
+deprecatedFirstTimestamp: "2235-03-09T09:44:15Z"
-deprecatedLastTimestamp: "2452-08-27T22:01:15Z"
+deprecatedLastTimestamp: "2964-12-12T12:04:40Z"
 deprecatedSource:
   component: "37"
   host: "38"
@@ -46,7 +46,7 @@ regarding:
   name: "25"
   namespace: "24"
   resourceVersion: "27"
-  uid: Ĩɘ.蘯6ċV夸eɑeʤ脽ěĂ
+  uid: 鯹)晿<
 related:
   apiVersion: "32"
   fieldPath: "34"
@@ -54,11 +54,10 @@ related:
   name: "31"
   namespace: "30"
   resourceVersion: "33"
-  uid: 蓏Ŋ
+  uid: ',c鮽ort昍řČ扷5ƗǸƢ6/ʕ'
 reportingController: "19"
 reportingInstance: "20"
 series:
   count: -1971381490
   lastObservedTime: "2429-02-18T17:57:56.343118Z"
-  state: 鯹)晿<
 type: "36"

staging/src/k8s.io/api/testdata/v1.17.0/events.k8s.io.v1beta1.Event.after_roundtrip.json

@@ -0,0 +1,79 @@
+{
+  "kind": "Event",
+  "apiVersion": "events.k8s.io/v1beta1",
+  "metadata": {
+    "name": "2",
+    "generateName": "3",
+    "namespace": "4",
+    "selfLink": "5",
+    "uid": "7",
+    "resourceVersion": "11042405498087606203",
+    "generation": 8071137005907523419,
+    "creationTimestamp": null,
+    "deletionGracePeriodSeconds": -4955867275792137171,
+    "labels": {
+      "7": "8"
+    },
+    "annotations": {
+      "9": "10"
+    },
+    "ownerReferences": [
+      {
+        "apiVersion": "11",
+        "kind": "12",
+        "name": "13",
+        "uid": "Dz廔ȇ{sŊƏp",
+        "controller": false,
+        "blockOwnerDeletion": true
+      }
+    ],
+    "finalizers": [
+      "14"
+    ],
+    "clusterName": "15",
+    "managedFields": [
+      {
+        "manager": "16",
+        "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]",
+        "apiVersion": "17",
+        "fieldsType": "18"
+      }
+    ]
+  },
+  "eventTime": "2482-03-20T23:11:25.602224Z",
+  "series": {
+    "count": -1971381490,
+    "lastObservedTime": "2429-02-18T17:57:56.343118Z"
+  },
+  "reportingController": "19",
+  "reportingInstance": "20",
+  "action": "21",
+  "reason": "22",
+  "regarding": {
+    "kind": "23",
+    "namespace": "24",
+    "name": "25",
+    "uid": "Ĩɘ.蘯6ċV夸eɑeʤ脽ěĂ",
+    "apiVersion": "26",
+    "resourceVersion": "27",
+    "fieldPath": "28"
+  },
+  "related": {
+    "kind": "29",
+    "namespace": "30",
+    "name": "31",
+    "uid": "蓏Ŋ",
+    "apiVersion": "32",
+    "resourceVersion": "33",
+    "fieldPath": "34"
+  },
+  "note": "35",
+  "type": "36",
+  "deprecatedSource": {
+    "component": "37",
+    "host": "38"
+  },
+  "deprecatedFirstTimestamp": "2964-12-12T12:04:40Z",
+  "deprecatedLastTimestamp": "2452-08-27T22:01:15Z",
+  "deprecatedCount": 1804227960
+}

staging/src/k8s.io/api/testdata/v1.17.0/events.k8s.io.v1beta1.Event.after_roundtrip.yaml

@@ -0,0 +1,63 @@
+action: "21"
+apiVersion: events.k8s.io/v1beta1
+deprecatedCount: 1804227960
+deprecatedFirstTimestamp: "2964-12-12T12:04:40Z"
+deprecatedLastTimestamp: "2452-08-27T22:01:15Z"
+deprecatedSource:
+  component: "37"
+  host: "38"
+eventTime: "2482-03-20T23:11:25.602224Z"
+kind: Event
+metadata:
+  annotations:
+    "9": "10"
+  clusterName: "15"
+  creationTimestamp: null
+  deletionGracePeriodSeconds: -4955867275792137171
+  finalizers:
+  - "14"
+  generateName: "3"
+  generation: 8071137005907523419
+  labels:
+    "7": "8"
+  managedFields:
+  - apiVersion: "17"
+    fieldsType: "18"
+    manager: "16"
+    operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]
+  name: "2"
+  namespace: "4"
+  ownerReferences:
+  - apiVersion: "11"
+    blockOwnerDeletion: true
+    controller: false
+    kind: "12"
+    name: "13"
+    uid: Dz廔ȇ{sŊƏp
+  resourceVersion: "11042405498087606203"
+  selfLink: "5"
+  uid: "7"
+note: "35"
+reason: "22"
+regarding:
+  apiVersion: "26"
+  fieldPath: "28"
+  kind: "23"
+  name: "25"
+  namespace: "24"
+  resourceVersion: "27"
+  uid: Ĩɘ.蘯6ċV夸eɑeʤ脽ěĂ
+related:
+  apiVersion: "32"
+  fieldPath: "34"
+  kind: "29"
+  name: "31"
+  namespace: "30"
+  resourceVersion: "33"
+  uid: 蓏Ŋ
+reportingController: "19"
+reportingInstance: "20"
+series:
+  count: -1971381490
+  lastObservedTime: "2429-02-18T17:57:56.343118Z"
+type: "36"

staging/src/k8s.io/api/testdata/v1.18.0/events.k8s.io.v1beta1.Event.after_roundtrip.json

@@ -0,0 +1,79 @@
+{
+  "kind": "Event",
+  "apiVersion": "events.k8s.io/v1beta1",
+  "metadata": {
+    "name": "2",
+    "generateName": "3",
+    "namespace": "4",
+    "selfLink": "5",
+    "uid": "7",
+    "resourceVersion": "11042405498087606203",
+    "generation": 8071137005907523419,
+    "creationTimestamp": null,
+    "deletionGracePeriodSeconds": -4955867275792137171,
+    "labels": {
+      "7": "8"
+    },
+    "annotations": {
+      "9": "10"
+    },
+    "ownerReferences": [
+      {
+        "apiVersion": "11",
+        "kind": "12",
+        "name": "13",
+        "uid": "Dz廔ȇ{sŊƏp",
+        "controller": false,
+        "blockOwnerDeletion": true
+      }
+    ],
+    "finalizers": [
+      "14"
+    ],
+    "clusterName": "15",
+    "managedFields": [
+      {
+        "manager": "16",
+        "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]",
+        "apiVersion": "17",
+        "fieldsType": "18"
+      }
+    ]
+  },
+  "eventTime": "2482-03-20T23:11:25.602224Z",
+  "series": {
+    "count": -1971381490,
+    "lastObservedTime": "2429-02-18T17:57:56.343118Z"
+  },
+  "reportingController": "19",
+  "reportingInstance": "20",
+  "action": "21",
+  "reason": "22",
+  "regarding": {
+    "kind": "23",
+    "namespace": "24",
+    "name": "25",
+    "uid": "Ĩɘ.蘯6ċV夸eɑeʤ脽ěĂ",
+    "apiVersion": "26",
+    "resourceVersion": "27",
+    "fieldPath": "28"
+  },
+  "related": {
+    "kind": "29",
+    "namespace": "30",
+    "name": "31",
+    "uid": "蓏Ŋ",
+    "apiVersion": "32",
+    "resourceVersion": "33",
+    "fieldPath": "34"
+  },
+  "note": "35",
+  "type": "36",
+  "deprecatedSource": {
+    "component": "37",
+    "host": "38"
+  },
+  "deprecatedFirstTimestamp": "2964-12-12T12:04:40Z",
+  "deprecatedLastTimestamp": "2452-08-27T22:01:15Z",
+  "deprecatedCount": 1804227960
+}

staging/src/k8s.io/api/testdata/v1.18.0/events.k8s.io.v1beta1.Event.after_roundtrip.yaml

@@ -0,0 +1,63 @@
+action: "21"
+apiVersion: events.k8s.io/v1beta1
+deprecatedCount: 1804227960
+deprecatedFirstTimestamp: "2964-12-12T12:04:40Z"
+deprecatedLastTimestamp: "2452-08-27T22:01:15Z"
+deprecatedSource:
+  component: "37"
+  host: "38"
+eventTime: "2482-03-20T23:11:25.602224Z"
+kind: Event
+metadata:
+  annotations:
+    "9": "10"
+  clusterName: "15"
+  creationTimestamp: null
+  deletionGracePeriodSeconds: -4955867275792137171
+  finalizers:
+  - "14"
+  generateName: "3"
+  generation: 8071137005907523419
+  labels:
+    "7": "8"
+  managedFields:
+  - apiVersion: "17"
+    fieldsType: "18"
+    manager: "16"
+    operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]
+  name: "2"
+  namespace: "4"
+  ownerReferences:
+  - apiVersion: "11"
+    blockOwnerDeletion: true
+    controller: false
+    kind: "12"
+    name: "13"
+    uid: Dz廔ȇ{sŊƏp
+  resourceVersion: "11042405498087606203"
+  selfLink: "5"
+  uid: "7"
+note: "35"
+reason: "22"
+regarding:
+  apiVersion: "26"
+  fieldPath: "28"
+  kind: "23"
+  name: "25"
+  namespace: "24"
+  resourceVersion: "27"
+  uid: Ĩɘ.蘯6ċV夸eɑeʤ脽ěĂ
+related:
+  apiVersion: "32"
+  fieldPath: "34"
+  kind: "29"
+  name: "31"
+  namespace: "30"
+  resourceVersion: "33"
+  uid: 蓏Ŋ
+reportingController: "19"
+reportingInstance: "20"
+series:
+  count: -1971381490
+  lastObservedTime: "2429-02-18T17:57:56.343118Z"
+type: "36"