chore: Update nodeClassRef to be Group instead of APIVersion (#1360)

kubernetes-sigs · Jun 29, 2024 · 6136cb2 · 6136cb2
1 parent 51b7316
commit 6136cb2
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/kwok/charts/crds/karpenter.sh_nodeclaims.yaml b/kwok/charts/crds/karpenter.sh_nodeclaims.yaml
@@ -75,7 +75,7 @@ spec:
                 nodeClassRef:
                   description: NodeClassRef is a reference to an object that defines provider specific configuration
                   properties:
-                    apiVersion:
+                    group:
                       description: API version of the referent
                       type: string
                     kind:
@@ -85,6 +85,8 @@ spec:
                       description: 'Name of the referent; More info: http://kubernetes.io/docs/user-guide/identifiers#names'
                       type: string
                   required:
+                    - group
+                    - kind
                     - name
                   type: object
                 requirements:

diff --git a/kwok/charts/crds/karpenter.sh_nodepools.yaml b/kwok/charts/crds/karpenter.sh_nodepools.yaml
@@ -196,7 +196,7 @@ spec:
                         nodeClassRef:
                           description: NodeClassRef is a reference to an object that defines provider specific configuration
                           properties:
-                            apiVersion:
+                            group:
                               description: API version of the referent
                               type: string
                             kind:
@@ -206,6 +206,8 @@ spec:
                               description: 'Name of the referent; More info: http://kubernetes.io/docs/user-guide/identifiers#names'
                               type: string
                           required:
+                            - group
+                            - kind
                             - name
                           type: object
                         requirements:

diff --git a/pkg/apis/crds/karpenter.sh_nodeclaims.yaml b/pkg/apis/crds/karpenter.sh_nodeclaims.yaml
@@ -75,7 +75,7 @@ spec:
                 nodeClassRef:
                   description: NodeClassRef is a reference to an object that defines provider specific configuration
                   properties:
-                    apiVersion:
+                    group:
                       description: API version of the referent
                       type: string
                     kind:
@@ -85,6 +85,8 @@ spec:
                       description: 'Name of the referent; More info: http://kubernetes.io/docs/user-guide/identifiers#names'
                       type: string
                   required:
+                    - group
+                    - kind
                     - name
                   type: object
                 requirements:

diff --git a/pkg/apis/crds/karpenter.sh_nodepools.yaml b/pkg/apis/crds/karpenter.sh_nodepools.yaml
@@ -196,7 +196,7 @@ spec:
                         nodeClassRef:
                           description: NodeClassRef is a reference to an object that defines provider specific configuration
                           properties:
-                            apiVersion:
+                            group:
                               description: API version of the referent
                               type: string
                             kind:
@@ -206,6 +206,8 @@ spec:
                               description: 'Name of the referent; More info: http://kubernetes.io/docs/user-guide/identifiers#names'
                               type: string
                           required:
+                            - group
+                            - kind
                             - name
                           type: object
                         requirements:

diff --git a/pkg/apis/v1/nodeclaim.go b/pkg/apis/v1/nodeclaim.go
@@ -70,14 +70,14 @@ type ResourceRequirements struct {
 
 type NodeClassReference struct {
 	// Kind of the referent; More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
-	// +optional
-	Kind string `json:"kind,omitempty"`
+	// +required
+	Kind string `json:"kind"`
 	// Name of the referent; More info: http://kubernetes.io/docs/user-guide/identifiers#names
 	// +required
 	Name string `json:"name"`
 	// API version of the referent
-	// +optional
-	APIVersion string `json:"apiVersion,omitempty"`
+	// +required
+	Group string `json:"group"`
 }
 
 // +kubebuilder:object:generate=false