-
Notifications
You must be signed in to change notification settings - Fork 4.2k
feat(recommender): add enforce cpu memory ratio #8420
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.
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
Open
Jrmy2402
wants to merge
3
commits into
kubernetes:master
Choose a base branch
from
Jrmy2402:enforce-cpu-memory-ratio
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+338
−3
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
103 changes: 103 additions & 0 deletions
103
vertical-pod-autoscaler/pkg/recommender/routines/memory_per_cpu_post_processor.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| /* | ||
| Copyright 2022 The Kubernetes Authors. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package routines | ||
|
|
||
| import ( | ||
| apiv1 "k8s.io/api/core/v1" | ||
| "k8s.io/apimachinery/pkg/api/resource" | ||
|
|
||
| vpa_types "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1" | ||
| vpa_utils "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/utils/vpa" | ||
| ) | ||
|
|
||
| // MemoryPerCPUPostProcessor enforces a fixed memory-per-CPU ratio for each container's recommendation. | ||
| // The ratio is defined in the container's policy as MemoryPerCPU (bytes per 1 CPU core). | ||
| // Applied to Target, LowerBound, UpperBound, and UncappedTarget. | ||
| type MemoryPerCPUPostProcessor struct{} | ||
|
|
||
| var _ RecommendationPostProcessor = &MemoryPerCPUPostProcessor{} | ||
|
|
||
| // Process applies the memory-per-CPU enforcement to the recommendation if specified in the container policy. | ||
| func (p *MemoryPerCPUPostProcessor) Process( | ||
| vpa *vpa_types.VerticalPodAutoscaler, | ||
| recommendation *vpa_types.RecommendedPodResources, | ||
| ) *vpa_types.RecommendedPodResources { | ||
| if vpa == nil || vpa.Spec.ResourcePolicy == nil || recommendation == nil { | ||
| return recommendation | ||
| } | ||
|
|
||
| amendedRecommendation := recommendation.DeepCopy() | ||
|
|
||
| for _, r := range amendedRecommendation.ContainerRecommendations { | ||
| pol := vpa_utils.GetContainerResourcePolicy(r.ContainerName, vpa.Spec.ResourcePolicy) | ||
| if pol != nil && pol.MemoryPerCPU != nil { | ||
| memPerCPUBytes := pol.MemoryPerCPU.Value() | ||
| r.Target = enforceMemoryPerCPU(r.Target, memPerCPUBytes) | ||
| r.LowerBound = enforceMemoryPerCPU(r.LowerBound, memPerCPUBytes) | ||
| r.UpperBound = enforceMemoryPerCPU(r.UpperBound, memPerCPUBytes) | ||
| r.UncappedTarget = enforceMemoryPerCPU(r.UncappedTarget, memPerCPUBytes) | ||
| } | ||
| } | ||
|
|
||
| return amendedRecommendation | ||
| } | ||
|
|
||
| // enforceMemoryPerCPU adjusts CPU or Memory to satisfy: | ||
| // | ||
| // memory_bytes = cpu_cores * memPerCPUBytes | ||
| // | ||
| // If memory is too low for the given CPU, increase memory. | ||
| // If memory is too high for the given CPU, increase CPU. | ||
| // enforceMemoryPerCPU adjusts CPU or Memory to satisfy: | ||
| // | ||
| // memory_bytes = cpu_cores * memPerCPUBytes | ||
| // | ||
| // If memory is too low for the given CPU, increase memory. | ||
| // If memory is too high for the given CPU, increase CPU. | ||
| func enforceMemoryPerCPU(resources apiv1.ResourceList, bytesPerCore int64) apiv1.ResourceList { | ||
| if bytesPerCore <= 0 { | ||
| return resources | ||
| } | ||
|
|
||
| cpuQty, hasCPU := resources[apiv1.ResourceCPU] | ||
| memQty, hasMem := resources[apiv1.ResourceMemory] | ||
| if !hasCPU || !hasMem || cpuQty.IsZero() || memQty.IsZero() { | ||
| return resources | ||
| } | ||
|
|
||
| // cpuCores = milliCPU / 1000 | ||
| cpuMilli := cpuQty.MilliValue() | ||
| memBytes := memQty.Value() | ||
|
|
||
| // Desired memory in bytes = CPU cores * bytes per core | ||
| desiredMem := divCeil(cpuMilli*bytesPerCore, 1000) | ||
|
|
||
| if memBytes < desiredMem { | ||
| // Not enough RAM → increase memory | ||
| resources[apiv1.ResourceMemory] = *resource.NewQuantity(desiredMem, resource.BinarySI) | ||
| } else if memBytes > desiredMem { | ||
| // Too much RAM → increase CPU | ||
| desiredMilli := divCeil(memBytes*1000, bytesPerCore) | ||
| resources[apiv1.ResourceCPU] = *resource.NewMilliQuantity(desiredMilli, resource.DecimalSI) | ||
| } | ||
|
|
||
| return resources | ||
| } | ||
|
|
||
| func divCeil(a, b int64) int64 { | ||
| return (a + b - 1) / b | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This needs simple checks in the admission-controller to be sure the values are correct (if CEL cannot do it). You can see an example here:
https://github.com/kubernetes/autoscaler/pull/8012/files#diff-ad66c76a76541b7991631925641b989fc402901440d8e0dcbc3591009eef52b9R146-R159