From cda80d684c4f1cf81ac53aca760ddc117905afdf Mon Sep 17 00:00:00 2001 From: NickrenREN Date: Wed, 28 Dec 2016 10:43:35 +0800 Subject: [PATCH] optimize podSandboxChanged and fix function notes --- pkg/kubelet/kuberuntime/kuberuntime_manager.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/kubelet/kuberuntime/kuberuntime_manager.go b/pkg/kubelet/kuberuntime/kuberuntime_manager.go index deead5b69ef..5595b7837e1 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_manager.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_manager.go @@ -321,7 +321,7 @@ func (m *kubeGenericRuntimeManager) GetPods(all bool) ([]*kubecontainer.Pod, err return result, nil } -// containerToKillInfo contains neccessary information to kill a container. +// containerToKillInfo contains necessary information to kill a container. type containerToKillInfo struct { // The spec of the container. container *v1.Container @@ -350,7 +350,7 @@ type podContainerSpecChanges struct { ContainersToKeep map[kubecontainer.ContainerID]int // ContainersToKill keeps a map of containers that need to be killed, note that // the key is the container ID of the container, while - // the value contains neccessary information to kill a container. + // the value contains necessary information to kill a container. ContainersToKill map[kubecontainer.ContainerID]containerToKillInfo // InitFailed indicates whether init containers are failed. @@ -363,7 +363,7 @@ type podContainerSpecChanges struct { // podSandboxChanged checks whether the spec of the pod is changed and returns // (changed, new attempt, original sandboxID if exist). -func (m *kubeGenericRuntimeManager) podSandboxChanged(pod *v1.Pod, podStatus *kubecontainer.PodStatus) (changed bool, attempt uint32, sandboxID string) { +func (m *kubeGenericRuntimeManager) podSandboxChanged(pod *v1.Pod, podStatus *kubecontainer.PodStatus) (bool, uint32, string) { if len(podStatus.SandboxStatuses) == 0 { glog.V(2).Infof("No sandbox for pod %q can be found. Need to start a new one", format.Pod(pod)) return true, 0, "" @@ -803,7 +803,7 @@ func (m *kubeGenericRuntimeManager) isHostNetwork(podSandBoxID string, pod *v1.P } // GetPodStatus retrieves the status of the pod, including the -// information of all containers in the pod that are visble in Runtime. +// information of all containers in the pod that are visible in Runtime. func (m *kubeGenericRuntimeManager) GetPodStatus(uid kubetypes.UID, name, namespace string) (*kubecontainer.PodStatus, error) { // Now we retain restart count of container as a container label. Each time a container // restarts, pod will read the restart count from the registered dead container, increment