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

Merge pull request #75528 from danielvmw/topic/compute-pod-phase

Browse Source 
Remove unused variables from computePodPhase
This commit is contained in:
Kubernetes Prow Robot 2019-04-08 13:15:49 -07:00 committed by GitHub
commit 62f5fd4c6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/kubelet/kubelet_pods.go
View File

@ -1220,7 +1220,6 @@ func (kl *Kubelet) GetKubeletContainerLogs(ctx context.Context, podFullName, con
// getPhase returns the phase of a pod given its container info. // getPhase returns the phase of a pod given its container info.
func getPhase(spec *v1.PodSpec, info []v1.ContainerStatus) v1.PodPhase { func getPhase(spec *v1.PodSpec, info []v1.ContainerStatus) v1.PodPhase {
initialized := 0
pendingInitialization := 0 pendingInitialization := 0
failedInitialization := 0 failedInitialization := 0
for _, container := range spec.InitContainers { for _, container := range spec.InitContainers {
@ -1234,16 +1233,12 @@ func getPhase(spec *v1.PodSpec, info []v1.ContainerStatus) v1.PodPhase {
case containerStatus.State.Running != nil: case containerStatus.State.Running != nil:
pendingInitialization++ pendingInitialization++
case containerStatus.State.Terminated != nil: case containerStatus.State.Terminated != nil:
if containerStatus.State.Terminated.ExitCode == 0 { if containerStatus.State.Terminated.ExitCode != 0 {
initialized++
} else {
failedInitialization++ failedInitialization++
} }
case containerStatus.State.Waiting != nil: case containerStatus.State.Waiting != nil:
if containerStatus.LastTerminationState.Terminated != nil { if containerStatus.LastTerminationState.Terminated != nil {
if containerStatus.LastTerminationState.Terminated.ExitCode == 0 { if containerStatus.LastTerminationState.Terminated.ExitCode != 0 {
initialized++
} else {
failedInitialization++ failedInitialization++
} }
} else { } else {
@ -1258,7 +1253,6 @@ func getPhase(spec *v1.PodSpec, info []v1.ContainerStatus) v1.PodPhase {
running := 0 running := 0
waiting := 0 waiting := 0
stopped := 0 stopped := 0
failed := 0
succeeded := 0 succeeded := 0
for _, container := range spec.Containers { for _, container := range spec.Containers {
containerStatus, ok := podutil.GetContainerStatus(info, container.Name) containerStatus, ok := podutil.GetContainerStatus(info, container.Name)
@ -1274,8 +1268,6 @@ func getPhase(spec *v1.PodSpec, info []v1.ContainerStatus) v1.PodPhase {
stopped++ stopped++
if containerStatus.State.Terminated.ExitCode == 0 { if containerStatus.State.Terminated.ExitCode == 0 {
succeeded++ succeeded++
} else {
failed++
} }
case containerStatus.State.Waiting != nil: case containerStatus.State.Waiting != nil:
if containerStatus.LastTerminationState.Terminated != nil { if containerStatus.LastTerminationState.Terminated != nil {