github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Prevent successful containers from restarting with OnFailure restart policy

Browse Source
This commit is contained in:
Joel Smith 2017-10-27 09:57:00 -06:00
parent b00c15f1a4
commit 5f6c022737
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/kubelet/status/status_manager.go
View File

@ -268,13 +268,22 @@ func (m *manager) TerminatePod(pod *v1.Pod) {
// checkContainerStateTransition ensures that no container is trying to transition // checkContainerStateTransition ensures that no container is trying to transition
// from a terminated to non-terminated state, which is illegal and indicates a // from a terminated to non-terminated state, which is illegal and indicates a
// logical error in the kubelet. // logical error in the kubelet.
func checkContainerStateTransition(oldStatuses, newStatuses []v1.ContainerStatus) error { func checkContainerStateTransition(oldStatuses, newStatuses []v1.ContainerStatus, restartPolicy v1.RestartPolicy) error {
for _, newStatus := range newStatuses { // If we should always restart, containers are allowed to leave the terminated state
if restartPolicy == v1.RestartPolicyAlways {
return nil
}
for _, oldStatus := range oldStatuses { for _, oldStatus := range oldStatuses {
if newStatus.Name != oldStatus.Name { // Skip any container that wasn't terminated
if oldStatus.State.Terminated == nil {
continue continue
} }
if oldStatus.State.Terminated != nil && newStatus.State.Terminated == nil { // Skip any container that failed but is allowed to restart
if oldStatus.State.Terminated.ExitCode != 0 && restartPolicy == v1.RestartPolicyOnFailure {
continue
}
for _, newStatus := range newStatuses {
if oldStatus.Name == newStatus.Name && newStatus.State.Terminated == nil {
return fmt.Errorf("terminated container %v attempted illegal transition to non-terminated state", newStatus.Name) return fmt.Errorf("terminated container %v attempted illegal transition to non-terminated state", newStatus.Name)
} }
} }
@ -297,16 +306,14 @@ func (m *manager) updateStatusInternal(pod *v1.Pod, status v1.PodStatus, forceUp
} }
// Check for illegal state transition in containers // Check for illegal state transition in containers
if pod.Spec.RestartPolicy == v1.RestartPolicyNever { if err := checkContainerStateTransition(oldStatus.ContainerStatuses, status.ContainerStatuses, pod.Spec.RestartPolicy); err != nil {
if err := checkContainerStateTransition(oldStatus.ContainerStatuses, status.ContainerStatuses); err != nil {
glog.Errorf("Status update on pod %v/%v aborted: %v", pod.Namespace, pod.Name, err) glog.Errorf("Status update on pod %v/%v aborted: %v", pod.Namespace, pod.Name, err)
return false return false
} }
if err := checkContainerStateTransition(oldStatus.InitContainerStatuses, status.InitContainerStatuses); err != nil { if err := checkContainerStateTransition(oldStatus.InitContainerStatuses, status.InitContainerStatuses, pod.Spec.RestartPolicy); err != nil {
glog.Errorf("Status update on pod %v/%v aborted: %v", pod.Namespace, pod.Name, err) glog.Errorf("Status update on pod %v/%v aborted: %v", pod.Namespace, pod.Name, err)
return false return false
} }
}
// Set ReadyCondition.LastTransitionTime. // Set ReadyCondition.LastTransitionTime.
if _, readyCondition := podutil.GetPodCondition(&status, v1.PodReady); readyCondition != nil { if _, readyCondition := podutil.GetPodCondition(&status, v1.PodReady); readyCondition != nil {