Implemented support for multiple provisioners

aws · Nov 18, 2021 · ef36f9c · ef36f9c
1 parent e7736b6
commit ef36f9c
Show file tree

Hide file tree

Showing 19 changed files with 826 additions and 1,018 deletions.
diff --git a/cmd/controller/main.go b/cmd/controller/main.go
@@ -22,9 +22,9 @@ import (
 	"github.com/awslabs/karpenter/pkg/cloudprovider"
 	"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/metrics"
 	"github.com/awslabs/karpenter/pkg/controllers/node"
+	"github.com/awslabs/karpenter/pkg/controllers/provisioning"
 	"github.com/awslabs/karpenter/pkg/controllers/termination"
 	"github.com/awslabs/karpenter/pkg/utils/options"
 	"github.com/awslabs/karpenter/pkg/utils/restconfig"
@@ -81,9 +81,14 @@ func main() {
 		HealthProbeBindAddress: fmt.Sprintf(":%d", opts.HealthProbePort),
 	})
 
+	terminator := termination.NewController(ctx, manager.GetClient(), clientSet.CoreV1(), cloudProvider)
+	provisioner := provisioning.NewController(ctx, manager.GetClient(), clientSet.CoreV1(), cloudProvider)
+	scheduler := provisioning.NewScheduler(manager.GetClient(), provisioner)
+
 	if err := manager.RegisterControllers(ctx,
-		allocation.NewController(manager.GetClient(), clientSet.CoreV1(), cloudProvider),
-		termination.NewController(ctx, manager.GetClient(), clientSet.CoreV1(), cloudProvider),
+		provisioner,
+		scheduler,
+		terminator,
 		node.NewController(manager.GetClient()),
 		metrics.NewController(manager.GetClient(), cloudProvider),
 	).Start(ctx); err != nil {

diff --git a/pkg/apis/provisioning/v1alpha5/constraints.go b/pkg/apis/provisioning/v1alpha5/constraints.go
@@ -49,14 +49,14 @@ func (c *Constraints) Supports(pod *v1.Pod) error {
 	podRequirements := PodRequirements(pod)
 	for _, key := range podRequirements.Keys() {
 		if c.Requirements.Requirement(key).Len() == 0 {
-			return fmt.Errorf("%s is too constrained", key)
+			return fmt.Errorf("invalid constraint %q, %v not in %v", key, podRequirements.Requirement(key).UnsortedList(), c.Requirements.Requirement(key).UnsortedList())
 		}
 	}
 	// The combined requirements are not compatible
 	combined := c.Requirements.With(podRequirements)
 	for _, key := range podRequirements.Keys() {
 		if combined.Requirement(key).Len() == 0 {
-			return fmt.Errorf("%s is too constrained", key)
+			return fmt.Errorf("invalid constraint %q, %v not in %v", key, podRequirements.Requirement(key).UnsortedList(), c.Requirements.Requirement(key).UnsortedList())
 		}
 	}
 	return nil

diff --git a/pkg/cloudprovider/aws/suite_test.go b/pkg/cloudprovider/aws/suite_test.go
diff --git a/pkg/controllers/allocation/batch.go b/pkg/controllers/allocation/batch.go