Skip to content

Commit 3675222

Browse files
fix unit tests
1 parent c6e6216 commit 3675222

File tree

2 files changed

+1874
-1767
lines changed

2 files changed

+1874
-1767
lines changed

api/v1/aiplatform_types.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ type AIPlatformSpec struct {
6868

6969
// Weaviate WeaviateSpec `json:"weaviate,omitempty"`
7070
Storage StorageSpec `json:"storage,omitempty"`
71-
GPUSchedulingSpec *SchedulingSpec `json:"gpuScheduling,inline"` // inlines NodeSelector, Tolerations, Affinity
72-
CPUSchedulingSpec *SchedulingSpec `json:"cpuScheduling,inline"` // inlines NodeSelector, Tolerations, Affinity
71+
GPUSchedulingSpec *SchedulingSpec `json:"gpuScheduling,omitempty"` // NodeSelector, Tolerations, Affinity
72+
CPUSchedulingSpec *SchedulingSpec `json:"cpuScheduling,omitempty"` // NodeSelector, Tolerations, Affinity
7373
Ingress corev1.LoadBalancerIngress `json:",inline"`
7474
}
7575
type Images struct {
@@ -115,21 +115,21 @@ type WeaviateSpec struct {
115115
// Image string `json:"image"`
116116
Resources corev1.ResourceRequirements `json:"resources,omitempty"`
117117
ServiceAccountName string `json:"serviceAccountName,omitempty"`
118-
SchedulingSpec `json:",inline"` // inlines NodeSelector, Tolerations, Affinity
118+
SchedulingSpec `json:",omitempty"` // NodeSelector, Tolerations, Affinity
119119
}
120120

121121
type HeadGroupSpec struct {
122-
ServiceAccountName string `json:"serviceAccountName,omitempty"`
123-
SchedulingSpec `json:",inline"` // inlines NodeSelector, Tolerations, Affinity
122+
ServiceAccountName string `json:"serviceAccountName,omitempty"`
123+
SchedulingSpec `json:",omitempty"` // NodeSelector, Tolerations, Affinity
124124
// image registries for Ray
125125
ImageRegistry string `json:"imageRegistry,omitempty"`
126126
}
127127

128128
type WorkerGroupSpec struct {
129-
ServiceAccountName string `json:"serviceAccountName,omitempty"`
130-
ImageRegistry string `json:"imageRegistry,omitempty"`
131-
GPUConfigs []GPUConfig `json:"gpuConfigs,omitempty"`
132-
SchedulingSpec `json:",inline"` // inlines NodeSelector, Tolerations, Affinity
129+
ServiceAccountName string `json:"serviceAccountName,omitempty"`
130+
ImageRegistry string `json:"imageRegistry,omitempty"`
131+
GPUConfigs []GPUConfig `json:"gpuConfigs,omitempty"`
132+
SchedulingSpec `json:",omitempty"` // NodeSelector, Tolerations, Affinity
133133
}
134134

135135
// GPUConfig defines one worker-tier with scheduling and accelerator settings.

0 commit comments

Comments
 (0)