Skip to content

K
k3s
Commit 9050c510 authored by Daniel Mueller's avatar Daniel Mueller
Browse files
Options

Remove unused variables from computePodPhase

The initialized and failed variables in the computePodPhase function are effectively write only. Remove them.
parent c082ace1
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 10 deletions
pkg/kubelet/kubelet_pods.go
View file @ 9050c510
...@@ -1220,7 +1220,6 @@ func (kl *Kubelet) GetKubeletContainerLogs(ctx context.Context, podFullName, con ...@@ -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 { ...@@ -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 { ...@@ -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 { ...@@ -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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment