github/k3k
1
0
Fork 0
mirror of https://github.com/rancher/k3k.git synced 2026-05-06 17:36:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove the node capacity from the merged lists (#816)

Browse Source 
* Remove the node capacity from the merged lists

* return if there is an error listing virtual/host nodes in update node capacity

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
This commit is contained in:
Hussein Galal
2026-04-28 15:12:55 +03:00
committed by GitHub
parent 6e7d8f2e57
commit 07776f37dc
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
k3k-kubelet/provider/configure_capacity.go
View File

@@ -74,20 +74,15 @@ func updateNodeCapacity(ctx context.Context, logger logr.Logger, hostClient clie
var quotas corev1.ResourceQuotaList
if err := hostClient.List(ctx, &quotas, &client.ListOptions{Namespace: virtualCluster.Namespace}); err != nil {
logger.Error(err, "error getting namespace for updating node capacity")
return
}
if len(quotas.Items) > 0 {
resourceLists := []corev1.ResourceList{allocatable}
for _, q := range quotas.Items {
resourceLists = append(resourceLists, q.Status.Hard)
}
mergedResourceLists := mergeResourceLists(resourceLists...)
var virtualNodeList, hostNodeList corev1.NodeList
if err := virtualClient.List(ctx, &virtualNodeList); err != nil {
logger.Error(err, "error listing virtual nodes for stable capacity distribution")
return
}
virtResourceMap := make(map[string]corev1.ResourceList)
@@ -97,6 +92,7 @@ func updateNodeCapacity(ctx context.Context, logger logr.Logger, hostClient clie
if err := hostClient.List(ctx, &hostNodeList); err != nil {
logger.Error(err, "error listing host nodes for stable capacity distribution")
return
}
hostResourceMap := make(map[string]corev1.ResourceList)
@@ -107,8 +103,18 @@ func updateNodeCapacity(ctx context.Context, logger logr.Logger, hostClient clie
}
}
m := distributeQuotas(hostResourceMap, virtResourceMap, mergedResourceLists)
allocatable = m[virtualNodeName]
var resourceLists []corev1.ResourceList
for _, q := range quotas.Items {
resourceLists = append(resourceLists, q.Status.Hard)
}
mergedQuota := mergeQuotas(resourceLists...)
// get the node's quota and merge it with the current values
m := distributeQuotas(hostResourceMap, virtResourceMap, mergedQuota)
for name, value := range m[virtualNodeName] {
allocatable[name] = value
}
}
var virtualNode corev1.Node
@@ -125,10 +131,10 @@ func updateNodeCapacity(ctx context.Context, logger logr.Logger, hostClient clie
}
}
// mergeResourceLists takes multiple resource lists and returns a single list that represents
// the most restrictive set of resources. For each resource name, it selects the minimum
// mergeQuotas takes multiple resource quotas lists and returns a single list that represents
// the most restrictive set of resource quotas. For each resource name, it selects the minimum
// quantity found across all the provided lists.
func mergeResourceLists(resourceLists ...corev1.ResourceList) corev1.ResourceList {
func mergeQuotas(resourceLists ...corev1.ResourceList) corev1.ResourceList {
merged := corev1.ResourceList{}
for _, resourceList := range resourceLists {