Skip to content

feat: add requirement keys of KWOK instance offerings to well-known labels #2053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 17, 2025
Merged

feat: add requirement keys of KWOK instance offerings to well-known labels #2053

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ecc0b73
add requirement keys of kwok offerings to well-known labels
alec-rabold Mar 5, 2025
ee215df
remove instanceTypeLabels add; remove explicit capacity/zone; add all…
alec-rabold Mar 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions kwok/cloudprovider/cloudprovider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,11 @@ func addInstanceLabels(labels map[string]string, instanceType *cloudprovider.Ins
ret[r.Key] = r.Values()[0]
}
}
for _, r := range offering.Requirements {
if r.Len() == 1 && r.Operator() == corev1.NodeSelectorOpIn {
ret[r.Key] = r.Values()[0]
}
}
// add in github.com/awslabs/eks-node-viewer label so that it shows up.
ret[v1alpha1.NodeViewerLabelKey] = fmt.Sprintf("%f", offering.Price)
// Kwok has some scalability limitations.
Expand Down
13 changes: 13 additions & 0 deletions kwok/cloudprovider/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,13 @@ func setDefaultOptions(opts InstanceTypeOptions) InstanceTypeOptions {
v1alpha1.InstanceCPULabelKey: cpu,
v1alpha1.InstanceMemoryLabelKey: memory,
}
for _, offering := range opts.Offerings {
for _, req := range offering.Requirements {
if _, exists := opts.instanceTypeLabels[req.Key]; !exists {
opts.instanceTypeLabels[req.Key] = req.Values[0]
}
}
}

// if the user specified a different pod limit, override the default
opts.Resources = lo.Assign(corev1.ResourceList{
Expand Down Expand Up @@ -169,6 +176,12 @@ func newInstanceType(options InstanceTypeOptions) *cloudprovider.InstanceType {
return req.Values
})))

for _, offering := range options.Offerings {
for _, requirement := range offering.Requirements {
v1.WellKnownLabels = v1.WellKnownLabels.Insert(requirement.Key)
}
}

requirements := scheduling.NewRequirements(
scheduling.NewRequirement(corev1.LabelInstanceTypeStable, corev1.NodeSelectorOpIn, options.Name),
scheduling.NewRequirement(corev1.LabelArchStable, corev1.NodeSelectorOpIn, options.Architecture),
Expand Down