update interface

Author: joshuakguo

pkg/apis/v1/ec2nodeclass.go

@@ -582,6 +582,10 @@ func (in *EC2NodeClass) NetworkInterfaces() []*NetworkInterface {
 	return in.Spec.NetworkInterfaces
 }
 
+func (in *EC2NodeClass) PlacementGroupSelector() *PlacementGroupSelector {
+	return in.Spec.PlacementGroupSelector
+}
+
 func (in *EC2NodeClass) KubeletConfiguration() *KubeletConfiguration {
 	return in.Spec.Kubelet
 }

pkg/providers/instancetype/instancetype.go

@@ -61,6 +61,7 @@ type NodeClass interface {
 	InstanceStorePolicy() *v1.InstanceStorePolicy
 	NetworkInterfaces() []*v1.NetworkInterface
 	KubeletConfiguration() *v1.KubeletConfiguration
+	PlacementGroupSelector() *v1.PlacementGroupSelector
 	ZoneInfo() []v1.ZoneInfo
 }
 
@@ -364,8 +365,8 @@ func (p *DefaultProvider) FilterForNodeClass(ctx context.Context, its []*cloudpr
 	defer p.muInstanceTypesInfo.RUnlock()
 	// Resolve the placement group for compatibility checking
 	var pg *placementgroup.PlacementGroup
-	if nc, ok := nodeClass.(*v1.EC2NodeClass); ok {
-		pg, _ = p.placementGroupProvider.Get(ctx, nc)
+	if nodeClass.PlacementGroupSelector() != nil {
+		pg, _ = p.placementGroupProvider.Get(ctx, nodeClass)
 	}
 	compatible := []*cloudprovider.InstanceType{}
 	for _, it := range its {

pkg/providers/instancetype/offering/offering.go

@@ -25,6 +25,7 @@ import (
 	"github.com/samber/lo"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 	karpv1 "sigs.k8s.io/karpenter/pkg/apis/v1"
 	"sigs.k8s.io/karpenter/pkg/cloudprovider"
 	"sigs.k8s.io/karpenter/pkg/operator/options"
@@ -43,10 +44,12 @@ type Provider interface {
 }
 
 type NodeClass interface {
+	client.Object
 	CapacityReservations() []v1.CapacityReservation
 	ZoneInfo() []v1.ZoneInfo
 	NetworkInterfaces() []*v1.NetworkInterface
 	AMIFamily() string
+	PlacementGroupSelector() *v1.PlacementGroupSelector
 }
 
 type DefaultProvider struct {
@@ -88,8 +91,8 @@ func (p *DefaultProvider) InjectOfferings(
 	})
 	// Resolve the placement group once and pass it through to avoid repeated type assertions and lookups
 	var pg *placementgroup.PlacementGroup
-	if nc, ok := nodeClass.(*v1.EC2NodeClass); ok {
-		pg, _ = p.placementGroupProvider.Get(ctx, nc)
+	if nodeClass.PlacementGroupSelector() != nil {
+		pg, _ = p.placementGroupProvider.Get(ctx, nodeClass)
 	}
 	var its []*cloudprovider.InstanceType
 	for _, it := range instanceTypes {

pkg/providers/placementgroup/provider.go

@@ -21,20 +21,26 @@ import (
 
 	"github.com/patrickmn/go-cache"
 	"k8s.io/apimachinery/pkg/types"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	v1 "github.com/aws/karpenter-provider-aws/pkg/apis/v1"
 	sdk "github.com/aws/karpenter-provider-aws/pkg/aws"
 	awserrors "github.com/aws/karpenter-provider-aws/pkg/errors"
 )
 
+type NodeClass interface {
+	client.Object // Provides Name, UID, Generation
+	PlacementGroupSelector() *v1.PlacementGroupSelector
+}
+
 type Provider interface {
 	// Get resolves the placement group for a nodeclass. It uses an in-memory cache keyed by
 	// NodeClass UID and generation to avoid unnecessary EC2 API calls. When the cache entry
 	// expires (TTL) or the NodeClass spec changes (bumping generation), the next call
 	// re-resolves from EC2. Returns nil when no placement group is configured.
 	// On transient EC2 errors, returns the last known good result and surfaces the error.
 	// On not-found errors, clears the resolved state and returns nil.
-	Get(context.Context, *v1.EC2NodeClass) (*PlacementGroup, error)
+	Get(context.Context, NodeClass) (*PlacementGroup, error)
 }
 
 type DefaultProvider struct {
@@ -58,14 +64,14 @@ func NewProvider(ec2api sdk.EC2API, placementGroupCache *cache.Cache) *DefaultPr
 
 // cacheKey returns a key that incorporates both the UID and generation,
 // so spec changes naturally cause a cache miss without separate generation tracking.
-func cacheKey(nodeClass *v1.EC2NodeClass) string {
-	return fmt.Sprintf("%s:%d", nodeClass.UID, nodeClass.Generation)
+func cacheKey(nodeClass NodeClass) string {
+	return fmt.Sprintf("%s:%d", nodeClass.GetUID(), nodeClass.GetGeneration())
 }
 
-func (p *DefaultProvider) Get(ctx context.Context, nodeClass *v1.EC2NodeClass) (*PlacementGroup, error) {
-	uid := nodeClass.UID
+func (p *DefaultProvider) Get(ctx context.Context, nodeClass NodeClass) (*PlacementGroup, error) {
+	uid := nodeClass.GetUID()
 
-	if nodeClass.Spec.PlacementGroupSelector == nil {
+	if nodeClass.PlacementGroupSelector() == nil {
 		p.Lock()
 		delete(p.resolved, uid)
 		p.cache.Delete(cacheKey(nodeClass))
@@ -81,7 +87,7 @@ func (p *DefaultProvider) Get(ctx context.Context, nodeClass *v1.EC2NodeClass) (
 	}
 	p.RUnlock()
 
-	term := *nodeClass.Spec.PlacementGroupSelector
+	term := *nodeClass.PlacementGroupSelector()
 	q := &Query{ID: term.ID, Name: term.Name}
 
 	out, err := p.ec2api.DescribePlacementGroups(ctx, q.DescribePlacementGroupsInput())

website/content/en/preview/concepts/nodeclasses.md

@@ -227,15 +227,6 @@ status:
       reservationType: default
       state: active
 
-  # Placement Group
-  placementGroup:
-    - id: pg-01234567890123456
-      name: my-pg
-      partitionCount: 7
-      spreadLevel: rack
-      state: available
-      strategy: cluster
-
   # Generated instance profile name from "role"
   instanceProfile: "${CLUSTER_NAME}-0123456778901234567789"
   conditions: