github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 07:57:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8923 from caesarxuchao/TerminationToTerminated

Browse Source 
Update ContainerState.Termination to ContainerState.Terminated
This commit is contained in:
Rohit Jnagal
2015-05-29 14:51:09 -07:00
parent d34d00c288 9f5e0b626b
commit 233ce46b83
20 changed files with 217 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubelet/kubelet.go
View File

@@ -1668,10 +1668,10 @@ func (kl *Kubelet) validateContainerStatus(podStatus *api.PodStatus, containerNa
return "", fmt.Errorf("container %q not found in pod", containerName)
}
if previous {
if cStatus.LastTerminationState.Termination == nil {
if cStatus.LastTerminationState.Terminated == nil {
return "", fmt.Errorf("previous terminated container %q not found in pod", containerName)
}
cID = cStatus.LastTerminationState.Termination.ContainerID
cID = cStatus.LastTerminationState.Terminated.ContainerID
} else {
if cStatus.State.Waiting != nil {
return "", fmt.Errorf("container %q is in waiting state.", containerName)
@@ -1983,9 +1983,9 @@ func getPhase(spec *api.PodSpec, info []api.ContainerStatus) api.PodPhase {
if containerStatus, ok := api.GetContainerStatus(info, container.Name); ok {
if containerStatus.State.Running != nil {
running++
} else if containerStatus.State.Termination != nil {
} else if containerStatus.State.Terminated != nil {
stopped++
if containerStatus.State.Termination.ExitCode == 0 {
if containerStatus.State.Terminated.ExitCode == 0 {
succeeded++
} else {
failed++