feat: Add nodepool label to karpenter_interruption_actions_performed (#…

…6094)
aws · May 14, 2024 · 120419b · 120419b
1 parent 2ace691
commit 120419b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/pkg/controllers/interruption/controller.go b/pkg/controllers/interruption/controller.go
@@ -188,7 +188,12 @@ func (c *Controller) handleNodeClaim(ctx context.Context, msg messages.Message,
 
 	// Record metric and event for this action
 	c.notifyForMessage(msg, nodeClaim, node)
-	actionsPerformed.WithLabelValues(string(action)).Inc()
+	actionsPerformed.With(
+		prometheus.Labels{
+			actionTypeLabel:       string(action),
+			metrics.NodePoolLabel: nodeClaim.Labels[v1beta1.NodePoolLabelKey],
+		},
+	).Inc()
 
 	// Mark the offering as unavailable in the ICE cache since we got a spot interruption warning
 	if msg.Kind() == messages.SpotInterruptionKind {

diff --git a/pkg/controllers/interruption/metrics.go b/pkg/controllers/interruption/metrics.go
@@ -62,7 +62,10 @@ var (
 			Name:      "actions_performed",
 			Help:      "Number of notification actions performed. Labeled by action",
 		},
-		[]string{actionTypeLabel},
+		[]string{
+			actionTypeLabel,
+			metrics.NodePoolLabel,
+		},
 	)
 )
 

diff --git a/pkg/providers/subnet/subnet.go b/pkg/providers/subnet/subnet.go
@@ -37,7 +37,7 @@ import (
 type Provider interface {
 	LivenessProbe(*http.Request) error
 	List(context.Context, *v1beta1.EC2NodeClass) ([]*ec2.Subnet, error)
-	AssociatePublicIPAddressValue( *v1beta1.EC2NodeClass) (*bool)
+	AssociatePublicIPAddressValue(*v1beta1.EC2NodeClass) *bool
 	ZonalSubnetsForLaunch(context.Context, *v1beta1.EC2NodeClass, []*cloudprovider.InstanceType, string) (map[string]*Subnet, error)
 	UpdateInflightIPs(*ec2.CreateFleetInput, *ec2.CreateFleetOutput, []*cloudprovider.InstanceType, []*Subnet, string)
 }