Skip to content

Commit a720c0d

Browse files
committed
fixing empty reasons and adding tests
1 parent 21cfa8e commit a720c0d

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

internal/store/deployment.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,10 @@ func deploymentMetricFamilies(allowAnnotationsList, allowLabelsList []string) []
183183
metric := m
184184

185185
reason := c.Reason
186-
if _, ok := allowedDeploymentReasons[reason]; !ok {
187-
reason = "unknown"
186+
if reason != "" {
187+
if _, ok := allowedDeploymentReasons[reason]; !ok {
188+
reason = "unknown"
189+
}
188190
}
189191

190192
metric.LabelKeys = []string{"reason", "condition", "status"}

internal/store/deployment_test.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -215,15 +215,16 @@ func TestDeploymentStore(t *testing.T) {
215215
kube_deployment_status_condition{deployment="depl3",namespace="ns3",reason="unknown",condition="Available",status="true"} 0
216216
kube_deployment_status_condition{deployment="depl3",namespace="ns3",reason="unknown",condition="Available",status="false"} 1
217217
kube_deployment_status_condition{deployment="depl3",namespace="ns3",reason="unknown",condition="Available",status="unknown"} 0
218-
kube_deployment_status_condition{deployment="depl3",namespace="ns3",reason="unknown",condition="Progressing",status="true"} 1
219-
kube_deployment_status_condition{deployment="depl3",namespace="ns3",reason="unknown",condition="Progressing",status="false"} 0
220-
kube_deployment_status_condition{deployment="depl3",namespace="ns3",reason="unknown",condition="Progressing",status="unknown"} 0
218+
kube_deployment_status_condition{deployment="depl3",namespace="ns3",reason="",condition="Progressing",status="true"} 1
219+
kube_deployment_status_condition{deployment="depl3",namespace="ns3",reason="",condition="Progressing",status="false"} 0
220+
kube_deployment_status_condition{deployment="depl3",namespace="ns3",reason="",condition="Progressing",status="unknown"} 0
221221
kube_deployment_status_observed_generation{deployment="depl3",namespace="ns3"} 0
222+
kube_deployment_status_replicas{deployment="depl3",namespace="ns3"} 0
222223
kube_deployment_status_replicas_available{deployment="depl3",namespace="ns3"} 0
223224
kube_deployment_status_replicas_ready{deployment="depl3",namespace="ns3"} 0
224225
kube_deployment_status_replicas_unavailable{deployment="depl3",namespace="ns3"} 0
225226
kube_deployment_status_replicas_updated{deployment="depl3",namespace="ns3"} 0
226-
kube_deployment_status_replicas{deployment="depl3",namespace="ns3"} 0`,
227+
`,
227228
},
228229
}
229230

0 commit comments

Comments
 (0)