From 5ca51e40479661b31c9eaf466837862025d3f233 Mon Sep 17 00:00:00 2001 From: Paul Morie Date: Fri, 8 Jul 2016 16:53:33 -0400 Subject: [PATCH] Remove unnecessary calls to api.GetReference --- pkg/kubelet/dockertools/docker_manager.go | 6 +----- pkg/kubelet/kubelet.go | 9 +++------ 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/pkg/kubelet/dockertools/docker_manager.go b/pkg/kubelet/dockertools/docker_manager.go index 65287de058f..dcd1291eb3d 100644 --- a/pkg/kubelet/dockertools/docker_manager.go +++ b/pkg/kubelet/dockertools/docker_manager.go @@ -1915,11 +1915,7 @@ func (dm *DockerManager) SyncPod(pod *api.Pod, _ api.PodStatus, podStatus *kubec glog.V(3).Infof("Got container changes for pod %q: %+v", format.Pod(pod), containerChanges) if containerChanges.InfraChanged { - ref, err := api.GetReference(pod) - if err != nil { - glog.Errorf("Couldn't make a ref to pod %q: '%v'", format.Pod(pod), err) - } - dm.recorder.Eventf(ref, api.EventTypeNormal, "InfraChanged", "Pod infrastructure changed, it will be killed and re-created.") + dm.recorder.Eventf(pod, api.EventTypeNormal, "InfraChanged", "Pod infrastructure changed, it will be killed and re-created.") } if containerChanges.StartInfraContainer || (len(containerChanges.ContainersToKeep) == 0 && len(containerChanges.ContainersToStart) == 0) { if len(containerChanges.ContainersToKeep) == 0 && len(containerChanges.ContainersToStart) == 0 { diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index bb5b2f87a25..b260c82f1ea 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -1932,12 +1932,9 @@ func (kl *Kubelet) syncPod(o syncPodOptions) error { return err } if err := kl.volumeManager.WaitForAttachAndMount(defaultedPod); err != nil { - ref, errGetRef := api.GetReference(pod) - if errGetRef == nil && ref != nil { - kl.recorder.Eventf(ref, api.EventTypeWarning, kubecontainer.FailedMountVolume, "Unable to mount volumes for pod %q: %v", format.Pod(pod), err) - glog.Errorf("Unable to mount volumes for pod %q: %v; skipping pod", format.Pod(pod), err) - return err - } + kl.recorder.Eventf(pod, api.EventTypeWarning, kubecontainer.FailedMountVolume, "Unable to mount volumes for pod %q: %v", format.Pod(pod), err) + glog.Errorf("Unable to mount volumes for pod %q: %v; skipping pod", format.Pod(pod), err) + return err } // Fetch the pull secrets for the pod