From ee215df7c732a9ed6e404d33596291fdb252ea66 Mon Sep 17 00:00:00 2001 From: Alec Rabold Date: Wed, 5 Mar 2025 08:44:56 -0800 Subject: [PATCH] remove instanceTypeLabels add; remove explicit capacity/zone; add all requirements --- kwok/cloudprovider/cloudprovider.go | 2 -- kwok/cloudprovider/helpers.go | 10 +++------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/kwok/cloudprovider/cloudprovider.go b/kwok/cloudprovider/cloudprovider.go index ce49bc11d..1d9c4a8c1 100644 --- a/kwok/cloudprovider/cloudprovider.go +++ b/kwok/cloudprovider/cloudprovider.go @@ -222,8 +222,6 @@ func addInstanceLabels(labels map[string]string, instanceType *cloudprovider.Ins // Randomly add each new node to one of the pre-created kwokPartitions. ret[v1alpha1.KwokPartitionLabelKey] = lo.Sample(kwokPartitions) - ret[v1.CapacityTypeLabelKey] = offering.Requirements.Get(v1.CapacityTypeLabelKey).Any() - ret[corev1.LabelTopologyZone] = offering.Requirements.Get(corev1.LabelTopologyZone).Any() ret[corev1.LabelHostname] = nodeClaim.Name ret[v1alpha1.KwokLabelKey] = v1alpha1.KwokLabelValue diff --git a/kwok/cloudprovider/helpers.go b/kwok/cloudprovider/helpers.go index 37b3d8dc6..a7b6b7784 100644 --- a/kwok/cloudprovider/helpers.go +++ b/kwok/cloudprovider/helpers.go @@ -139,13 +139,6 @@ 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{ @@ -180,6 +173,9 @@ func newInstanceType(options InstanceTypeOptions) *cloudprovider.InstanceType { for _, requirement := range offering.Requirements { v1.WellKnownLabels = v1.WellKnownLabels.Insert(requirement.Key) } + for _, requirement := range offering.Offering.Requirements { + v1.WellKnownLabels = v1.WellKnownLabels.Insert(requirement.Key) + } } requirements := scheduling.NewRequirements(