github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix comment typo and remove unnecessary line

Browse Source
This commit is contained in:
Michael Puncel
2015-10-07 09:53:27 -07:00
parent 60b1abdaa5
commit 4921a62f3a
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubelet/dockertools/manager.go
View File

@@ -1646,7 +1646,6 @@ func (dm *DockerManager) computePodContainerChanges(pod *api.Pod, runningPod kub
containersToStart := make(map[int]empty) containersToStart := make(map[int]empty)
containersToKeep := make(map[kubeletTypes.DockerID]int) containersToKeep := make(map[kubeletTypes.DockerID]int)
createPodInfraContainer := false
var err error var err error
var podInfraContainerID kubeletTypes.DockerID var podInfraContainerID kubeletTypes.DockerID
@@ -1660,7 +1659,7 @@ func (dm *DockerManager) computePodContainerChanges(pod *api.Pod, runningPod kub
} }
} }
createPodInfraContainer = true createPodInfraContainer := true
if podInfraContainer == nil { if podInfraContainer == nil {
glog.V(2).Infof("Need to restart pod infra container for %q because it is not found", podFullName) glog.V(2).Infof("Need to restart pod infra container for %q because it is not found", podFullName)
} else if changed { } else if changed {
@@ -1693,7 +1692,7 @@ func (dm *DockerManager) computePodContainerChanges(pod *api.Pod, runningPod kub
if createPodInfraContainer { if createPodInfraContainer {
// createPodInfraContainer == true and Container exists // createPodInfraContainer == true and Container exists
// If we're creating infra containere everything will be killed anyway // If we're creating infra container everything will be killed anyway
// If RestartPolicy is Always or OnFailure we restart containers that were running before we // If RestartPolicy is Always or OnFailure we restart containers that were running before we
// killed them when restarting Infra Container. // killed them when restarting Infra Container.
if pod.Spec.RestartPolicy != api.RestartPolicyNever { if pod.Spec.RestartPolicy != api.RestartPolicyNever {