Merge pull request #1145 from qw1mb0/add-unexpected-admission-error-pod-reason

add UnexpectedAdmissionError to kube_pod_status_reason metric

Author: k8s-ci-robot

docs/pod-metrics.md

@@ -38,7 +38,7 @@
 | kube_pod_init_container_resource_requests | Gauge | `resource`=&lt;resource-name&gt; <br> `unit`=&lt;resource-unit&gt; <br> `container`=&lt;container-name&gt; <br> `pod`=&lt;pod-name&gt; <br> `namespace`=&lt;pod-namespace&gt; <br> `node`=&lt; node-name&gt; | STABLE |
 | kube_pod_spec_volumes_persistentvolumeclaims_info | Gauge | `pod`=&lt;pod-name&gt; <br> `namespace`=&lt;pod-namespace&gt; <br> `volume`=&lt;volume-name&gt;  <br> `persistentvolumeclaim`=&lt;persistentvolumeclaim-claimname&gt; | STABLE |
 | kube_pod_spec_volumes_persistentvolumeclaims_readonly | Gauge | `pod`=&lt;pod-name&gt; <br> `namespace`=&lt;pod-namespace&gt;  <br> `volume`=&lt;volume-name&gt;  <br> `persistentvolumeclaim`=&lt;persistentvolumeclaim-claimname&gt; | STABLE |
-| kube_pod_status_reason | Gauge | `pod`=&lt;pod-name&gt; <br> `namespace`=&lt;pod-namespace&gt; <br> `reason`=&lt;NodeLost\|Evicted&gt; | EXPERIMENTAL |
+| kube_pod_status_reason | Gauge | `pod`=&lt;pod-name&gt; <br> `namespace`=&lt;pod-namespace&gt; <br> `reason`=&lt;NodeLost\|Evicted\|UnexpectedAdmissionError&gt; | EXPERIMENTAL |
 | kube_pod_status_scheduled_time | Gauge | `pod`=&lt;pod-name&gt; <br> `namespace`=&lt;pod-namespace&gt; | STABLE |
 | kube_pod_status_unschedulable | Gauge | `pod`=&lt;pod-name&gt; <br> `namespace`=&lt;pod-namespace&gt; | STABLE |
 

internal/store/pod.go

@@ -35,7 +35,7 @@ var (
 	descPodLabelsDefaultLabels = []string{"namespace", "pod"}
 	containerWaitingReasons    = []string{"ContainerCreating", "CrashLoopBackOff", "CreateContainerConfigError", "ErrImagePull", "ImagePullBackOff", "CreateContainerError", "InvalidImageName"}
 	containerTerminatedReasons = []string{"OOMKilled", "Completed", "Error", "ContainerCannotRun", "DeadlineExceeded", "Evicted"}
-	podStatusReasons           = []string{"NodeLost", "Evicted"}
+	podStatusReasons           = []string{"NodeLost", "Evicted", "UnexpectedAdmissionError"}
 
 	podMetricFamilies = []generator.FamilyGenerator{
 		{

internal/store/pod_test.go

@@ -1092,6 +1092,7 @@ kube_pod_container_status_last_terminated_reason{container="container7",namespac
 				kube_pod_status_phase{namespace="ns4",phase="Unknown",pod="pod4"} 0
 				kube_pod_status_reason{namespace="ns4",pod="pod4",reason="Evicted"} 0
 				kube_pod_status_reason{namespace="ns4",pod="pod4",reason="NodeLost"} 1
+				kube_pod_status_reason{namespace="ns4",pod="pod4",reason="UnexpectedAdmissionError"} 0
 `,
 			MetricNames: []string{"kube_pod_status_phase", "kube_pod_status_reason"},
 		},
@@ -1112,6 +1113,28 @@ kube_pod_container_status_last_terminated_reason{container="container7",namespac
 				# TYPE kube_pod_status_reason gauge
 				kube_pod_status_reason{namespace="ns4",pod="pod4",reason="Evicted"} 1
 				kube_pod_status_reason{namespace="ns4",pod="pod4",reason="NodeLost"} 0
+				kube_pod_status_reason{namespace="ns4",pod="pod4",reason="UnexpectedAdmissionError"} 0
+`,
+			MetricNames: []string{"kube_pod_status_reason"},
+		},
+		{
+			Obj: &v1.Pod{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:              "pod4",
+					Namespace:         "ns4",
+					DeletionTimestamp: &metav1.Time{},
+				},
+				Status: v1.PodStatus{
+					Phase:  v1.PodRunning,
+					Reason: "UnexpectedAdmissionError",
+				},
+			},
+			Want: `
+				# HELP kube_pod_status_reason The pod status reasons
+				# TYPE kube_pod_status_reason gauge
+				kube_pod_status_reason{namespace="ns4",pod="pod4",reason="Evicted"} 0
+				kube_pod_status_reason{namespace="ns4",pod="pod4",reason="NodeLost"} 0
+				kube_pod_status_reason{namespace="ns4",pod="pod4",reason="UnexpectedAdmissionError"} 1
 `,
 			MetricNames: []string{"kube_pod_status_reason"},
 		},
@@ -1132,6 +1155,7 @@ kube_pod_container_status_last_terminated_reason{container="container7",namespac
 				# TYPE kube_pod_status_reason gauge
 				kube_pod_status_reason{namespace="ns4",pod="pod4",reason="Evicted"} 0
 				kube_pod_status_reason{namespace="ns4",pod="pod4",reason="NodeLost"} 0
+				kube_pod_status_reason{namespace="ns4",pod="pod4",reason="UnexpectedAdmissionError"} 0
 `,
 			MetricNames: []string{"kube_pod_status_reason"},
 		},

main_test.go

@@ -193,6 +193,7 @@ kube_pod_status_phase{namespace="default",pod="pod0",phase="Unknown"} 0
 # TYPE kube_pod_status_reason gauge
 kube_pod_status_reason{namespace="default",pod="pod0",reason="Evicted"} 0
 kube_pod_status_reason{namespace="default",pod="pod0",reason="NodeLost"} 0
+kube_pod_status_reason{namespace="default",pod="pod0",reason="UnexpectedAdmissionError"} 0
 # HELP kube_pod_status_scheduled Describes the status of the scheduling process for the pod.
 # TYPE kube_pod_status_scheduled gauge
 # HELP kube_pod_container_info Information about a container in a pod.