Refactored expiration controller into node controller

aws · Aug 3, 2021 · 641dad0 · 641dad0
1 parent feaa736
commit 641dad0
Show file tree

Hide file tree

Showing 22 changed files with 542 additions and 819 deletions.
diff --git a/cmd/controller/main.go b/cmd/controller/main.go
@@ -24,9 +24,7 @@ import (
 	"github.com/awslabs/karpenter/pkg/cloudprovider/registry"
 	"github.com/awslabs/karpenter/pkg/controllers"
 	"github.com/awslabs/karpenter/pkg/controllers/allocation"
-	"github.com/awslabs/karpenter/pkg/controllers/expiration"
 	"github.com/awslabs/karpenter/pkg/controllers/node"
-	"github.com/awslabs/karpenter/pkg/controllers/reallocation"
 	"github.com/awslabs/karpenter/pkg/controllers/termination"
 	"github.com/go-logr/zapr"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -82,9 +80,7 @@ func main() {
 		HealthProbeBindAddress: fmt.Sprintf(":%d", options.HealthProbePort),
 	})
 	if err := manager.RegisterControllers(ctx,
-		expiration.NewController(manager.GetClient()),
 		allocation.NewController(manager.GetClient(), clientSet.CoreV1(), cloudProvider),
-		reallocation.NewController(manager.GetClient(), cloudProvider),
 		termination.NewController(ctx, manager.GetClient(), clientSet.CoreV1(), cloudProvider),
 		node.NewController(manager.GetClient()),
 	).Start(ctx); err != nil {

diff --git a/go.mod b/go.mod
@@ -8,12 +8,14 @@ require (
 	github.com/avast/retry-go v2.7.0+incompatible
 	github.com/aws/aws-sdk-go v1.38.69
 	github.com/deckarep/golang-set v1.7.1
+	github.com/evanphx/json-patch/v5 v5.5.0 // indirect
 	github.com/go-logr/zapr v0.4.0
 	github.com/imdario/mergo v0.3.12
 	github.com/mitchellh/hashstructure/v2 v2.0.2
 	github.com/onsi/ginkgo v1.16.4
 	github.com/onsi/gomega v1.13.0
 	github.com/patrickmn/go-cache v2.1.0+incompatible
+	github.com/r3labs/diff v1.1.0
 	go.uber.org/multierr v1.7.0
 	go.uber.org/zap v1.18.1 // indirect
 	golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6

diff --git a/go.sum b/go.sum
@@ -541,6 +541,8 @@ github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1
 github.com/prometheus/statsd_exporter v0.20.0 h1:M0hQphnq2WyWKS5CefQL8PqWwBOBPhiAkyLo5l4ZYvE=
 github.com/prometheus/statsd_exporter v0.20.0/go.mod h1:YL3FWCG8JBBtaUSxAg4Gz2ZYu22bS84XM89ZQXXTWmQ=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
+github.com/r3labs/diff v1.1.0 h1:V53xhrbTHrWFWq3gI4b94AjgEJOerO1+1l0xyHOBi8M=
+github.com/r3labs/diff v1.1.0/go.mod h1:7WjXasNzi0vJetRcB/RqNl5dlIsmXcTTLmF5IoH6Xig=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=

diff --git a/pkg/apis/provisioning/v1alpha3/provisioner.go b/pkg/apis/provisioning/v1alpha3/provisioner.go
@@ -121,8 +121,7 @@ var (
 	NotReadyTaintKey = SchemeGroupVersion.Group + "/not-ready"
 
 	// Reserved labels
-	ProvisionerNameLabelKey          = SchemeGroupVersion.Group + "/provisioner-name"
-	ProvisionerUnderutilizedLabelKey = SchemeGroupVersion.Group + "/underutilized"
+	ProvisionerNameLabelKey = SchemeGroupVersion.Group + "/provisioner-name"
 
 	// Reserved annotations
 	KarpenterDoNotEvictPodAnnotation = SchemeGroupVersion.Group + "/do-not-evict"

diff --git a/pkg/apis/provisioning/v1alpha3/provisioner_validation.go b/pkg/apis/provisioning/v1alpha3/provisioner_validation.go
@@ -32,7 +32,6 @@ var (
 		ArchitectureLabelKey,
 		OperatingSystemLabelKey,
 		ProvisionerNameLabelKey,
-		ProvisionerUnderutilizedLabelKey,
 		ProvisionerTTLAfterEmptyKey,
 		ZoneLabelKey,
 		InstanceTypeLabelKey,

diff --git a/pkg/apis/provisioning/v1alpha3/provisioner_validation_test.go b/pkg/apis/provisioning/v1alpha3/provisioner_validation_test.go
@@ -91,7 +91,6 @@ var _ = Describe("Validation", func() {
 				ArchitectureLabelKey,
 				OperatingSystemLabelKey,
 				ProvisionerNameLabelKey,
-				ProvisionerUnderutilizedLabelKey,
 				ZoneLabelKey,
 				InstanceTypeLabelKey,
 			} {

diff --git a/pkg/cloudprovider/aws/instance.go b/pkg/cloudprovider/aws/instance.go
@@ -66,7 +66,7 @@ func (p *InstanceProvider) Create(ctx context.Context,
 		retry.Delay(1*time.Second),
 		retry.Attempts(3),
 	); err != nil {
-		return nil, err
+		return nil, fmt.Errorf("getting instance, %w", err)
 	}
 	logging.FromContext(ctx).Infof("Launched instance: %s, type: %s, zone: %s, hostname: %s",
 		aws.StringValue(instance.InstanceId),

diff --git a/pkg/controllers/expiration/controller.go b/pkg/controllers/expiration/controller.go
diff --git a/pkg/controllers/expiration/suite_test.go b/pkg/controllers/expiration/suite_test.go