Skip to content

K
k3s
Commit bad7046b authored by Random-Liu's avatar Random-Liu
Browse files
Options

Start using new convert function in kubelet

parent 13954814
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
pkg/kubelet/kubelet.go
View file @ bad7046b
...@@ -3102,12 +3102,8 @@ func (kl *Kubelet) generatePodStatus(pod *api.Pod, podStatus *kubecontainer.PodS ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment