Fix other integration testing

aws · Oct 23, 2023 · 1fdff8a · 1fdff8a
1 parent e6f4610
commit 1fdff8a
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 6 deletions.
diff --git a/test/pkg/environment/aws/environment.go b/test/pkg/environment/aws/environment.go
@@ -42,7 +42,7 @@ import (
 
 const WindowsDefaultImage = "mcr.microsoft.com/oss/kubernetes/pause:3.9"
 
-// ExcludedInstanceFamilies denotes instance families that have issues during resource registration due to compatability
+// ExcludedInstanceFamilies denotes instance families that have issues during resource registration due to compatibility
 // issues with versions of the VPR Resource Controller
 var ExcludedInstanceFamilies = []string{"m7a", "r7a", "c7a", "r7i"}
 

diff --git a/test/suites/beta/integration/emptiness_test.go b/test/suites/beta/integration/emptiness_test.go
@@ -52,7 +52,6 @@ var _ = Describe("Emptiness", func() {
 		By("waiting for the nodeclaim emptiness status condition to propagate")
 		Eventually(func(g Gomega) {
 			g.Expect(env.Client.Get(env, client.ObjectKeyFromObject(nodeClaim), nodeClaim)).To(Succeed())
-			g.Expect(nodeClaim.StatusConditions().GetCondition(corev1beta1.Empty)).ToNot(BeNil())
 			g.Expect(nodeClaim.StatusConditions().GetCondition(corev1beta1.Empty).IsTrue()).To(BeTrue())
 		}).Should(Succeed())
 

diff --git a/test/suites/beta/integration/instance_profile_test.go b/test/suites/beta/integration/instance_profile_test.go
@@ -23,7 +23,6 @@ import (
 
 	coretest "github.com/aws/karpenter-core/pkg/test"
 	awserrors "github.com/aws/karpenter/pkg/errors"
-	"github.com/aws/karpenter/pkg/providers/instanceprofile"
 )
 
 var _ = Describe("InstanceProfile Generation", func() {
@@ -37,7 +36,7 @@ var _ = Describe("InstanceProfile Generation", func() {
 		Expect(instance.IamInstanceProfile).ToNot(BeNil())
 		Expect(lo.FromPtr(instance.IamInstanceProfile.Arn)).To(ContainSubstring(nodeClass.Status.InstanceProfile))
 
-		instanceProfile := env.ExpectInstanceProfileExists(instanceprofile.GetProfileName(env.Context, env.Region, nodeClass))
+		instanceProfile := env.ExpectInstanceProfileExists(env.GetInstanceProfileName(nodeClass))
 		Expect(instanceProfile.Roles).To(HaveLen(1))
 		Expect(lo.FromPtr(instanceProfile.Roles[0].RoleName)).To(Equal(nodeClass.Spec.Role))
 	})

diff --git a/test/suites/beta/integration/kubelet_config_test.go b/test/suites/beta/integration/kubelet_config_test.go
@@ -259,7 +259,7 @@ var _ = Describe("KubeletConfiguration Overrides", func() {
 				Values:   []string{string(v1.Linux)},
 			},
 		}...)
-		nodePool.Spec.Template.Spec.Kubelet.PodsPerCore = ptr.Int32(1)
+		nodePool.Spec.Template.Spec.Kubelet = &corev1beta1.KubeletConfiguration{PodsPerCore: ptr.Int32(1)}
 		numPods := 6
 		dep := test.Deployment(test.DeploymentOptions{
 			Replicas: int32(numPods),

diff --git a/test/suites/beta/integration/scheduling_test.go b/test/suites/beta/integration/scheduling_test.go
@@ -69,7 +69,6 @@ var _ = Describe("Scheduling", Ordered, ContinueOnFailure, func() {
 			v1beta1.LabelInstanceCPU:              "2",
 			v1beta1.LabelInstanceMemory:           "4096",
 			v1beta1.LabelInstanceNetworkBandwidth: "750",
-			v1beta1.LabelInstancePods:             "29",
 		}
 		selectors.Insert(lo.Keys(nodeSelector)...) // Add node selector keys to selectors used in testing to ensure we test all labels
 		requirements := lo.MapToSlice(nodeSelector, func(key string, value string) v1.NodeSelectorRequirement {