github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 16:06:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #19785 from Random-Liu/remove-get-podstatus-and-apipodstatus

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-01-30 11:35:26 -08:00
parent 9c099bf529 f116a5eb8f
commit 9fef5f2938
6 changed files with 7 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/kubelet/rkt/rkt.go
View File

@@ -1455,14 +1455,3 @@ func (r *Runtime) ConvertPodStatusToAPIPodStatus(pod *api.Pod, status *kubeconta
return apiPodStatus, nil
}
// TODO(yifan): Delete this function when the logic is moved to kubelet.
func (r *Runtime) GetPodStatusAndAPIPodStatus(pod *api.Pod) (*kubecontainer.PodStatus, *api.PodStatus, error) {
// Get the pod status.
podStatus, err := r.GetPodStatus(pod.UID, pod.Name, pod.Namespace)
if err != nil {
return nil, nil, err
}
apiPodStatus, err := r.ConvertPodStatusToAPIPodStatus(pod, podStatus)
return podStatus, apiPodStatus, err
}