Skip to content

Commit d81c128

Browse files
Rishab87Rishab87
committed
adding reasons from deployment_utils.go
1 parent d8c6c93 commit d81c128

File tree

2 files changed

+42
-38
lines changed

2 files changed

+42
-38
lines changed

‎internal/store/deployment.go‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,19 @@ var (
4141
descDeploymentLabelsDefaultLabels = []string{"namespace", "deployment"}
4242
)
4343

44+
// Reasons copied from kubernetes/pkg/controller/deployment/deployment_utils.go.
4445
var (
4546
allowedDeploymentReasons = map[string]struct{}{
46-
"MinimumReplicasAvailable": {},
47-
"NewReplicaSetAvailable": {},
48-
"FailedCreate": {},
49-
"": {},
47+
"ReplicaSetUpdated": {},
48+
"ReplicaSetCreateError": {},
49+
"NewReplicaSetCreated": {},
50+
"FoundNewReplicaSet": {},
51+
"NewReplicaSetAvailable": {},
52+
"ProgressDeadlineExceeded": {},
53+
"DeploymentPaused": {},
54+
"DeploymentResumed": {},
55+
"MinimumReplicasAvailable": {},
56+
"MinimumReplicasUnavailable": {},
5057
}
5158
)
5259

‎internal/store/deployment_test.go‎

Lines changed: 31 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,12 @@ func TestDeploymentStore(t *testing.T) {
127127
kube_deployment_status_replicas_updated{deployment="depl1",namespace="ns1"} 2
128128
kube_deployment_status_replicas{deployment="depl1",namespace="ns1"} 15
129129
kube_deployment_status_replicas_ready{deployment="depl1",namespace="ns1"} 10
130-
kube_deployment_status_condition{deployment="depl1",namespace="ns1",reason="MinimumReplicasAvailable",condition="Available",status="true"} 1
131-
kube_deployment_status_condition{deployment="depl1",namespace="ns1",reason="NewReplicaSetAvailable",condition="Progressing",status="true"} 1
132-
kube_deployment_status_condition{deployment="depl1",namespace="ns1",reason="MinimumReplicasAvailable",condition="Available",status="false"} 0
133-
kube_deployment_status_condition{deployment="depl1",namespace="ns1",reason="NewReplicaSetAvailable",condition="Progressing",status="false"} 0
134-
kube_deployment_status_condition{deployment="depl1",namespace="ns1",reason="MinimumReplicasAvailable",condition="Available",status="unknown"} 0
135-
kube_deployment_status_condition{deployment="depl1",namespace="ns1",reason="NewReplicaSetAvailable",condition="Progressing",status="unknown"} 0
130+
kube_deployment_status_condition{condition="Available",deployment="depl1",namespace="ns1",reason="MinimumReplicasAvailable",status="true"} 1
131+
kube_deployment_status_condition{condition="Available",deployment="depl1",namespace="ns1",reason="MinimumReplicasAvailable",status="false"} 0
132+
kube_deployment_status_condition{condition="Available",deployment="depl1",namespace="ns1",reason="MinimumReplicasAvailable",status="unknown"} 0
133+
kube_deployment_status_condition{condition="Progressing",deployment="depl1",namespace="ns1",reason="NewReplicaSetAvailable",status="true"} 1
134+
kube_deployment_status_condition{condition="Progressing",deployment="depl1",namespace="ns1",reason="NewReplicaSetAvailable",status="false"} 0
135+
kube_deployment_status_condition{condition="Progressing",deployment="depl1",namespace="ns1",reason="NewReplicaSetAvailable",status="unknown"} 0
136136
`,
137137
},
138138
{
@@ -153,10 +153,9 @@ func TestDeploymentStore(t *testing.T) {
153153
UpdatedReplicas: 1,
154154
ObservedGeneration: 1111,
155155
Conditions: []v1.DeploymentCondition{
156-
{Type: v1.DeploymentAvailable, Status: corev1.ConditionFalse, Reason: "MinimumReplicasAvailable"},
157-
{Type: v1.DeploymentProgressing, Status: corev1.ConditionFalse, Reason: "NewReplicaSetAvailable"},
158-
{Type: v1.DeploymentReplicaFailure, Status: corev1.ConditionTrue, Reason: "FailedCreate"},
159-
{Type: v1.DeploymentProgressing, Status: corev1.ConditionTrue},
156+
{Type: v1.DeploymentAvailable, Status: corev1.ConditionFalse, Reason: "MinimumReplicasUnavailable"},
157+
{Type: v1.DeploymentProgressing, Status: corev1.ConditionFalse, Reason: "ProgressDeadlineExceeded"},
158+
{Type: v1.DeploymentReplicaFailure, Status: corev1.ConditionTrue, Reason: "ReplicaSetCreateError"},
160159
},
161160
},
162161
Spec: v1.DeploymentSpec{
@@ -182,18 +181,16 @@ func TestDeploymentStore(t *testing.T) {
182181
kube_deployment_status_replicas_updated{deployment="depl2",namespace="ns2"} 1
183182
kube_deployment_status_replicas{deployment="depl2",namespace="ns2"} 10
184183
kube_deployment_status_replicas_ready{deployment="depl2",namespace="ns2"} 5
185-
kube_deployment_status_condition{deployment="depl2",namespace="ns2",reason="MinimumReplicasAvailable",condition="Available",status="true"} 0
186-
kube_deployment_status_condition{deployment="depl2",namespace="ns2",reason="NewReplicaSetAvailable",condition="Progressing",status="true"} 0
187-
kube_deployment_status_condition{deployment="depl2",namespace="ns2",reason="FailedCreate",condition="ReplicaFailure",status="true"} 1
188-
kube_deployment_status_condition{deployment="depl2",namespace="ns2",reason="MinimumReplicasAvailable",condition="Available",status="false"} 1
189-
kube_deployment_status_condition{deployment="depl2",namespace="ns2",reason="NewReplicaSetAvailable",condition="Progressing",status="false"} 1
190-
kube_deployment_status_condition{deployment="depl2",namespace="ns2",reason="FailedCreate",condition="ReplicaFailure",status="false"} 0
191-
kube_deployment_status_condition{deployment="depl2",namespace="ns2",reason="MinimumReplicasAvailable",condition="Available",status="unknown"} 0
192-
kube_deployment_status_condition{deployment="depl2",namespace="ns2",reason="NewReplicaSetAvailable",condition="Progressing",status="unknown"} 0
193-
kube_deployment_status_condition{deployment="depl2",namespace="ns2",reason="FailedCreate",condition="ReplicaFailure",status="unknown"} 0
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`,
184+
kube_deployment_status_condition{condition="Available",deployment="depl2",namespace="ns2",reason="MinimumReplicasUnavailable",status="true"} 0
185+
kube_deployment_status_condition{condition="Available",deployment="depl2",namespace="ns2",reason="MinimumReplicasUnavailable",status="false"} 1
186+
kube_deployment_status_condition{condition="Available",deployment="depl2",namespace="ns2",reason="MinimumReplicasUnavailable",status="unknown"} 0
187+
kube_deployment_status_condition{condition="Progressing",deployment="depl2",namespace="ns2",reason="ProgressDeadlineExceeded",status="true"} 0
188+
kube_deployment_status_condition{condition="Progressing",deployment="depl2",namespace="ns2",reason="ProgressDeadlineExceeded",status="false"} 1
189+
kube_deployment_status_condition{condition="Progressing",deployment="depl2",namespace="ns2",reason="ProgressDeadlineExceeded",status="unknown"} 0
190+
kube_deployment_status_condition{condition="ReplicaFailure",deployment="depl2",namespace="ns2",reason="ReplicaSetCreateError",status="true"} 1
191+
kube_deployment_status_condition{condition="ReplicaFailure",deployment="depl2",namespace="ns2",reason="ReplicaSetCreateError",status="false"} 0
192+
kube_deployment_status_condition{condition="ReplicaFailure",deployment="depl2",namespace="ns2",reason="ReplicaSetCreateError",status="unknown"} 0
193+
`,
197194
},
198195
{
199196
Obj: &v1.Deployment{
@@ -211,18 +208,18 @@ func TestDeploymentStore(t *testing.T) {
211208
},
212209
},
213210
Want: metadata + `
214-
kube_deployment_metadata_generation{deployment="depl3",namespace="ns3"} 0
215-
kube_deployment_spec_paused{deployment="depl3",namespace="ns3"} 0
216-
kube_deployment_spec_replicas{deployment="depl3",namespace="ns3"} 1
217-
kube_deployment_status_condition{deployment="depl3",namespace="ns3",reason="unknown",condition="Available",status="true"} 0
218-
kube_deployment_status_condition{deployment="depl3",namespace="ns3",reason="unknown",condition="Available",status="false"} 1
219-
kube_deployment_status_condition{deployment="depl3",namespace="ns3",reason="unknown",condition="Available",status="unknown"} 0
220-
kube_deployment_status_observed_generation{deployment="depl3",namespace="ns3"} 0
221-
kube_deployment_status_replicas{deployment="depl3",namespace="ns3"} 0
222-
kube_deployment_status_replicas_available{deployment="depl3",namespace="ns3"} 0
223-
kube_deployment_status_replicas_ready{deployment="depl3",namespace="ns3"} 0
224-
kube_deployment_status_replicas_unavailable{deployment="depl3",namespace="ns3"} 0
225-
kube_deployment_status_replicas_updated{deployment="depl3",namespace="ns3"} 0
211+
kube_deployment_metadata_generation{deployment="depl3",namespace="ns3"} 0
212+
kube_deployment_spec_paused{deployment="depl3",namespace="ns3"} 0
213+
kube_deployment_spec_replicas{deployment="depl3",namespace="ns3"} 1
214+
kube_deployment_status_condition{condition="Available",deployment="depl3",namespace="ns3",reason="unknown",status="true"} 0
215+
kube_deployment_status_condition{condition="Available",deployment="depl3",namespace="ns3",reason="unknown",status="false"} 1
216+
kube_deployment_status_condition{condition="Available",deployment="depl3",namespace="ns3",reason="unknown",status="unknown"} 0
217+
kube_deployment_status_observed_generation{deployment="depl3",namespace="ns3"} 0
218+
kube_deployment_status_replicas{deployment="depl3",namespace="ns3"} 0
219+
kube_deployment_status_replicas_available{deployment="depl3",namespace="ns3"} 0
220+
kube_deployment_status_replicas_ready{deployment="depl3",namespace="ns3"} 0
221+
kube_deployment_status_replicas_unavailable{deployment="depl3",namespace="ns3"} 0
222+
kube_deployment_status_replicas_updated{deployment="depl3",namespace="ns3"} 0
226223
`,
227224
},
228225
}

0 commit comments

Comments
 (0)