Remove ImmediateMode and make Delayed the only option

Signed-off-by: Kevin Klues <[email protected]>

Author: klueska

api/nvidia.com/resource/v1beta1/computedomain.go

@@ -17,14 +17,10 @@
 package v1beta1
 
 import (
-	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 const (
-	ComputeDomainModeImmediate = "Immediate"
-	ComputeDomainModeDelayed   = "Delayed"
-
 	ComputeDomainStatusReady    = "Ready"
 	ComputeDomainStatusNotReady = "NotReady"
 )
@@ -55,55 +51,18 @@ type ComputeDomainList struct {
 }
 
 // +kubebuilder:validation:XValidation:rule="self == oldSelf", message="A computeDomain.spec is immutable"
-// +kubebuilder:validation:XValidation:rule="self.mode == 'Immediate' || (self.mode == 'Delayed' && size(self.resourceClaimTemplates) == 1)",message="When 'mode' is 'Delayed', 'resourceClaimTemplates' must have exactly one entry."
-// +kubebuilder:validation:XValidation:rule="self.mode == 'Immediate' || (self.mode == 'Delayed' && !has(self.nodeSelector))",message="When 'mode' is 'Delayed', 'NodeSelector' must not be set."
-// +kubebuilder:validation:XValidation:rule="self.mode == 'Immediate' || (self.mode == 'Delayed' && !has(self.topologyAlignment))",message="When 'mode' is 'Delayed', 'TopologyAlignment' must not be set."
-// +kubebuilder:validation:XValidation:rule="self.mode == 'Immediate' || (self.mode == 'Delayed' && (!has(self.nodeAffinity) || !has(self.nodeAffinity.preferred)))",message="When mode is 'Delayed', 'nodeAffinity.preferred' must not be set; only 'nodeAffinity.required' is allowed."
-// +kubebuilder:validation:XValidation:rule="self.mode == 'Immediate' || (self.mode == 'Delayed' && !has(self.topologyAntiAlignment))",message="When 'mode' is 'Delayed', 'TopologyAntiAlignment' must not be set."
 
 // ComputeDomainSpec provides the spec for a ComputeDomain.
 type ComputeDomainSpec struct {
-	// +kubebuilder:validation:Enum=Immediate;Delayed
-	// +kubebuilder:default=Immediate
-	Mode                   string                               `json:"mode"`
-	NumNodes               int                                  `json:"numNodes"`
-	ResourceClaimTemplates []ComputeDomainResourceClaimTemplate `json:"resourceClaimTemplates"`
-	NodeSelector           map[string]string                    `json:"nodeSelector,omitempty"`
-	NodeAffinity           *ComputeDomainNodeAffinity           `json:"nodeAffinity,omitempty"`
-	TopologyAlignment      *ComputeDomainTopologyAlignment      `json:"topologyAlignment,omitempty"`
-	TopologyAntiAlignment  *ComputeDomainTopologyAlignment      `json:"topologyAntiAlignment,omitempty"`
+	NumNodes              int                                `json:"numNodes"`
+	ResourceClaimTemplate ComputeDomainResourceClaimTemplate `json:"resourceClaimTemplate"`
 }
 
+// ComputeDomainResourceClaimTemplate provides the details of the ResourceClaimTemplate to generate.
 type ComputeDomainResourceClaimTemplate struct {
 	Name string `json:"name"`
 }
 
-// +kubebuilder:validation:XValidation:rule="has(self.preferred) || has(self.required)",message="At least one of 'preferred' or 'required' must be set."
-
-type ComputeDomainNodeAffinity struct {
-	// +listType=atomic
-	Preferred []corev1.PreferredSchedulingTerm `json:"preferred,omitempty"`
-	Required  *corev1.NodeSelector             `json:"required,omitempty"`
-}
-
-// +kubebuilder:validation:XValidation:rule="has(self.preferred) || has(self.required)",message="At least one of 'preferred' or 'required' must be set."
-
-type ComputeDomainTopologyAlignment struct {
-	// +listType=atomic
-	Preferred []ComputeDomainWeightedTopologyKey `json:"preferred,omitempty"`
-	Required  *ComputeDomainTopologyKeys         `json:"required,omitempty"`
-}
-
-type ComputeDomainTopologyKeys struct {
-	// +listType=atomic
-	TopologyKeys []string `json:"topologyKeys"`
-}
-
-type ComputeDomainWeightedTopologyKey struct {
-	Weight      int32  `json:"weight"`
-	TopologyKey string `json:"topologyKey"`
-}
-
 // ComputeDomainStatus provides the status for a ComputeDomain.
 type ComputeDomainStatus struct {
 	// +kubebuilder:validation:Enum=Ready;NotReady

api/nvidia.com/resource/v1beta1/computedomainconfig.go

@@ -27,7 +27,6 @@ import (
 // ComputeDomainChannelConfig holds the set of parameters for configuring an ComputeDomainChannel.
 type ComputeDomainChannelConfig struct {
 	metav1.TypeMeta `json:",inline"`
-	WaitForReady    bool   `json:"waitForReady"`
 	DomainID        string `json:"domainID"`
 }