github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 13:45:06 +00:00
Code Issues Projects Releases Wiki Activity

Start using new convert function in kubelet

Browse Source
This commit is contained in:
Random-Liu
2016-01-20 17:24:31 -08:00
parent 139548141e
commit bad7046b1a
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubelet/kubelet.go
View File

@@ -3102,12 +3102,8 @@ func (kl *Kubelet) generatePodStatus(pod *api.Pod, podStatus *kubecontainer.PodS
Message: fmt.Sprintf("Query container info failed with error (%v)", statusErr), Message: fmt.Sprintf("Query container info failed with error (%v)", statusErr),
}, nil }, nil
} }
// Ask the runtime to convert the internal PodStatus to api.PodStatus. // Convert the internal PodStatus to api.PodStatus.
s, err := kl.containerRuntime.ConvertPodStatusToAPIPodStatus(pod, podStatus) s := kl.convertStatusToAPIStatus(pod, podStatus)
if err != nil {
glog.Infof("Failed to convert PodStatus to api.PodStatus for %q: %v", format.Pod(pod), err)
return api.PodStatus{}, err
}
// Assume info is ready to process // Assume info is ready to process
spec := &pod.Spec spec := &pod.Spec