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

Merge pull request #15238 from mpuncel/mpuncel/cleanup

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-10-09 08:12:17 -07:00
commit 44699f5852
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1660,7 +1660,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
@ -1674,7 +1673,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 {
@ -1707,7 +1706,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 {