Skip to content

Commit dbdb77c

Browse files
fix benchmark test; add missing kube_pod_container_status_last_terminated_timestamp in pod tests
Signed-off-by: Tetiana Kravchenko <[email protected]>
1 parent 8876d40 commit dbdb77c

File tree

1 file changed

+17
-2
lines changed

1 file changed

+17
-2
lines changed

internal/store/pod_test.go

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,6 @@ func TestPodStore(t *testing.T) {
690690
},
691691
},
692692
{
693-
694693
Obj: &v1.Pod{
695694
ObjectMeta: metav1.ObjectMeta{
696695
Name: "pod6",
@@ -797,6 +796,9 @@ func TestPodStore(t *testing.T) {
797796
Terminated: &v1.ContainerStateTerminated{
798797
Reason: "DeadlineExceeded",
799798
ExitCode: 143,
799+
FinishedAt: metav1.Time{
800+
Time: time.Unix(1501779547, 0),
801+
},
800802
},
801803
},
802804
},
@@ -806,6 +808,7 @@ func TestPodStore(t *testing.T) {
806808
Want: `
807809
# HELP kube_pod_container_status_last_terminated_exitcode Describes the exit code for the last container in terminated state.
808810
# HELP kube_pod_container_status_last_terminated_reason Describes the last reason the container was in terminated state.
811+
# HELP kube_pod_container_status_last_terminated_timestamp Last terminated time for a pod container, when container was terminated with kube_pod_container_status_last_terminated_reason, in unix timestamp.
809812
# HELP kube_pod_container_status_running [STABLE] Describes whether the container is currently in running state.
810813
# HELP kube_pod_container_state_started [STABLE] Start time in unix timestamp for a pod container.
811814
# HELP kube_pod_container_status_terminated [STABLE] Describes whether the container is currently in terminated state.
@@ -814,6 +817,7 @@ func TestPodStore(t *testing.T) {
814817
# HELP kube_pod_container_status_waiting_reason [STABLE] Describes the reason the container is currently in waiting state.
815818
# TYPE kube_pod_container_status_last_terminated_exitcode gauge
816819
# TYPE kube_pod_container_status_last_terminated_reason gauge
820+
# TYPE kube_pod_container_status_last_terminated_timestamp gauge
817821
# TYPE kube_pod_container_status_running gauge
818822
# TYPE kube_pod_container_state_started gauge
819823
# TYPE kube_pod_container_status_terminated gauge
@@ -823,6 +827,7 @@ func TestPodStore(t *testing.T) {
823827
kube_pod_container_state_started{container="container7",namespace="ns7",pod="pod7",uid="uid7"} 1.501777018e+09
824828
kube_pod_container_status_last_terminated_exitcode{container="container7",namespace="ns7",pod="pod7",uid="uid7"} 143
825829
kube_pod_container_status_last_terminated_reason{container="container7",namespace="ns7",pod="pod7",reason="DeadlineExceeded",uid="uid7"} 1
830+
kube_pod_container_status_last_terminated_timestamp{container="container7",namespace="ns7",pod="pod7",uid="uid7"} 1.501779547e+09
826831
kube_pod_container_status_running{container="container7",namespace="ns7",pod="pod7",uid="uid7"} 1
827832
kube_pod_container_status_terminated{container="container7",namespace="ns7",pod="pod7",uid="uid7"} 0
828833
kube_pod_container_status_waiting{container="container7",namespace="ns7",pod="pod7",uid="uid7"} 0
@@ -832,6 +837,7 @@ func TestPodStore(t *testing.T) {
832837
"kube_pod_container_state_started",
833838
"kube_pod_container_status_terminated",
834839
"kube_pod_container_status_terminated_reason",
840+
"kube_pod_container_status_last_terminated_timestamp",
835841
"kube_pod_container_status_waiting",
836842
"kube_pod_container_status_last_terminated_reason",
837843
"kube_pod_container_status_last_terminated_exitcode",
@@ -2217,6 +2223,9 @@ func BenchmarkPodStore(b *testing.B) {
22172223
},
22182224
LastTerminationState: v1.ContainerState{
22192225
Terminated: &v1.ContainerStateTerminated{
2226+
FinishedAt: metav1.Time{
2227+
Time: time.Unix(1501779547, 0),
2228+
},
22202229
Reason: "OOMKilled",
22212230
ExitCode: 137,
22222231
},
@@ -2234,6 +2243,9 @@ func BenchmarkPodStore(b *testing.B) {
22342243
},
22352244
LastTerminationState: v1.ContainerState{
22362245
Terminated: &v1.ContainerStateTerminated{
2246+
FinishedAt: metav1.Time{
2247+
Time: time.Unix(1501779547, 0),
2248+
},
22372249
Reason: "OOMKilled",
22382250
ExitCode: 137,
22392251
},
@@ -2251,6 +2263,9 @@ func BenchmarkPodStore(b *testing.B) {
22512263
},
22522264
LastTerminationState: v1.ContainerState{
22532265
Terminated: &v1.ContainerStateTerminated{
2266+
FinishedAt: metav1.Time{
2267+
Time: time.Unix(1501779547, 0),
2268+
},
22542269
Reason: "OOMKilled",
22552270
ExitCode: 137,
22562271
},
@@ -2260,7 +2275,7 @@ func BenchmarkPodStore(b *testing.B) {
22602275
},
22612276
}
22622277

2263-
expectedFamilies := 53
2278+
expectedFamilies := 54
22642279
for n := 0; n < b.N; n++ {
22652280
families := f(pod)
22662281
if len(families) != expectedFamilies {

0 commit comments

Comments
 (0)