github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-08 11:38:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #87537 from uthark/oatamanenko/apiversion

Browse Source 
Fixes #87506 Add apiVersion to involvedObject
This commit is contained in:
Kubernetes Prow Robot 2020-03-04 02:31:47 -08:00 committed by GitHub
commit 4d19c6f2ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/controller/util/node/controller_utils.go
View File

@ -160,10 +160,11 @@ func MarkPodsNotReady(kubeClient clientset.Interface, pods []*v1.Pod, nodeName s
// RecordNodeEvent records a event related to a node. // RecordNodeEvent records a event related to a node.
func RecordNodeEvent(recorder record.EventRecorder, nodeName, nodeUID, eventtype, reason, event string) { func RecordNodeEvent(recorder record.EventRecorder, nodeName, nodeUID, eventtype, reason, event string) {
ref := &v1.ObjectReference{ ref := &v1.ObjectReference{
Kind: "Node", APIVersion: "v1",
Name: nodeName, Kind: "Node",
UID: types.UID(nodeUID), Name: nodeName,
Namespace: "", UID: types.UID(nodeUID),
Namespace: "",
} }
klog.V(2).Infof("Recording %s event message for node %s", event, nodeName) klog.V(2).Infof("Recording %s event message for node %s", event, nodeName)
recorder.Eventf(ref, eventtype, reason, "Node %s event: %s", nodeName, event) recorder.Eventf(ref, eventtype, reason, "Node %s event: %s", nodeName, event)
@ -172,10 +173,11 @@ func RecordNodeEvent(recorder record.EventRecorder, nodeName, nodeUID, eventtype
// RecordNodeStatusChange records a event related to a node status change. (Common to lifecycle and ipam) // RecordNodeStatusChange records a event related to a node status change. (Common to lifecycle and ipam)
func RecordNodeStatusChange(recorder record.EventRecorder, node *v1.Node, newStatus string) { func RecordNodeStatusChange(recorder record.EventRecorder, node *v1.Node, newStatus string) {
ref := &v1.ObjectReference{ ref := &v1.ObjectReference{
Kind: "Node", APIVersion: "v1",
Name: node.Name, Kind: "Node",
UID: node.UID, Name: node.Name,
Namespace: "", UID: node.UID,
Namespace: "",
} }
klog.V(2).Infof("Recording status change %s event message for node %s", newStatus, node.Name) klog.V(2).Infof("Recording status change %s event message for node %s", newStatus, node.Name)
// TODO: This requires a transaction, either both node status is updated // TODO: This requires a transaction, either both node status is updated