Skip to content

Commit d8c6c93

Browse files
committed
adding empty reason in allowedList
1 parent a720c0d commit d8c6c93

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

internal/store/deployment.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ var (
4646
"MinimumReplicasAvailable": {},
4747
"NewReplicaSetAvailable": {},
4848
"FailedCreate": {},
49+
"": {},
4950
}
5051
)
5152

@@ -183,10 +184,8 @@ func deploymentMetricFamilies(allowAnnotationsList, allowLabelsList []string) []
183184
metric := m
184185

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

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

internal/store/deployment_test.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ func TestDeploymentStore(t *testing.T) {
156156
{Type: v1.DeploymentAvailable, Status: corev1.ConditionFalse, Reason: "MinimumReplicasAvailable"},
157157
{Type: v1.DeploymentProgressing, Status: corev1.ConditionFalse, Reason: "NewReplicaSetAvailable"},
158158
{Type: v1.DeploymentReplicaFailure, Status: corev1.ConditionTrue, Reason: "FailedCreate"},
159+
{Type: v1.DeploymentProgressing, Status: corev1.ConditionTrue},
159160
},
160161
},
161162
Spec: v1.DeploymentSpec{
@@ -190,7 +191,9 @@ func TestDeploymentStore(t *testing.T) {
190191
kube_deployment_status_condition{deployment="depl2",namespace="ns2",reason="MinimumReplicasAvailable",condition="Available",status="unknown"} 0
191192
kube_deployment_status_condition{deployment="depl2",namespace="ns2",reason="NewReplicaSetAvailable",condition="Progressing",status="unknown"} 0
192193
kube_deployment_status_condition{deployment="depl2",namespace="ns2",reason="FailedCreate",condition="ReplicaFailure",status="unknown"} 0
193-
`,
194+
kube_deployment_status_condition{condition="Progressing",deployment="depl2",namespace="ns2",reason="",status="false"} 0
195+
kube_deployment_status_condition{condition="Progressing",deployment="depl2",namespace="ns2",reason="",status="true"} 1
196+
kube_deployment_status_condition{condition="Progressing",deployment="depl2",namespace="ns2",reason="",status="unknown"} 0`,
194197
},
195198
{
196199
Obj: &v1.Deployment{
@@ -201,7 +204,6 @@ func TestDeploymentStore(t *testing.T) {
201204
Status: v1.DeploymentStatus{
202205
Conditions: []v1.DeploymentCondition{
203206
{Type: v1.DeploymentAvailable, Status: corev1.ConditionFalse, Reason: "ThisReasonIsNotAllowed"},
204-
{Type: v1.DeploymentProgressing, Status: corev1.ConditionTrue},
205207
},
206208
},
207209
Spec: v1.DeploymentSpec{
@@ -215,9 +217,6 @@ func TestDeploymentStore(t *testing.T) {
215217
kube_deployment_status_condition{deployment="depl3",namespace="ns3",reason="unknown",condition="Available",status="true"} 0
216218
kube_deployment_status_condition{deployment="depl3",namespace="ns3",reason="unknown",condition="Available",status="false"} 1
217219
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="",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
221220
kube_deployment_status_observed_generation{deployment="depl3",namespace="ns3"} 0
222221
kube_deployment_status_replicas{deployment="depl3",namespace="ns3"} 0
223222
kube_deployment_status_replicas_available{deployment="depl3",namespace="ns3"} 0

0 commit comments

Comments
 (0)