Refactored expiration controller into node controller

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

Hide file tree

Showing 20 changed files with 534 additions and 820 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/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
@@ -178,7 +178,7 @@ func (p *InstanceProvider) getInstance(ctx context.Context, id *string, instance
 	}
 	*instance = *describeInstancesOutput.Reservations[0].Instances[0]
 	if len(aws.StringValue(instance.PrivateDnsName)) == 0 {
-		return fmt.Errorf("expected PrivateDnsName to be set")
+		return fmt.Errorf("got instance %s but PrivateDnsName was not set", aws.StringValue(instance.InstanceId))
 	}
 	return nil
 }

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