Return an error when receiving no provider or providerRef

kubernetes-sigs · Feb 2, 2023 · fd93c0e · fd93c0e
1 parent 9766dd1
commit fd93c0e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 15 deletions.
diff --git a/hack/toolchain.sh b/hack/toolchain.sh
@@ -16,7 +16,7 @@ tools() {
     go install github.com/mikefarah/yq/[email protected]
     go install github.com/norwoodj/helm-docs/cmd/[email protected]
     go install sigs.k8s.io/controller-runtime/tools/[email protected]
-    go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0
+    go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.11.2
     go install github.com/sigstore/cosign/cmd/[email protected]
     go install github.com/gohugoio/[email protected]+extended
     go install golang.org/x/vuln/cmd/[email protected]

diff --git a/pkg/apis/crds/karpenter.sh_machines.yaml b/pkg/apis/crds/karpenter.sh_machines.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.8.0
+    controller-gen.kubebuilder.io/version: v0.11.2
   creationTimestamp: null
   name: machines.karpenter.sh
 spec:
@@ -327,9 +327,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
diff --git a/pkg/apis/crds/karpenter.sh_provisioners.yaml b/pkg/apis/crds/karpenter.sh_provisioners.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.8.0
+    controller-gen.kubebuilder.io/version: v0.11.2
   creationTimestamp: null
   name: provisioners.karpenter.sh
 spec:
@@ -311,6 +311,8 @@ spec:
                 minimum: 1
                 type: integer
             type: object
+            x-kubernetes-validations:
+            - rule: has(self.provider) || has(self.providerRef)
           status:
             description: ProvisionerStatus defines the observed state of Provisioner
             properties:
@@ -370,9 +372,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
diff --git a/pkg/apis/v1alpha5/provisioner.go b/pkg/apis/v1alpha5/provisioner.go
@@ -29,6 +29,7 @@ import (
 // launch nodes in response to pods that are unschedulable. A single provisioner
 // is capable of managing a diverse set of nodes. Node properties are determined
 // from a combination of provisioner and pod scheduling constraints.
+// +kubebuilder:validation:XValidation:rule="has(self.provider) || has(self.providerRef)"
 type ProvisionerSpec struct {
 	// Annotations are applied to every node.
 	//+optional

diff --git a/pkg/apis/v1alpha5/provisioner_validation.go b/pkg/apis/v1alpha5/provisioner_validation.go
@@ -189,6 +189,9 @@ func (s *ProvisionerSpec) validateProvider() *apis.FieldError {
 	if s.Provider != nil && s.ProviderRef != nil {
 		return apis.ErrMultipleOneOf(providerPath, providerRefPath)
 	}
+	if s.Provider == nil && s.ProviderRef == nil {
+		return apis.ErrMissingOneOf(providerPath, providerRefPath)
+	}
 	return nil
 }