From c6791aa82b3bde47f62111f66989720d4eb53f2b Mon Sep 17 00:00:00 2001 From: Guangming Wang Date: Tue, 13 Aug 2019 22:52:36 +0800 Subject: [PATCH] v1beta1: bugfix in Event struct definition rebase master, handle staticcheck error --- hack/.staticcheck_failures | 1 - staging/src/k8s.io/api/events/v1beta1/types.go | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures index b6697f61a22..8b71b56d050 100644 --- a/hack/.staticcheck_failures +++ b/hack/.staticcheck_failures @@ -147,7 +147,6 @@ test/integration/ttlcontroller test/integration/volume test/integration/volumescheduling test/utils -vendor/k8s.io/api/events/v1beta1 vendor/k8s.io/apiextensions-apiserver/pkg/apiserver vendor/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion vendor/k8s.io/apiextensions-apiserver/pkg/apiserver/schema diff --git a/staging/src/k8s.io/api/events/v1beta1/types.go b/staging/src/k8s.io/api/events/v1beta1/types.go index eef45645323..43c9c58b991 100644 --- a/staging/src/k8s.io/api/events/v1beta1/types.go +++ b/staging/src/k8s.io/api/events/v1beta1/types.go @@ -43,11 +43,11 @@ type Event struct { // ID of the controller instance, e.g. `kubelet-xyzf`. // +optional - ReportingInstance string `json:"reportingInstance,omitemtpy" protobuf:"bytes,5,opt,name=reportingInstance"` + ReportingInstance string `json:"reportingInstance,omitempty" protobuf:"bytes,5,opt,name=reportingInstance"` // What action was taken/failed regarding to the regarding object. // +optional - Action string `json:"action,omitemtpy" protobuf:"bytes,6,name=action"` + Action string `json:"action,omitempty" protobuf:"bytes,6,name=action"` // Why the action was taken. Reason string `json:"reason,omitempty" protobuf:"bytes,7,name=reason"`