chore: Remove InstanceTypeProvider dependency from Instance Provider (#…

…7067)
aws · Sep 25, 2024 · abd43f3 · abd43f3
1 parent 2fcd6a3
commit abd43f3
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 6 deletions.
diff --git a/pkg/operator/operator.go b/pkg/operator/operator.go
@@ -170,7 +170,6 @@ func NewOperator(ctx context.Context, operator *operator.Operator) (context.Cont
 		aws.StringValue(sess.Config.Region),
 		ec2api,
 		unavailableOfferingsCache,
-		instanceTypeProvider,
 		subnetProvider,
 		launchTemplateProvider,
 	)

diff --git a/pkg/providers/instance/instance.go b/pkg/providers/instance/instance.go
@@ -40,7 +40,6 @@ import (
 	"github.com/aws/karpenter-provider-aws/pkg/cache"
 	awserrors "github.com/aws/karpenter-provider-aws/pkg/errors"
 	"github.com/aws/karpenter-provider-aws/pkg/operator/options"
-	"github.com/aws/karpenter-provider-aws/pkg/providers/instancetype"
 	"github.com/aws/karpenter-provider-aws/pkg/providers/launchtemplate"
 	"github.com/aws/karpenter-provider-aws/pkg/providers/subnet"
 	"github.com/aws/karpenter-provider-aws/pkg/utils"
@@ -73,19 +72,17 @@ type DefaultProvider struct {
 	region                 string
 	ec2api                 ec2iface.EC2API
 	unavailableOfferings   *cache.UnavailableOfferings
-	instanceTypeProvider   instancetype.Provider
 	subnetProvider         subnet.Provider
 	launchTemplateProvider launchtemplate.Provider
 	ec2Batcher             *batcher.EC2API
 }
 
 func NewDefaultProvider(ctx context.Context, region string, ec2api ec2iface.EC2API, unavailableOfferings *cache.UnavailableOfferings,
-	instanceTypeProvider instancetype.Provider, subnetProvider subnet.Provider, launchTemplateProvider launchtemplate.Provider) *DefaultProvider {
+	subnetProvider subnet.Provider, launchTemplateProvider launchtemplate.Provider) *DefaultProvider {
 	return &DefaultProvider{
 		region:                 region,
 		ec2api:                 ec2api,
 		unavailableOfferings:   unavailableOfferings,
-		instanceTypeProvider:   instanceTypeProvider,
 		subnetProvider:         subnetProvider,
 		launchTemplateProvider: launchTemplateProvider,
 		ec2Batcher:             batcher.EC2(ctx, ec2api),

diff --git a/pkg/test/environment.go b/pkg/test/environment.go
@@ -138,7 +138,6 @@ func NewEnvironment(ctx context.Context, env *coretest.Environment) *Environment
 			"",
 			ec2api,
 			unavailableOfferingsCache,
-			instanceTypesProvider,
 			subnetProvider,
 			launchTemplateProvider,
 		)