chore: Remove instanceProfileProvider from the launchTemplateProvider (…

…#6033)
aws · Apr 12, 2024 · 3912ed2 · 3912ed2
1 parent c8e8dc9
commit 3912ed2
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 27 deletions.
diff --git a/pkg/operator/operator.go b/pkg/operator/operator.go
@@ -152,7 +152,6 @@ func NewOperator(ctx context.Context, operator *operator.Operator) (context.Cont
 		amiResolver,
 		securityGroupProvider,
 		subnetProvider,
-		instanceProfileProvider,
 		lo.Must(GetCABundle(ctx, operator.GetConfig())),
 		operator.Elected(),
 		kubeDNSIP,

diff --git a/pkg/providers/launchtemplate/launchtemplate.go b/pkg/providers/launchtemplate/launchtemplate.go
@@ -44,7 +44,6 @@ import (
 	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/amifamily"
-	"github.com/aws/karpenter-provider-aws/pkg/providers/instanceprofile"
 	"github.com/aws/karpenter-provider-aws/pkg/providers/securitygroup"
 	"github.com/aws/karpenter-provider-aws/pkg/providers/subnet"
 	"github.com/aws/karpenter-provider-aws/pkg/utils"
@@ -71,35 +70,33 @@ type LaunchTemplate struct {
 
 type DefaultProvider struct {
 	sync.Mutex
-	ec2api                  ec2iface.EC2API
-	eksapi                  eksiface.EKSAPI
-	amiFamily               *amifamily.Resolver
-	securityGroupProvider   securitygroup.Provider
-	subnetProvider          subnet.Provider
-	instanceProfileProvider instanceprofile.Provider
-	cache                   *cache.Cache
-	cm                      *pretty.ChangeMonitor
-	KubeDNSIP               net.IP
-	CABundle                *string
-	ClusterEndpoint         string
-	ClusterCIDR             atomic.Pointer[string]
+	ec2api                ec2iface.EC2API
+	eksapi                eksiface.EKSAPI
+	amiFamily             *amifamily.Resolver
+	securityGroupProvider securitygroup.Provider
+	subnetProvider        subnet.Provider
+	cache                 *cache.Cache
+	cm                    *pretty.ChangeMonitor
+	KubeDNSIP             net.IP
+	CABundle              *string
+	ClusterEndpoint       string
+	ClusterCIDR           atomic.Pointer[string]
 }
 
 func NewDefaultProvider(ctx context.Context, cache *cache.Cache, ec2api ec2iface.EC2API, eksapi eksiface.EKSAPI, amiFamily *amifamily.Resolver,
-	securityGroupProvider securitygroup.Provider, subnetProvider subnet.Provider, instanceProfileProvider instanceprofile.Provider,
+	securityGroupProvider securitygroup.Provider, subnetProvider subnet.Provider,
 	caBundle *string, startAsync <-chan struct{}, kubeDNSIP net.IP, clusterEndpoint string) *DefaultProvider {
 	l := &DefaultProvider{
-		ec2api:                  ec2api,
-		eksapi:                  eksapi,
-		amiFamily:               amiFamily,
-		securityGroupProvider:   securityGroupProvider,
-		subnetProvider:          subnetProvider,
-		instanceProfileProvider: instanceProfileProvider,
-		cache:                   cache,
-		CABundle:                caBundle,
-		cm:                      pretty.NewChangeMonitor(),
-		KubeDNSIP:               kubeDNSIP,
-		ClusterEndpoint:         clusterEndpoint,
+		ec2api:                ec2api,
+		eksapi:                eksapi,
+		amiFamily:             amiFamily,
+		securityGroupProvider: securityGroupProvider,
+		subnetProvider:        subnetProvider,
+		cache:                 cache,
+		CABundle:              caBundle,
+		cm:                    pretty.NewChangeMonitor(),
+		KubeDNSIP:             kubeDNSIP,
+		ClusterEndpoint:       clusterEndpoint,
 	}
 	l.cache.OnEvicted(l.cachedEvictedFunc(ctx))
 	go func() {

diff --git a/pkg/test/environment.go b/pkg/test/environment.go
@@ -116,7 +116,6 @@ func NewEnvironment(ctx context.Context, env *coretest.Environment) *Environment
 			amiResolver,
 			securityGroupProvider,
 			subnetProvider,
-			instanceProfileProvider,
 			ptr.String("ca-bundle"),
 			make(chan struct{}),
 			net.ParseIP("10.0.100.10"),