feat: Get the GVK of the supported NodeClasses as part of the CloudPr…

…ovider interface (#1146)
kubernetes-sigs · Mar 29, 2024 · 3d51e28 · 3d51e28
1 parent c8eda9b
commit 3d51e28
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/kwok/cloudprovider/cloudprovider.go b/kwok/cloudprovider/cloudprovider.go
@@ -29,6 +29,7 @@ import (
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
@@ -118,6 +119,10 @@ func (c CloudProvider) Name() string {
 	return "kwok"
 }
 
+func (c CloudProvider) GetSupportedNodeClasses() []schema.GroupVersionKind {
+	return []schema.GroupVersionKind{}
+}
+
 func (c CloudProvider) getInstanceType(instanceTypeName string) (*cloudprovider.InstanceType, error) {
 	it, found := lo.Find(c.instanceTypes, func(it *cloudprovider.InstanceType) bool {
 		return it.Name == instanceTypeName

diff --git a/pkg/cloudprovider/fake/cloudprovider.go b/pkg/cloudprovider/fake/cloudprovider.go
@@ -27,6 +27,7 @@ import (
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/sets"
 
 	"sigs.k8s.io/karpenter/pkg/apis/v1beta1"
@@ -51,8 +52,9 @@ type CloudProvider struct {
 	NextCreateErr      error
 	DeleteCalls        []*v1beta1.NodeClaim
 
-	CreatedNodeClaims map[string]*v1beta1.NodeClaim
-	Drifted           cloudprovider.DriftReason
+	CreatedNodeClaims         map[string]*v1beta1.NodeClaim
+	Drifted                   cloudprovider.DriftReason
+	NodeClassGroupVersionKind []schema.GroupVersionKind
 }
 
 func NewCloudProvider() *CloudProvider {
@@ -77,6 +79,13 @@ func (c *CloudProvider) Reset() {
 	c.NextCreateErr = nil
 	c.DeleteCalls = []*v1beta1.NodeClaim{}
 	c.Drifted = "drifted"
+	c.NodeClassGroupVersionKind = []schema.GroupVersionKind{
+		{
+			Group:   "",
+			Version: "",
+			Kind:    "",
+		},
+	}
 }
 
 func (c *CloudProvider) Create(ctx context.Context, nodeClaim *v1beta1.NodeClaim) (*v1beta1.NodeClaim, error) {
@@ -237,3 +246,7 @@ func (c *CloudProvider) IsDrifted(context.Context, *v1beta1.NodeClaim) (cloudpro
 func (c *CloudProvider) Name() string {
 	return "fake"
 }
+
+func (c *CloudProvider) GetSupportedNodeClasses() []schema.GroupVersionKind {
+	return c.NodeClassGroupVersionKind
+}
diff --git a/pkg/cloudprovider/types.go b/pkg/cloudprovider/types.go
@@ -26,6 +26,7 @@ import (
 
 	"github.com/samber/lo"
 	v1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 
 	"sigs.k8s.io/karpenter/pkg/apis/v1beta1"
 	"sigs.k8s.io/karpenter/pkg/scheduling"
@@ -55,6 +56,8 @@ type CloudProvider interface {
 	IsDrifted(context.Context, *v1beta1.NodeClaim) (DriftReason, error)
 	// Name returns the CloudProvider implementation name.
 	Name() string
+	// GetSupportedNodeClass returns the group, version, and kind of the CloudProvider NodeClass
+	GetSupportedNodeClasses() []schema.GroupVersionKind
 }
 
 // InstanceType describes the properties of a potential node (either concrete attributes of an instance of this type