chore: Move instance to providers

pkg/cloudprovider/suite_test.go

@@ -130,7 +130,7 @@ var _ = BeforeEach(func() {
 	})
 
 	cluster.Reset()
-	awsEnv.ResetCache()
+	awsEnv.Reset()
 
 	awsEnv.LaunchTemplateProvider.KubeDNSIP = net.ParseIP("10.0.100.10")
 	awsEnv.LaunchTemplateProvider.ClusterEndpoint = "https://test-cluster"

pkg/controllers/machine/garbagecollect/suite_test.go

@@ -78,15 +78,15 @@ var _ = AfterSuite(func() {
 })
 
 var _ = BeforeEach(func() {
-	awsEnv.ResetCache()
+	awsEnv.Reset()
 })
 
 var _ = Describe("MachineGarbageCollect", func() {
 	var instance *ec2.Instance
 	var providerID string
 
 	BeforeEach(func() {
-		awsEnv.ResetCache()
+		awsEnv.Reset()
 		instanceID := fake.InstanceID()
 		providerID = fmt.Sprintf("aws:///test-zone-1a/%s", instanceID)
 		nodeTemplate := test.AWSNodeTemplate(v1alpha1.AWSNodeTemplateSpec{})

pkg/controllers/machine/link/suite_test.go

@@ -71,7 +71,7 @@ var _ = AfterSuite(func() {
 })
 
 var _ = BeforeEach(func() {
-	awsEnv.ResetCache()
+	awsEnv.Reset()
 })
 
 var _ = Describe("MachineLink", func() {
@@ -81,7 +81,7 @@ var _ = Describe("MachineLink", func() {
 	var nodeTemplate *v1alpha1.AWSNodeTemplate
 
 	BeforeEach(func() {
-		awsEnv.ResetCache()
+		awsEnv.Reset()
 		instanceID = fake.InstanceID()
 		providerID = fmt.Sprintf("aws:///test-zone-1a/%s", instanceID)
 		nodeTemplate = test.AWSNodeTemplate(v1alpha1.AWSNodeTemplateSpec{})

pkg/controllers/nodetemplate/suite_test.go

@@ -84,7 +84,7 @@ var _ = BeforeEach(func() {
 		},
 	}
 
-	awsEnv.ResetCache()
+	awsEnv.Reset()
 })
 
 var _ = AfterEach(func() {

pkg/providers/amifamily/ami.go

@@ -259,9 +259,3 @@ func (p *Provider) getRequirementsFromImage(ec2Image *ec2.Image) scheduling.Requ
 	requirements.Add(scheduling.NewRequirement(v1.LabelArchStable, v1.NodeSelectorOpIn, architecture))
 	return requirements
 }
-
-func (p *Provider) Reset() {
-	p.ssmCache.Flush()
-	p.ec2Cache.Flush()
-	p.kubernetesVersionCache.Flush()
-}

pkg/providers/instancetype/suite_test.go

@@ -135,7 +135,7 @@ var _ = BeforeEach(func() {
 	})
 
 	cluster.Reset()
-	awsEnv.ResetCache()
+	awsEnv.Reset()
 
 	awsEnv.LaunchTemplateProvider.KubeDNSIP = net.ParseIP("10.0.100.10")
 	awsEnv.LaunchTemplateProvider.ClusterEndpoint = "https://test-cluster"

pkg/providers/launchtemplate/suite_test.go

@@ -129,7 +129,7 @@ var _ = BeforeEach(func() {
 		},
 	})
 	cluster.Reset()
-	awsEnv.ResetCache()
+	awsEnv.Reset()
 
 	awsEnv.LaunchTemplateProvider.KubeDNSIP = net.ParseIP("10.0.100.10")
 	awsEnv.LaunchTemplateProvider.ClusterEndpoint = "https://test-cluster"

pkg/providers/pricing/suite_test.go

@@ -72,7 +72,7 @@ var _ = BeforeEach(func() {
 	ctx = coresettings.ToContext(ctx, coretest.Settings())
 	ctx = settings.ToContext(ctx, test.Settings())
 
-	awsEnv.ResetCache()
+	awsEnv.Reset()
 })
 
 var _ = AfterEach(func() {

pkg/providers/securitygroup/suite_test.go

@@ -103,7 +103,7 @@ var _ = BeforeEach(func() {
 		},
 	})
 
-	awsEnv.ResetCache()
+	awsEnv.Reset()
 })
 
 var _ = AfterEach(func() {

pkg/providers/subnet/suite_test.go

@@ -103,7 +103,7 @@ var _ = BeforeEach(func() {
 		},
 	})
 
-	awsEnv.ResetCache()
+	awsEnv.Reset()
 })
 
 var _ = AfterEach(func() {

pkg/test/environment.go

@@ -65,7 +65,7 @@ type Environment struct {
 }
 
 func NewEnvironment(ctx context.Context, env *coretest.Environment) *Environment {
-	//
+	// API
 	ec2api := &fake.EC2API{}
 	ssmapi := &fake.SSMAPI{}
 
@@ -136,7 +136,7 @@ func NewEnvironment(ctx context.Context, env *coretest.Environment) *Environment
 	}
 }
 
-func (env *Environment) ResetCache() {
+func (env *Environment) Reset() {
 	env.EC2API.Reset()
 	env.SSMAPI.Reset()
 	env.PricingAPI.Reset()