Merge pull request #15177 from timstclair/restart-policy

pkg/kubelet/dockertools/manager.go

@@ -1737,9 +1737,11 @@ func (dm *DockerManager) computePodContainerChanges(pod *api.Pod, runningPod kub
 			containersToKeep[containerID] = index
 			continue
 		}
+		if pod.Spec.RestartPolicy != api.RestartPolicyNever {
 			glog.Infof("pod %q container %q is unhealthy (probe result: %v), it will be killed and re-created.", podFullName, container.Name, result)
 			containersToStart[index] = empty{}
 		}
+	}
 
 	// After the loop one of the following should be true:
 	// - createPodInfraContainer is true and containersToKeep is empty.

pkg/kubelet/rkt/rkt.go

@@ -1013,7 +1013,7 @@ func (r *Runtime) SyncPod(pod *api.Pod, runningPod kubecontainer.Pod, podStatus
 
 		result, err := r.prober.ProbeLiveness(pod, podStatus, container, c.ID, c.Created)
 		// TODO(vmarmol): examine this logic.
-		if err == nil && result != probe.Success {
+		if err == nil && result != probe.Success && pod.Spec.RestartPolicy != api.RestartPolicyNever {
 			glog.Infof("Pod %q container %q is unhealthy (probe result: %v), it will be killed and re-created.", podFullName, container.Name, result)
 			restartPod = true
 			break