Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

If PodDeletionTimestamp != nil, return Pod state as being Terminating #749

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

If PodDeletionTimestamp != nil, return Pod state as being Terminating #749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkg/monitoring/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ const (
PodStatusPending PodStatus = "Pending"
PodStatusError PodStatus = "Error"
PodStatusDecommissioning PodStatus = "Decommissioning"
PodStatusTerminating PodStatus = "Terminating"
)

func getPodStatus(pod *corev1.Pod) PodStatus {
Expand All @@ -35,6 +36,9 @@ func getPodStatus(pod *corev1.Pod) PodStatus {
return PodStatusError
case corev1.PodRunning:
default:
if pod.GetDeletionTimestamp() != nil {
return PodStatusTerminating
}
}

allContainersReady := true
Expand Down
14 changes: 14 additions & 0 deletions pkg/monitoring/metrics_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,20 @@ func TestMetricAdder(t *testing.T) {
require.NoError(err)
require.Equal("ready", status)

now := metav1.Now()
pods[1].SetDeletionTimestamp(&now)
UpdatePodStatusMetric(pods[1])
status, err = getCurrentPodStatus("pod1")
require.NoError(err)
require.Equal("terminating", status)

// Decommissioning should be prefered to Terminating if we are decommissioning the pod
pods[5].SetDeletionTimestamp(&now)
UpdatePodStatusMetric(pods[1])
status, err = getCurrentPodStatus("pod5")
require.NoError(err)
require.Equal("decommissioning", status)

RemoveDatacenterPods("ns", "cluster1", "datacenter1")
_, err = getCurrentPodStatus("pod4")
require.Error(err)
Expand Down
Loading