Skip to content
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

fix(resourcequotas): Update namespace-specific hard quota calculation logic #1088

Merged
merged 1 commit into from
May 23, 2024
Merged

fix(resourcequotas): Update namespace-specific hard quota calculation logic #1088

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion controllers/tenant/resourcequotas.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,15 @@ func (r *Manager) syncResourceQuotas(ctx context.Context, tenant *capsulev1beta2
list.Items[item].Spec.Hard = map[corev1.ResourceName]resource.Quantity{}
}

list.Items[item].Spec.Hard[name] = resourceQuota.Hard[name]
// Effectively this subtracts the usage from all other namespaces in the tenant from the desired tenant hard quota.
// Thus we can determine, how much is left in this resourcequota (item) for the current resource (name).
// We use this remaining quota at the tenant level, to update the hard quota for the current namespace.

newHard := hardQuota // start off with desired tenant wide hard quota
newHard.Sub(quantity) // subtract tenant wide usage
newHard.Add(list.Items[item].Status.Used[name]) // add back usage in current ns

list.Items[item].Spec.Hard[name] = newHard

for k := range list.Items[item].Spec.Hard {
if !toKeep.Has(k) {
Expand Down
Loading