Fix: Set Karpenter Consolidation Timeouts to zero (#1863)

kubernetes-sigs · Dec 6, 2024 · 8d819c1 · 8d819c1
1 parent d3907af
commit 8d819c1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/pkg/controllers/disruption/metrics.go b/pkg/controllers/disruption/metrics.go
@@ -30,6 +30,11 @@ const (
 	consolidationTypeLabel       = "consolidation_type"
 )
 
+func init() {
+	ConsolidationTimeoutsTotal.Add(0, map[string]string{consolidationTypeLabel: MultiNodeConsolidationType})
+	ConsolidationTimeoutsTotal.Add(0, map[string]string{consolidationTypeLabel: SingleNodeConsolidationType})
+}
+
 var (
 	EvaluationDurationSeconds = opmetrics.NewPrometheusHistogram(
 		crmetrics.Registry,

diff --git a/pkg/controllers/disruption/multinodeconsolidation.go b/pkg/controllers/disruption/multinodeconsolidation.go
@@ -33,6 +33,7 @@ import (
 )
 
 const MultiNodeConsolidationTimeoutDuration = 1 * time.Minute
+const MultiNodeConsolidationType = "multi"
 
 type MultiNodeConsolidation struct {
 	consolidation
@@ -224,5 +225,5 @@ func (m *MultiNodeConsolidation) Class() string {
 }
 
 func (m *MultiNodeConsolidation) ConsolidationType() string {
-	return "multi"
+	return MultiNodeConsolidationType
 }
diff --git a/pkg/controllers/disruption/singlenodeconsolidation.go b/pkg/controllers/disruption/singlenodeconsolidation.go
@@ -28,6 +28,7 @@ import (
 )
 
 const SingleNodeConsolidationTimeoutDuration = 3 * time.Minute
+const SingleNodeConsolidationType = "single"
 
 // SingleNodeConsolidation is the consolidation controller that performs single-node consolidation.
 type SingleNodeConsolidation struct {
@@ -108,5 +109,5 @@ func (s *SingleNodeConsolidation) Class() string {
 }
 
 func (s *SingleNodeConsolidation) ConsolidationType() string {
-	return "single"
+	return SingleNodeConsolidationType
 }