github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-07-03 10:16:40 +00:00
Code Issues Projects Releases Wiki Activity

cleanup v1 event expansion.

Browse Source 
Kubernetes-commit: 89b7c63b5d19001c1ea0541ece0d22407aaeb304
This commit is contained in:
Jianfei Bai 2019-10-06 10:10:57 +08:00 committed by Kubernetes Publisher
parent c918cd02a1
commit 95b72f7306
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kubernetes/typed/core/v1/event_expansion.go
View File

@ -104,17 +104,17 @@ func (e *events) Search(scheme *runtime.Scheme, objOrRef runtime.Object) (*v1.Ev
if err != nil { if err != nil {
return nil, err return nil, err
} }
if e.ns != "" && ref.Namespace != e.ns { if len(e.ns) > 0 && ref.Namespace != e.ns {
return nil, fmt.Errorf("won't be able to find any events of namespace '%v' in namespace '%v'", ref.Namespace, e.ns) return nil, fmt.Errorf("won't be able to find any events of namespace '%v' in namespace '%v'", ref.Namespace, e.ns)
} }
stringRefKind := string(ref.Kind) stringRefKind := string(ref.Kind)
var refKind *string var refKind *string
if stringRefKind != "" { if len(stringRefKind) > 0 {
refKind = &stringRefKind refKind = &stringRefKind
} }
stringRefUID := string(ref.UID) stringRefUID := string(ref.UID)
var refUID *string var refUID *string
if stringRefUID != "" { if len(stringRefUID) > 0 {
refUID = &stringRefUID refUID = &stringRefUID
} }
fieldSelector := e.GetFieldSelector(&ref.Name, &ref.Namespace, refKind, refUID) fieldSelector := e.GetFieldSelector(&ref.Name, &ref.Namespace, refKind, refUID)
@ -124,10 +124,9 @@ func (e *events) Search(scheme *runtime.Scheme, objOrRef runtime.Object) (*v1.Ev
// Returns the appropriate field selector based on the API version being used to communicate with the server. // Returns the appropriate field selector based on the API version being used to communicate with the server.
// The returned field selector can be used with List and Watch to filter desired events. // The returned field selector can be used with List and Watch to filter desired events.
func (e *events) GetFieldSelector(involvedObjectName, involvedObjectNamespace, involvedObjectKind, involvedObjectUID *string) fields.Selector { func (e *events) GetFieldSelector(involvedObjectName, involvedObjectNamespace, involvedObjectKind, involvedObjectUID *string) fields.Selector {
apiVersion := e.client.APIVersion().String()
field := fields.Set{} field := fields.Set{}
if involvedObjectName != nil { if involvedObjectName != nil {
field[GetInvolvedObjectNameFieldLabel(apiVersion)] = *involvedObjectName field["involvedObject.name"] = *involvedObjectName
} }
if involvedObjectNamespace != nil { if involvedObjectNamespace != nil {
field["involvedObject.namespace"] = *involvedObjectNamespace field["involvedObject.namespace"] = *involvedObjectNamespace
@ -142,6 +141,7 @@ func (e *events) GetFieldSelector(involvedObjectName, involvedObjectNamespace, i
} }
// Returns the appropriate field label to use for name of the involved object as per the given API version. // Returns the appropriate field label to use for name of the involved object as per the given API version.
// DEPRECATED: please use "involvedObject.name" inline.
func GetInvolvedObjectNameFieldLabel(version string) string { func GetInvolvedObjectNameFieldLabel(version string) string {
return "involvedObject.name" return "involvedObject.name"
} }