pods: update init_cotainer_info metric

kubernetes · Nov 19, 2023 · 952ff6b · 952ff6b
1 parent 6d69935
commit 952ff6b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/internal/store/pod.go b/internal/store/pod.go
@@ -677,7 +677,7 @@ func createPodInitContainerInfoFamilyGenerator() generator.FamilyGenerator {
 		"",
 		wrapPodFunc(func(p *v1.Pod) *metric.Family {
 			ms := []*metric.Metric{}
-			labelKeys := []string{"container", "image_spec", "image", "image_id", "container_id"}
+			labelKeys := []string{"container", "image_spec", "image", "image_id", "container_id", "type"}
 
 			for _, c := range p.Spec.InitContainers {
 				for _, cs := range p.Status.InitContainerStatuses {
@@ -686,7 +686,7 @@ func createPodInitContainerInfoFamilyGenerator() generator.FamilyGenerator {
 					}
 					ms = append(ms, &metric.Metric{
 						LabelKeys:   labelKeys,
-						LabelValues: []string{cs.Name, c.Image, cs.Image, cs.ImageID, cs.ContainerID},
+						LabelValues: []string{cs.Name, c.Image, cs.Image, cs.ImageID, cs.ContainerID, c.RestartPolicy},
 						Value:       1,
 					})
 				}

diff --git a/internal/store/pod_test.go b/internal/store/pod_test.go
@@ -89,6 +89,7 @@ func TestPodStore(t *testing.T) {
 						{
 							Name:  "initContainer",
 							Image: "k8s.gcr.io/initfoo_spec",
+							RestartPolicy: v1.RestartPolicyAlways
 						},
 					},
 				},
-Original file line number
+Diff line change
@@ Expand Up / @@ -89,6 +89,7 @@ func TestPodStore(t *testing.T) { @@
     						{
     							Name:  "initContainer",
     							Image: "k8s.gcr.io/initfoo_spec",
+    							RestartPolicy: v1.RestartPolicyAlways
     						},
     					},
     				},
@@ Expand Down @@