fix(go.d/k8sstate): correct deployment conditions (#19671)
Ilya Mashchenko committed
Feb 18, 2025 at 13:08 UTC
2e16cb5ee4ad171523262ef3cd3b592b81ac1a59
2 files changed
+11
-3
src/go/plugin/go.d/collector/k8s_state/collect.go
+1
-1
@@ -343,7 +343,7 @@ func (c *Collector) collectDeploymentState(mx map[string]int64) {
343
// https://github.com/kubernetes/kubernetes/blob/2b3da7dfc846fec7c4044a320f8f38b4a45367a3/pkg/controller/deployment/sync.go#L518-L525
344
mx[px+"condition_available"] = v
345
case appsv1.DeploymentProgressing:
346
- mx[px+"condition_available"] = v
346
+ mx[px+"condition_progressing"] = v
347
case appsv1.DeploymentReplicaFailure:
348
mx[px+"condition_replica_failure"] = v
349
}
src/go/plugin/go.d/collector/k8s_state/collector_test.go
+10
-2
@@ -373,8 +373,8 @@ func TestCollector_Collect(t *testing.T) {
373
expected := map[string]int64{
374
"deploy_default_replicaset01_age": 3,
375
"deploy_default_replicaset01_condition_available": 1,
376
- "deploy_default_replicaset01_condition_progressing": 0,
377
- "deploy_default_replicaset01_condition_replica_failure": 0,
376
+ "deploy_default_replicaset01_condition_progressing": 1,
377
+ "deploy_default_replicaset01_condition_replica_failure": 1,
378
"deploy_default_replicaset01_current_replicas": 1,
379
"deploy_default_replicaset01_desired_replicas": 2,
380
"deploy_default_replicaset01_ready_replicas": 3,
@@ -994,6 +994,14 @@ func newDeployment(name string) *appsv1.Deployment {
994
Type: appsv1.DeploymentAvailable,
995
Status: corev1.ConditionTrue,
996
},
997
+ {
998
+ Type: appsv1.DeploymentProgressing,
999
+ Status: corev1.ConditionTrue,
1000
+ },
1001
+ {
1002
+ Type: appsv1.DeploymentReplicaFailure,
1003
+ Status: corev1.ConditionTrue,
1004
+ },
1005
},
1006
AvailableReplicas: 1,
1007
Replicas: 2,