Add instance type and instance type offering generator

aws · Sep 29, 2024 · 027ed24 · 027ed24
1 parent 8676ebf
commit 027ed24
Show file tree

Hide file tree

Showing 12 changed files with 250 additions and 267 deletions.
diff --git a/cmd/controller/main.go b/cmd/controller/main.go
@@ -15,8 +15,6 @@ limitations under the License.
 package main
 
 import (
-	"github.com/samber/lo"
-
 	"github.com/aws/karpenter-provider-aws/pkg/cloudprovider"
 	"github.com/aws/karpenter-provider-aws/pkg/controllers"
 	"github.com/aws/karpenter-provider-aws/pkg/operator"
@@ -37,7 +35,6 @@ func main() {
 		op.AMIProvider,
 		op.SecurityGroupProvider,
 	)
-	lo.Must0(op.AddHealthzCheck("cloud-provider", awsCloudProvider.LivenessProbe))
 	cloudProvider := metrics.Decorate(awsCloudProvider)
 
 	op.

diff --git a/hack/docs/instancetypes_gen/main.go b/hack/docs/instancetypes_gen/main.go
@@ -129,16 +129,18 @@ below are the resources available with some assumptions and after the instance o
 		ec2api := ec2.New(sess)
 		subnetProvider := subnet.NewDefaultProvider(ec2api, cache.New(awscache.DefaultTTL, awscache.DefaultCleanupInterval), cache.New(awscache.AvailableIPAddressTTL, awscache.DefaultCleanupInterval), cache.New(awscache.AssociatePublicIPAddressTTL, awscache.DefaultCleanupInterval))
 		instanceTypeProvider := instancetype.NewDefaultProvider(
-			region,
 			cache.New(awscache.InstanceTypesAndZonesTTL, awscache.DefaultCleanupInterval),
 			ec2api,
 			subnetProvider,
-			awscache.NewUnavailableOfferings(),
-			pricing.NewDefaultProvider(
-				ctx,
-				pricing.NewAPI(sess, *sess.Config.Region),
-				ec2api,
-				*sess.Config.Region,
+			instancetype.NewDefaultResolver(
+				region,
+				pricing.NewDefaultProvider(
+					ctx,
+					pricing.NewAPI(sess, *sess.Config.Region),
+					ec2api,
+					*sess.Config.Region,
+				),
+				awscache.NewUnavailableOfferings(),
 			),
 		)
 		if err = instanceTypeProvider.UpdateInstanceTypes(ctx); err != nil {
@@ -172,7 +174,7 @@ below are the resources available with some assumptions and after the instance o
 				Zone: *ec2subnet.AvailabilityZone,
 			}
 		})
-		instanceTypes, err := instanceTypeProvider.List(ctx, &v1.KubeletConfiguration{}, nodeClass)
+		instanceTypes, err := instanceTypeProvider.List(ctx, nodeClass)
 		if err != nil {
 			log.Fatalf("listing instance types, %s", err)
 		}

diff --git a/pkg/cloudprovider/cloudprovider.go b/pkg/cloudprovider/cloudprovider.go
@@ -18,7 +18,6 @@ import (
 	"context"
 	stderrors "errors"
 	"fmt"
-	"net/http"
 	"time"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
@@ -159,10 +158,6 @@ func (c *CloudProvider) Get(ctx context.Context, providerID string) (*karpv1.Nod
 	return c.instanceToNodeClaim(instance, instanceType, nc), nil
 }
 
-func (c *CloudProvider) LivenessProbe(req *http.Request) error {
-	return c.instanceTypeProvider.LivenessProbe(req)
-}
-
 // GetInstanceTypes returns all available InstanceTypes
 func (c *CloudProvider) GetInstanceTypes(ctx context.Context, nodePool *karpv1.NodePool) ([]*cloudprovider.InstanceType, error) {
 	nodeClass, err := c.resolveNodeClassFromNodePool(ctx, nodePool)
@@ -176,7 +171,7 @@ func (c *CloudProvider) GetInstanceTypes(ctx context.Context, nodePool *karpv1.N
 		return nil, fmt.Errorf("resolving node class, %w", err)
 	}
 	// TODO, break this coupling
-	instanceTypes, err := c.instanceTypeProvider.List(ctx, nodeClass.Spec.Kubelet, nodeClass)
+	instanceTypes, err := c.instanceTypeProvider.List(ctx, nodeClass)
 	if err != nil {
 		return nil, err
 	}
@@ -260,7 +255,7 @@ func (c *CloudProvider) resolveNodeClassFromNodePool(ctx context.Context, nodePo
 }
 
 func (c *CloudProvider) resolveInstanceTypes(ctx context.Context, nodeClaim *karpv1.NodeClaim, nodeClass *v1.EC2NodeClass) ([]*cloudprovider.InstanceType, error) {
-	instanceTypes, err := c.instanceTypeProvider.List(ctx, nodeClass.Spec.Kubelet, nodeClass)
+	instanceTypes, err := c.instanceTypeProvider.List(ctx, nodeClass)
 	if err != nil {
 		return nil, fmt.Errorf("getting instance types, %w", err)
 	}

diff --git a/pkg/controllers/controllers.go b/pkg/controllers/controllers.go
@@ -56,7 +56,7 @@ import (
 func NewControllers(ctx context.Context, mgr manager.Manager, sess *session.Session, clk clock.Clock, kubeClient client.Client, recorder events.Recorder,
 	unavailableOfferings *cache.UnavailableOfferings, cloudProvider cloudprovider.CloudProvider, subnetProvider subnet.Provider,
 	securityGroupProvider securitygroup.Provider, instanceProfileProvider instanceprofile.Provider, instanceProvider instance.Provider,
-	pricingProvider pricing.Provider, amiProvider amifamily.Provider, launchTemplateProvider launchtemplate.Provider, instanceTypeProvider instancetype.Provider) []controller.Controller {
+	pricingProvider pricing.Provider, amiProvider amifamily.Provider, launchTemplateProvider launchtemplate.Provider, instanceTypeProvider *instancetype.DefaultProvider) []controller.Controller {
 
 	controllers := []controller.Controller{
 		nodeclasshash.NewController(kubeClient),

diff --git a/pkg/controllers/providers/instancetype/controller.go b/pkg/controllers/providers/instancetype/controller.go
@@ -31,21 +31,21 @@ import (
 )
 
 type Controller struct {
-	instancetypeProvider instancetype.Provider
+	instanceTypeProvider *instancetype.DefaultProvider
 }
 
-func NewController(instancetypeProvider instancetype.Provider) *Controller {
+func NewController(instanceTypeProvider *instancetype.DefaultProvider) *Controller {
 	return &Controller{
-		instancetypeProvider: instancetypeProvider,
+		instanceTypeProvider: instanceTypeProvider,
 	}
 }
 
 func (c *Controller) Reconcile(ctx context.Context) (reconcile.Result, error) {
 	ctx = injection.WithControllerName(ctx, "providers.instancetype")
 
 	work := []func(ctx context.Context) error{
-		c.instancetypeProvider.UpdateInstanceTypes,
-		c.instancetypeProvider.UpdateInstanceTypeOfferings,
+		c.instanceTypeProvider.UpdateInstanceTypes,
+		c.instanceTypeProvider.UpdateInstanceTypeOfferings,
 	}
 	errs := make([]error, len(work))
 	lop.ForEach(work, func(f func(ctx context.Context) error, i int) {

diff --git a/pkg/controllers/providers/instancetype/suite_test.go b/pkg/controllers/providers/instancetype/suite_test.go
@@ -89,7 +89,7 @@ var _ = Describe("InstanceType", func() {
 		})
 
 		ExpectSingletonReconciled(ctx, controller)
-		instanceTypes, err := awsEnv.InstanceTypesProvider.List(ctx, &v1.KubeletConfiguration{}, &v1.EC2NodeClass{
+		instanceTypes, err := awsEnv.InstanceTypesProvider.List(ctx, &v1.EC2NodeClass{
 			Status: v1.EC2NodeClassStatus{
 				Subnets: []v1.Subnet{
 					{
@@ -123,7 +123,7 @@ var _ = Describe("InstanceType", func() {
 		})
 
 		ExpectSingletonReconciled(ctx, controller)
-		instanceTypes, err := awsEnv.InstanceTypesProvider.List(ctx, &v1.KubeletConfiguration{}, &v1.EC2NodeClass{
+		instanceTypes, err := awsEnv.InstanceTypesProvider.List(ctx, &v1.EC2NodeClass{
 			Status: v1.EC2NodeClassStatus{
 				Subnets: []v1.Subnet{
 					{
@@ -158,14 +158,14 @@ var _ = Describe("InstanceType", func() {
 		awsEnv.EC2API.DescribeInstanceTypesOutput.Set(&ec2.DescribeInstanceTypesOutput{})
 		awsEnv.EC2API.DescribeInstanceTypeOfferingsOutput.Set(&ec2.DescribeInstanceTypeOfferingsOutput{})
 		ExpectSingletonReconciled(ctx, controller)
-		_, err := awsEnv.InstanceTypesProvider.List(ctx, &v1.KubeletConfiguration{}, &v1.EC2NodeClass{})
+		_, err := awsEnv.InstanceTypesProvider.List(ctx, &v1.EC2NodeClass{})
 		Expect(err).ToNot(BeNil())
 	})
 	It("should not update instance type offering date with response from the DescribeInstanceTypesOfferings API", func() {
 		awsEnv.EC2API.DescribeInstanceTypesOutput.Set(&ec2.DescribeInstanceTypesOutput{})
 		awsEnv.EC2API.DescribeInstanceTypeOfferingsOutput.Set(&ec2.DescribeInstanceTypeOfferingsOutput{})
 		ExpectSingletonReconciled(ctx, controller)
-		_, err := awsEnv.InstanceTypesProvider.List(ctx, &v1.KubeletConfiguration{}, &v1.EC2NodeClass{})
+		_, err := awsEnv.InstanceTypesProvider.List(ctx, &v1.EC2NodeClass{})
 		Expect(err).ToNot(BeNil())
 	})
 })
diff --git a/pkg/operator/operator.go b/pkg/operator/operator.go
@@ -82,7 +82,7 @@ type Operator struct {
 	LaunchTemplateProvider    launchtemplate.Provider
 	PricingProvider           pricing.Provider
 	VersionProvider           version.Provider
-	InstanceTypesProvider     instancetype.Provider
+	InstanceTypesProvider     *instancetype.DefaultProvider
 	InstanceProvider          instance.Provider
 	SSMProvider               ssmp.Provider
 }
@@ -158,12 +158,10 @@ func NewOperator(ctx context.Context, operator *operator.Operator) (context.Cont
 		clusterEndpoint,
 	)
 	instanceTypeProvider := instancetype.NewDefaultProvider(
-		*sess.Config.Region,
 		cache.New(awscache.InstanceTypesAndZonesTTL, awscache.DefaultCleanupInterval),
 		ec2api,
 		subnetProvider,
-		unavailableOfferingsCache,
-		pricingProvider,
+		instancetype.NewDefaultResolver(*sess.Config.Region, pricingProvider, unavailableOfferingsCache),
 	)
 	instanceProvider := instance.NewDefaultProvider(
 		ctx,