chore: Fill in the NodeClassReference for all NodePools and NodeClaims (

#6427)
aws · Jul 1, 2024 · cf6ba8c · cf6ba8c
1 parent ef45392
commit cf6ba8c
Show file tree

Hide file tree

Showing 15 changed files with 138 additions and 40 deletions.
diff --git a/pkg/apis/v1/nodepool_validation_cel_test.go b/pkg/apis/v1/nodepool_validation_cel_test.go
@@ -41,8 +41,9 @@ var _ = Describe("CEL/Validation", func() {
 				Template: v1beta1.NodeClaimTemplate{
 					Spec: v1beta1.NodeClaimSpec{
 						NodeClassRef: &v1beta1.NodeClassReference{
-							Kind: "NodeClaim",
-							Name: "default",
+							APIVersion: "karpenter.k8s.aws/v1beta1",
+							Kind:       "EC2NodeClass",
+							Name:       "default",
 						},
 						Requirements: []v1beta1.NodeSelectorRequirementWithMinValues{
 							{

diff --git a/pkg/apis/v1beta1/nodepool_validation_cel_test.go b/pkg/apis/v1beta1/nodepool_validation_cel_test.go
@@ -40,8 +40,9 @@ var _ = Describe("CEL/Validation", func() {
 				Template: v1beta1.NodeClaimTemplate{
 					Spec: v1beta1.NodeClaimSpec{
 						NodeClassRef: &v1beta1.NodeClassReference{
-							Kind: "NodeClaim",
-							Name: "default",
+							APIVersion: "karpenter.k8s.aws/v1beta1",
+							Kind:       "EC2NodeClass",
+							Name:       "default",
 						},
 						Requirements: []v1beta1.NodeSelectorRequirementWithMinValues{
 							{

diff --git a/pkg/cloudprovider/suite_test.go b/pkg/cloudprovider/suite_test.go
@@ -22,6 +22,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/awslabs/operatorpkg/object"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -158,7 +159,9 @@ var _ = Describe("CloudProvider", func() {
 				Template: corev1beta1.NodeClaimTemplate{
 					Spec: corev1beta1.NodeClaimSpec{
 						NodeClassRef: &corev1beta1.NodeClassReference{
-							Name: nodeClass.Name,
+							APIVersion: object.GVK(nodeClass).GroupVersion().String(),
+							Kind:       object.GVK(nodeClass).Kind,
+							Name:       nodeClass.Name,
 						},
 						Requirements: []corev1beta1.NodeSelectorRequirementWithMinValues{
 							{NodeSelectorRequirement: v1.NodeSelectorRequirement{Key: corev1beta1.CapacityTypeLabelKey, Operator: v1.NodeSelectorOpIn, Values: []string{corev1beta1.CapacityTypeOnDemand}}},
@@ -173,7 +176,9 @@ var _ = Describe("CloudProvider", func() {
 			},
 			Spec: corev1beta1.NodeClaimSpec{
 				NodeClassRef: &corev1beta1.NodeClassReference{
-					Name: nodeClass.Name,
+					APIVersion: object.GVK(nodeClass).GroupVersion().String(),
+					Kind:       object.GVK(nodeClass).Kind,
+					Name:       nodeClass.Name,
 				},
 				Requirements: []corev1beta1.NodeSelectorRequirementWithMinValues{
 					{
@@ -314,7 +319,9 @@ var _ = Describe("CloudProvider", func() {
 					Template: corev1beta1.NodeClaimTemplate{
 						Spec: corev1beta1.NodeClaimSpec{
 							NodeClassRef: &corev1beta1.NodeClassReference{
-								Name: nodeClass.Name,
+								APIVersion: object.GVK(nodeClass).GroupVersion().String(),
+								Kind:       object.GVK(nodeClass).Kind,
+								Name:       nodeClass.Name,
 							},
 							Requirements: []corev1beta1.NodeSelectorRequirementWithMinValues{
 								{
@@ -410,7 +417,9 @@ var _ = Describe("CloudProvider", func() {
 					Template: corev1beta1.NodeClaimTemplate{
 						Spec: corev1beta1.NodeClaimSpec{
 							NodeClassRef: &corev1beta1.NodeClassReference{
-								Name: nodeClass.Name,
+								APIVersion: object.GVK(nodeClass).GroupVersion().String(),
+								Kind:       object.GVK(nodeClass).Kind,
+								Name:       nodeClass.Name,
 							},
 							Requirements: []corev1beta1.NodeSelectorRequirementWithMinValues{
 								{
@@ -513,7 +522,9 @@ var _ = Describe("CloudProvider", func() {
 					Template: corev1beta1.NodeClaimTemplate{
 						Spec: corev1beta1.NodeClaimSpec{
 							NodeClassRef: &corev1beta1.NodeClassReference{
-								Name: nodeClass.Name,
+								APIVersion: object.GVK(nodeClass).GroupVersion().String(),
+								Kind:       object.GVK(nodeClass).Kind,
+								Name:       nodeClass.Name,
 							},
 							Requirements: []corev1beta1.NodeSelectorRequirementWithMinValues{
 								{
@@ -1188,7 +1199,9 @@ var _ = Describe("CloudProvider", func() {
 					Template: corev1beta1.NodeClaimTemplate{
 						Spec: corev1beta1.NodeClaimSpec{
 							NodeClassRef: &corev1beta1.NodeClassReference{
-								Name: nodeClass2.Name,
+								APIVersion: object.GVK(nodeClass2).GroupVersion().String(),
+								Kind:       object.GVK(nodeClass2).Kind,
+								Name:       nodeClass2.Name,
 							},
 						},
 					},
@@ -1230,7 +1243,9 @@ var _ = Describe("CloudProvider", func() {
 					Template: corev1beta1.NodeClaimTemplate{
 						Spec: corev1beta1.NodeClaimSpec{
 							NodeClassRef: &corev1beta1.NodeClassReference{
-								Name: misconfiguredNodeClass.Name,
+								APIVersion: object.GVK(misconfiguredNodeClass).GroupVersion().String(),
+								Kind:       object.GVK(misconfiguredNodeClass).Kind,
+								Name:       misconfiguredNodeClass.Name,
 							},
 						},
 					},

diff --git a/pkg/controllers/nodeclaim/garbagecollection/suite_test.go b/pkg/controllers/nodeclaim/garbagecollection/suite_test.go
@@ -23,6 +23,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/awslabs/operatorpkg/object"
 	"github.com/samber/lo"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/tools/record"
@@ -88,7 +89,9 @@ var _ = Describe("GarbageCollection", func() {
 				Template: corev1beta1.NodeClaimTemplate{
 					Spec: corev1beta1.NodeClaimSpec{
 						NodeClassRef: &corev1beta1.NodeClassReference{
-							Name: nodeClass.Name,
+							APIVersion: object.GVK(nodeClass).GroupVersion().String(),
+							Kind:       object.GVK(nodeClass).Kind,
+							Name:       nodeClass.Name,
 						},
 					},
 				},
@@ -243,7 +246,9 @@ var _ = Describe("GarbageCollection", func() {
 			nodeClaim := coretest.NodeClaim(corev1beta1.NodeClaim{
 				Spec: corev1beta1.NodeClaimSpec{
 					NodeClassRef: &corev1beta1.NodeClassReference{
-						Name: nodeClass.Name,
+						APIVersion: object.GVK(nodeClass).GroupVersion().String(),
+						Kind:       object.GVK(nodeClass).Kind,
+						Name:       nodeClass.Name,
 					},
 				},
 				Status: corev1beta1.NodeClaimStatus{
@@ -304,7 +309,9 @@ var _ = Describe("GarbageCollection", func() {
 		nodeClaim := coretest.NodeClaim(corev1beta1.NodeClaim{
 			Spec: corev1beta1.NodeClaimSpec{
 				NodeClassRef: &corev1beta1.NodeClassReference{
-					Name: nodeClass.Name,
+					APIVersion: object.GVK(nodeClass).GroupVersion().String(),
+					Kind:       object.GVK(nodeClass).Kind,
+					Name:       nodeClass.Name,
 				},
 			},
 			Status: corev1beta1.NodeClaimStatus{
@@ -360,7 +367,9 @@ var _ = Describe("GarbageCollection", func() {
 			nodeClaim := coretest.NodeClaim(corev1beta1.NodeClaim{
 				Spec: corev1beta1.NodeClaimSpec{
 					NodeClassRef: &corev1beta1.NodeClassReference{
-						Name: nodeClass.Name,
+						APIVersion: object.GVK(nodeClass).GroupVersion().String(),
+						Kind:       object.GVK(nodeClass).Kind,
+						Name:       nodeClass.Name,
 					},
 				},
 				Status: corev1beta1.NodeClaimStatus{

diff --git a/pkg/controllers/nodeclass/hash/suite_test.go b/pkg/controllers/nodeclass/hash/suite_test.go
@@ -19,6 +19,7 @@ import (
 	"testing"
 
 	"github.com/aws/aws-sdk-go/aws"
+	"github.com/awslabs/operatorpkg/object"
 	"github.com/imdario/mergo"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	corev1beta1 "sigs.k8s.io/karpenter/pkg/apis/v1beta1"
@@ -178,7 +179,9 @@ var _ = Describe("NodeClass Hash Controller", func() {
 			},
 			Spec: corev1beta1.NodeClaimSpec{
 				NodeClassRef: &corev1beta1.NodeClassReference{
-					Name: nodeClass.Name,
+					APIVersion: object.GVK(nodeClass).GroupVersion().String(),
+					Kind:       object.GVK(nodeClass).Kind,
+					Name:       nodeClass.Name,
 				},
 			},
 		})
@@ -191,7 +194,9 @@ var _ = Describe("NodeClass Hash Controller", func() {
 			},
 			Spec: corev1beta1.NodeClaimSpec{
 				NodeClassRef: &corev1beta1.NodeClassReference{
-					Name: nodeClass.Name,
+					APIVersion: object.GVK(nodeClass).GroupVersion().String(),
+					Kind:       object.GVK(nodeClass).Kind,
+					Name:       nodeClass.Name,
 				},
 			},
 		})
@@ -224,7 +229,9 @@ var _ = Describe("NodeClass Hash Controller", func() {
 			},
 			Spec: corev1beta1.NodeClaimSpec{
 				NodeClassRef: &corev1beta1.NodeClassReference{
-					Name: nodeClass.Name,
+					APIVersion: object.GVK(nodeClass).GroupVersion().String(),
+					Kind:       object.GVK(nodeClass).Kind,
+					Name:       nodeClass.Name,
 				},
 			},
 		})
@@ -257,7 +264,9 @@ var _ = Describe("NodeClass Hash Controller", func() {
 			},
 			Spec: corev1beta1.NodeClaimSpec{
 				NodeClassRef: &corev1beta1.NodeClassReference{
-					Name: nodeClass.Name,
+					APIVersion: object.GVK(nodeClass).GroupVersion().String(),
+					Kind:       object.GVK(nodeClass).Kind,
+					Name:       nodeClass.Name,
 				},
 			},
 		})

diff --git a/pkg/controllers/nodeclass/termination/suite_test.go b/pkg/controllers/nodeclass/termination/suite_test.go
@@ -23,6 +23,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/iam"
+	"github.com/awslabs/operatorpkg/object"
 	"github.com/samber/lo"
 	"k8s.io/client-go/tools/record"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
@@ -207,7 +208,9 @@ var _ = Describe("NodeClass Termination", func() {
 			nc := coretest.NodeClaim(corev1beta1.NodeClaim{
 				Spec: corev1beta1.NodeClaimSpec{
 					NodeClassRef: &corev1beta1.NodeClassReference{
-						Name: nodeClass.Name,
+						APIVersion: object.GVK(nodeClass).GroupVersion().String(),
+						Kind:       object.GVK(nodeClass).Kind,
+						Name:       nodeClass.Name,
 					},
 				},
 			})

diff --git a/pkg/providers/instance/suite_test.go b/pkg/providers/instance/suite_test.go
@@ -22,6 +22,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/awslabs/operatorpkg/object"
 	"github.com/samber/lo"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -87,7 +88,9 @@ var _ = Describe("InstanceProvider", func() {
 				Template: corev1beta1.NodeClaimTemplate{
 					Spec: corev1beta1.NodeClaimSpec{
 						NodeClassRef: &corev1beta1.NodeClassReference{
-							Name: nodeClass.Name,
+							APIVersion: object.GVK(nodeClass).GroupVersion().String(),
+							Kind:       object.GVK(nodeClass).Kind,
+							Name:       nodeClass.Name,
 						},
 					},
 				},
@@ -101,7 +104,9 @@ var _ = Describe("InstanceProvider", func() {
 			},
 			Spec: corev1beta1.NodeClaimSpec{
 				NodeClassRef: &corev1beta1.NodeClassReference{
-					Name: nodeClass.Name,
+					APIVersion: object.GVK(nodeClass).GroupVersion().String(),
+					Kind:       object.GVK(nodeClass).Kind,
+					Name:       nodeClass.Name,
 				},
 			},
 		})

diff --git a/pkg/providers/launchtemplate/suite_test.go b/pkg/providers/launchtemplate/suite_test.go
@@ -30,6 +30,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	admv1alpha1 "github.com/awslabs/amazon-eks-ami/nodeadm/api/v1alpha1"
+	"github.com/awslabs/operatorpkg/object"
 	opstatus "github.com/awslabs/operatorpkg/status"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -174,7 +175,9 @@ var _ = Describe("LaunchTemplate Provider", func() {
 						},
 						Kubelet: &corev1beta1.KubeletConfiguration{},
 						NodeClassRef: &corev1beta1.NodeClassReference{
-							Name: nodeClass.Name,
+							APIVersion: object.GVK(nodeClass).GroupVersion().String(),
+							Kind:       object.GVK(nodeClass).Kind,
+							Name:       nodeClass.Name,
 						},
 					},
 				},
@@ -210,7 +213,9 @@ var _ = Describe("LaunchTemplate Provider", func() {
 							},
 						},
 						NodeClassRef: &corev1beta1.NodeClassReference{
-							Name: nodeClass2.Name,
+							APIVersion: object.GVK(nodeClass2).GroupVersion().String(),
+							Kind:       object.GVK(nodeClass2).Kind,
+							Name:       nodeClass2.Name,
 						},
 					},
 				},
@@ -1396,7 +1401,11 @@ var _ = Describe("LaunchTemplate Provider", func() {
 				ExpectLaunchTemplatesCreatedWithUserData(fmt.Sprintf(string(content), corev1beta1.NodePoolLabelKey, nodePool.Name))
 			})
 			It("should not bootstrap when provider ref points to a non-existent EC2NodeClass resource", func() {
-				nodePool.Spec.Template.Spec.NodeClassRef = &corev1beta1.NodeClassReference{Name: "doesnotexist"}
+				nodePool.Spec.Template.Spec.NodeClassRef = &corev1beta1.NodeClassReference{
+					APIVersion: "doesnotexist",
+					Kind:       "doesnotexist",
+					Name:       "doesnotexist",
+				}
 				ExpectApplied(ctx, env.Client, nodePool)
 				pod := coretest.UnschedulablePod()
 				ExpectProvisioned(ctx, env.Client, cluster, cloudProvider, prov, pod)

diff --git a/test/pkg/environment/common/environment.go b/test/pkg/environment/common/environment.go
@@ -23,6 +23,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/awslabs/operatorpkg/object"
 	"github.com/onsi/gomega"
 	"github.com/samber/lo"
 	v1 "k8s.io/api/core/v1"
@@ -134,7 +135,9 @@ func NewClient(ctx context.Context, config *rest.Config) client.Client {
 func (env *Environment) DefaultNodePool(nodeClass *v1beta1.EC2NodeClass) *corev1beta1.NodePool {
 	nodePool := coretest.NodePool()
 	nodePool.Spec.Template.Spec.NodeClassRef = &corev1beta1.NodeClassReference{
-		Name: nodeClass.Name,
+		APIVersion: object.GVK(nodeClass).GroupVersion().String(),
+		Kind:       object.GVK(nodeClass).Kind,
+		Name:       nodeClass.Name,
 	}
 	nodePool.Spec.Template.Spec.Requirements = []corev1beta1.NodeSelectorRequirementWithMinValues{
 		{

diff --git a/test/suites/consolidation/suite_test.go b/test/suites/consolidation/suite_test.go
@@ -21,6 +21,7 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
+	"github.com/awslabs/operatorpkg/object"
 	"github.com/samber/lo"
 	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
@@ -433,7 +434,11 @@ var _ = Describe("Consolidation", func() {
 									},
 								},
 							},
-							NodeClassRef: &corev1beta1.NodeClassReference{Name: nodeClass.Name},
+							NodeClassRef: &corev1beta1.NodeClassReference{
+								APIVersion: object.GVK(nodeClass).GroupVersion().String(),
+								Kind:       object.GVK(nodeClass).Kind,
+								Name:       nodeClass.Name,
+							},
 						},
 					},
 				},
@@ -519,7 +524,11 @@ var _ = Describe("Consolidation", func() {
 									},
 								},
 							},
-							NodeClassRef: &corev1beta1.NodeClassReference{Name: nodeClass.Name},
+							NodeClassRef: &corev1beta1.NodeClassReference{
+								APIVersion: object.GVK(nodeClass).GroupVersion().String(),
+								Kind:       object.GVK(nodeClass).Kind,
+								Name:       nodeClass.Name,
+							},
 						},
 					},
 				},
@@ -662,7 +671,11 @@ var _ = Describe("Consolidation", func() {
 								},
 							},
 						},
-						NodeClassRef: &corev1beta1.NodeClassReference{Name: nodeClass.Name},
+						NodeClassRef: &corev1beta1.NodeClassReference{
+							APIVersion: object.GVK(nodeClass).GroupVersion().String(),
+							Kind:       object.GVK(nodeClass).Kind,
+							Name:       nodeClass.Name,
+						},
 					},
 				},
 			},

diff --git a/test/suites/drift/suite_test.go b/test/suites/drift/suite_test.go
@@ -20,6 +20,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/awslabs/operatorpkg/object"
 	"github.com/samber/lo"
 	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
@@ -541,7 +542,11 @@ var _ = Describe("Drift", func() {
 				Spec: corev1beta1.NodePoolSpec{
 					Template: corev1beta1.NodeClaimTemplate{
 						Spec: corev1beta1.NodeClaimSpec{
-							NodeClassRef: &corev1beta1.NodeClassReference{Name: nodeClass.Name},
+							NodeClassRef: &corev1beta1.NodeClassReference{
+								APIVersion: object.GVK(nodeClass).GroupVersion().String(),
+								Kind:       object.GVK(nodeClass).Kind,
+								Name:       nodeClass.Name,
+							},
 						},
 					},
 				},