Skip to content

Commit

Permalink
Rename ResourceFlavor to Flavor
Browse files Browse the repository at this point in the history
  • Loading branch information
@ahg-g
ahg-g committed Mar 17, 2022
1 parent 399521d commit aaa6689
Show file tree
Hide file tree
Showing 13 changed files with 96 additions and 96 deletions.
4 changes: 2 additions & 2 deletions api/v1alpha1/clusterqueue_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,10 +222,10 @@ type Resource struct {
//
// +listType=map
// +listMapKey=name
Flavors []ResourceFlavor `json:"flavors,omitempty"`
Flavors []Flavor `json:"flavors,omitempty"`
}

type ResourceFlavor struct {
type Flavor struct {
// name is the type name, e.g., nvidia-tesla-k80.
// +kubebuilder:default=default
Name string `json:"name"`
Expand Down
4 changes: 2 additions & 2 deletions api/v1alpha1/queuedworkload_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ type PodSetFlavors struct {
// +kubebuilder:default=main
Name string `json:"name"`

// ResourceFlavors are the flavors assigned to the workload for each resource.
ResourceFlavors map[corev1.ResourceName]string `json:"resourceFlavors,omitempty"`
// Flavors are the flavors assigned to the workload for each resource.
Flavors map[corev1.ResourceName]string `json:"flavors,omitempty"`
}

type WorkloadReference struct {
Expand Down
66 changes: 33 additions & 33 deletions api/v1alpha1/zz_generated.deepcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions config/crd/bases/kueue.x-k8s.io_queuedworkloads.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,17 @@ spec:
of the .spec.podSets entries.
items:
properties:
flavors:
additionalProperties:
type: string
description: Flavors are the flavors assigned to the workload
for each resource.
type: object
name:
default: main
description: Name is the name of the podSet. It should match
one of the names in .spec.podSets.
type: string
resourceFlavors:
additionalProperties:
type: string
description: ResourceFlavors are the flavors assigned to
the workload for each resource.
type: object
required:
- name
type: object
Expand Down
22 changes: 11 additions & 11 deletions pkg/cache/cache_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func TestCacheClusterQueueOperations(t *testing.T) {
RequestableResources: []kueue.Resource{
{
Name: corev1.ResourceCPU,
Flavors: []kueue.ResourceFlavor{
Flavors: []kueue.Flavor{
{
Name: "default",
Quota: kueue.Quota{
Expand All @@ -79,7 +79,7 @@ func TestCacheClusterQueueOperations(t *testing.T) {
RequestableResources: []kueue.Resource{
{
Name: corev1.ResourceCPU,
Flavors: []kueue.ResourceFlavor{{Name: "default"}},
Flavors: []kueue.Flavor{{Name: "default"}},
}},
Cohort: "one",
},
Expand Down Expand Up @@ -145,7 +145,7 @@ func TestCacheClusterQueueOperations(t *testing.T) {
RequestableResources: []kueue.Resource{
{
Name: corev1.ResourceCPU,
Flavors: []kueue.ResourceFlavor{
Flavors: []kueue.Flavor{
{
Name: "default",
Quota: kueue.Quota{
Expand Down Expand Up @@ -275,7 +275,7 @@ func TestCacheWorkloadOperations(t *testing.T) {
RequestableResources: []kueue.Resource{
{
Name: "cpu",
Flavors: []kueue.ResourceFlavor{
Flavors: []kueue.Flavor{
{Name: "on-demand"},
{Name: "spot"},
},
Expand All @@ -289,7 +289,7 @@ func TestCacheWorkloadOperations(t *testing.T) {
RequestableResources: []kueue.Resource{
{
Name: "cpu",
Flavors: []kueue.ResourceFlavor{
Flavors: []kueue.Flavor{
{Name: "on-demand"},
{Name: "spot"},
},
Expand Down Expand Up @@ -319,13 +319,13 @@ func TestCacheWorkloadOperations(t *testing.T) {
podSetFlavors := []kueue.PodSetFlavors{
{
Name: "driver",
ResourceFlavors: map[corev1.ResourceName]string{
Flavors: map[corev1.ResourceName]string{
corev1.ResourceCPU: "on-demand",
},
},
{
Name: "workers",
ResourceFlavors: map[corev1.ResourceName]string{
Flavors: map[corev1.ResourceName]string{
corev1.ResourceCPU: "spot",
},
},
Expand Down Expand Up @@ -735,7 +735,7 @@ func TestClusterQueueUsage(t *testing.T) {
RequestableResources: []kueue.Resource{
{
Name: corev1.ResourceCPU,
Flavors: []kueue.ResourceFlavor{
Flavors: []kueue.Flavor{
{
Name: "default",
Quota: kueue.Quota{
Expand All @@ -747,7 +747,7 @@ func TestClusterQueueUsage(t *testing.T) {
},
{
Name: "example.com/gpu",
Flavors: []kueue.ResourceFlavor{
Flavors: []kueue.Flavor{
{
Name: "model_a",
Quota: kueue.Quota{
Expand Down Expand Up @@ -786,7 +786,7 @@ func TestClusterQueueUsage(t *testing.T) {
PodSetFlavors: []kueue.PodSetFlavors{
{
Name: "main",
ResourceFlavors: map[corev1.ResourceName]string{
Flavors: map[corev1.ResourceName]string{
corev1.ResourceCPU: "default",
"example.com/gpu": "model_a",
},
Expand All @@ -813,7 +813,7 @@ func TestClusterQueueUsage(t *testing.T) {
PodSetFlavors: []kueue.PodSetFlavors{
{
Name: "main",
ResourceFlavors: map[corev1.ResourceName]string{
Flavors: map[corev1.ResourceName]string{
corev1.ResourceCPU: "default",
"example.com/gpu": "model_b",
},
Expand Down
14 changes: 7 additions & 7 deletions pkg/cache/snapshot_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func TestSnapshot(t *testing.T) {
RequestableResources: []kueue.Resource{
{
Name: corev1.ResourceCPU,
Flavors: []kueue.ResourceFlavor{
Flavors: []kueue.Flavor{
{
Name: "demand",
Quota: kueue.Quota{
Expand Down Expand Up @@ -80,7 +80,7 @@ func TestSnapshot(t *testing.T) {
RequestableResources: []kueue.Resource{
{
Name: corev1.ResourceCPU,
Flavors: []kueue.ResourceFlavor{
Flavors: []kueue.Flavor{
{
Name: "spot",
Quota: kueue.Quota{
Expand All @@ -91,7 +91,7 @@ func TestSnapshot(t *testing.T) {
},
{
Name: "example.com/gpu",
Flavors: []kueue.ResourceFlavor{
Flavors: []kueue.Flavor{
{
Name: "default",
Quota: kueue.Quota{
Expand All @@ -111,7 +111,7 @@ func TestSnapshot(t *testing.T) {
RequestableResources: []kueue.Resource{
{
Name: corev1.ResourceCPU,
Flavors: []kueue.ResourceFlavor{
Flavors: []kueue.Flavor{
{
Name: "default",
Quota: kueue.Quota{
Expand Down Expand Up @@ -149,7 +149,7 @@ func TestSnapshot(t *testing.T) {
PodSetFlavors: []kueue.PodSetFlavors{
{
Name: "main",
ResourceFlavors: map[corev1.ResourceName]string{
Flavors: map[corev1.ResourceName]string{
corev1.ResourceCPU: "demand",
},
},
Expand All @@ -175,7 +175,7 @@ func TestSnapshot(t *testing.T) {
PodSetFlavors: []kueue.PodSetFlavors{
{
Name: "main",
ResourceFlavors: map[corev1.ResourceName]string{
Flavors: map[corev1.ResourceName]string{
corev1.ResourceCPU: "spot",
"example.com/gpu": "default",
},
Expand All @@ -202,7 +202,7 @@ func TestSnapshot(t *testing.T) {
PodSetFlavors: []kueue.PodSetFlavors{
{
Name: "main",
ResourceFlavors: map[corev1.ResourceName]string{
Flavors: map[corev1.ResourceName]string{
corev1.ResourceCPU: "spot",
"example.com/gpu": "default",
},
Expand Down
8 changes: 4 additions & 4 deletions pkg/controller/workload/job/job_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,22 +257,22 @@ func (r *JobReconciler) startJob(ctx context.Context, w *kueue.QueuedWorkload, j
}

func getNodeSelectors(cq *kueue.ClusterQueue, w *kueue.QueuedWorkload) map[string]string {
if len(w.Spec.Admission.PodSetFlavors[0].ResourceFlavors) == 0 {
if len(w.Spec.Admission.PodSetFlavors[0].Flavors) == 0 {
return nil
}

// Create a map of resources-to-flavors.
// May be cache this?
flavors := make(map[corev1.ResourceName]map[string]*kueue.ResourceFlavor, len(cq.Spec.RequestableResources))
flavors := make(map[corev1.ResourceName]map[string]*kueue.Flavor, len(cq.Spec.RequestableResources))
for _, r := range cq.Spec.RequestableResources {
flavors[r.Name] = make(map[string]*kueue.ResourceFlavor, len(r.Flavors))
flavors[r.Name] = make(map[string]*kueue.Flavor, len(r.Flavors))
for j := range r.Flavors {
flavors[r.Name][r.Flavors[j].Name] = &r.Flavors[j]
}
}

nodeSelector := map[string]string{}
for res, flvr := range w.Spec.Admission.PodSetFlavors[0].ResourceFlavors {
for res, flvr := range w.Spec.Admission.PodSetFlavors[0].Flavors {
if cqRes, existRes := flavors[res]; existRes {
if cqFlvr, existFlvr := cqRes[flvr]; existFlvr {
for k, v := range cqFlvr.Labels {
Expand Down
4 changes: 2 additions & 2 deletions pkg/scheduler/scheduler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,8 @@ func (s *Scheduler) admit(ctx context.Context, e *entry) error {
}
for i := range e.TotalRequests {
admission.PodSetFlavors[i] = kueue.PodSetFlavors{
Name: e.Obj.Spec.PodSets[i].Name,
ResourceFlavors: e.TotalRequests[i].Flavors,
Name: e.Obj.Spec.PodSets[i].Name,
Flavors: e.TotalRequests[i].Flavors,
}
}
newWorkload.Spec.Admission = admission
Expand Down
Loading

0 comments on commit aaa6689

Please sign in to comment.