chore: Reject NodePools and NodeClaims if they don't have spec (#1041)

kubernetes-sigs · Feb 22, 2024 · 6c4883c · 6c4883c
1 parent 3bc904a
commit 6c4883c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/pkg/apis/crds/karpenter.sh_nodeclaims.yaml b/pkg/apis/crds/karpenter.sh_nodeclaims.yaml
@@ -430,6 +430,8 @@ spec:
                   description: ProviderID of the corresponding node object
                   type: string
               type: object
+          required:
+            - spec
           type: object
       served: true
       storage: true

diff --git a/pkg/apis/crds/karpenter.sh_nodepools.yaml b/pkg/apis/crds/karpenter.sh_nodepools.yaml
@@ -520,6 +520,8 @@ spec:
                   description: Resources is the list of resources that have been provisioned.
                   type: object
               type: object
+          required:
+            - spec
           type: object
       served: true
       storage: true

diff --git a/pkg/apis/v1beta1/nodeclaim.go b/pkg/apis/v1beta1/nodeclaim.go
@@ -176,7 +176,8 @@ type NodeClaim struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   NodeClaimSpec   `json:"spec,omitempty"`
+	// +required
+	Spec   NodeClaimSpec   `json:"spec"`
 	Status NodeClaimStatus `json:"status,omitempty"`
 }
 

diff --git a/pkg/apis/v1beta1/nodepool.go b/pkg/apis/v1beta1/nodepool.go
@@ -185,7 +185,8 @@ type NodePool struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   NodePoolSpec   `json:"spec,omitempty"`
+	// +required
+	Spec   NodePoolSpec   `json:"spec"`
 	Status NodePoolStatus `json:"status,omitempty"`
 }