From 995040b20d0ad001d7f9d9836bbf085d016d74ca Mon Sep 17 00:00:00 2001 From: Amanuel Engeda <74629455+engedaam@users.noreply.github.com> Date: Fri, 15 Nov 2024 10:06:52 -0800 Subject: [PATCH] chore: Bump operatorpkg to include object based metrics (#1814) --- go.mod | 2 +- go.sum | 4 ++-- pkg/controllers/controllers.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 3891928175..e83aef1437 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.23.2 require ( github.com/Pallinder/go-randomdata v1.2.0 github.com/avast/retry-go v3.0.0+incompatible - github.com/awslabs/operatorpkg v0.0.0-20241112190830-be645b3ea0ad + github.com/awslabs/operatorpkg v0.0.0-20241115011931-885371bcf05d github.com/docker/docker v27.3.1+incompatible github.com/go-logr/logr v1.4.2 github.com/imdario/mergo v0.3.16 diff --git a/go.sum b/go.sum index b7ea063b91..b2f5ca8861 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ github.com/Pallinder/go-randomdata v1.2.0 h1:DZ41wBchNRb/0GfsePLiSwb0PHZmT67XY00 github.com/Pallinder/go-randomdata v1.2.0/go.mod h1:yHmJgulpD2Nfrm0cR9tI/+oAgRqCQQixsA8HyRZfV9Y= github.com/avast/retry-go v3.0.0+incompatible h1:4SOWQ7Qs+oroOTQOYnAHqelpCO0biHSxpiH9JdtuBj0= github.com/avast/retry-go v3.0.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY= -github.com/awslabs/operatorpkg v0.0.0-20241112190830-be645b3ea0ad h1:40ZsADFFLtStcyh6MQxTi5sFezU7ghdFR0uaGBsVpB4= -github.com/awslabs/operatorpkg v0.0.0-20241112190830-be645b3ea0ad/go.mod h1:qO5OXavA/cGkE7eTT7ruVD54P5vVpL7HoCEl2bnB/r0= +github.com/awslabs/operatorpkg v0.0.0-20241115011931-885371bcf05d h1:u0ftwckbIE7A3Ph4dtQI+VwmVXok8hen+H0kUi6AQR4= +github.com/awslabs/operatorpkg v0.0.0-20241115011931-885371bcf05d/go.mod h1:jina2fQk+b3oa9r5bRuMDbpy6mfhTGuruh05oVVWwnk= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= diff --git a/pkg/controllers/controllers.go b/pkg/controllers/controllers.go index fd96e5869e..7eb832f05a 100644 --- a/pkg/controllers/controllers.go +++ b/pkg/controllers/controllers.go @@ -87,8 +87,8 @@ func NewControllers( nodeclaimlifecycle.NewController(clock, kubeClient, cloudProvider, recorder), nodeclaimgarbagecollection.NewController(clock, kubeClient, cloudProvider), nodeclaimdisruption.NewController(clock, kubeClient, cloudProvider), - status.NewController[*v1.NodeClaim](kubeClient, mgr.GetEventRecorderFor("karpenter")), - status.NewController[*v1.NodePool](kubeClient, mgr.GetEventRecorderFor("karpenter")), + status.NewController[*v1.NodeClaim](kubeClient, mgr.GetEventRecorderFor("karpenter"), status.EmitDeprecatedMetrics), + status.NewController[*v1.NodePool](kubeClient, mgr.GetEventRecorderFor("karpenter"), status.EmitDeprecatedMetrics), status.NewGenericObjectController[*corev1.Node](kubeClient, mgr.GetEventRecorderFor("karpenter")), } }