feat: add requirement keys of KWOK instance offerings to well-known labels #2053
Conversation
k8s-ci-robot
added
the
cncf-cla: yes
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: alec-rabold The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
needs-ok-to-test
|
Hi @alec-rabold. Thanks for your PR. I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
k8s-ci-robot
added
the
size/S
Pull Request Test Coverage Report for Build 13681049236Details
💛 - Coveralls |
| @@ -169,6 +176,12 @@ func newInstanceType(options InstanceTypeOptions) *cloudprovider.InstanceType { | |||
| return req.Values | |||
| }))) | |||
|
|
|||
| for _, offering := range options.Offerings { | |||
There was a problem hiding this comment.
It's not just offering requirements, right? It's also the instance type requirements in general? I think we need both
There was a problem hiding this comment.
Not sure I'm familiar enough to fully follow; just pushed a commit now to add requirements from both [KWOK]offering.Requirements and [KWOK]offering.Offering.Requirements:
karpenter/kwok/cloudprovider/helpers.go
Lines 172 to 179 in ee215df
Is this what you mean or something else?
| @@ -211,6 +211,11 @@ func addInstanceLabels(labels map[string]string, instanceType *cloudprovider.Ins | |||
| ret[r.Key] = r.Values()[0] | |||
| } | |||
| } | |||
| for _, r := range offering.Requirements { | |||
There was a problem hiding this comment.
I think this bit means we can drop some of the static things that we are setting around zone and capacity type below
There was a problem hiding this comment.
Makes sense, removed the explicit zone/capacity-type in ee215df
kwok/cloudprovider/helpers.go
Outdated
| @@ -139,6 +139,13 @@ func setDefaultOptions(opts InstanceTypeOptions) InstanceTypeOptions { | |||
| v1alpha1.InstanceCPULabelKey: cpu, | |||
| v1alpha1.InstanceMemoryLabelKey: memory, | |||
| } | |||
| for _, offering := range opts.Offerings { | |||
There was a problem hiding this comment.
I'm a little confused by this update -- what is this trying to achieve?
There was a problem hiding this comment.
I originally thought this was needed to get the labels added onto the resulting Node but looks like that's not correct - removed in ee215df!
Description
Adds the keys of all requirements for each instance-type offering to the list of Well Known Labels.
This makes it easier to run simulations with non-KWOK NodePools (e.g. using KWOK to simulate how Karpenter would autoscale under certain circumstances in an AWS environment).
Issue: #2045
How was this change tested?
Tested by running locally against a KWOK all-in-one environment (pod).
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.