kubernetes
/
autoscaler
mirror of https://github.com/kubernetes/autoscaler.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5326 from voelzmo/enh/fix-oomkill-crashloopbackoff 

Stop filtering aggregatedContainerStates without samples
This commit is contained in:
Kubernetes Prow Robot 2023-01-30 06:24:50 -08:00 committed by GitHub
parent 65c098b6f5 25106e94d0
commit 09f851d398
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vertical-pod-autoscaler/e2e/v1/autoscaling_utils.go
View File

@ -66,7 +66,7 @@ const (
var ( var (
resourceConsumerImage = imageutils.GetE2EImage(imageutils.ResourceConsumer) resourceConsumerImage = imageutils.GetE2EImage(imageutils.ResourceConsumer)
stressCommand = []string{"/stress", "--mem-total", "10000000000", "--logtostderr", "--mem-alloc-size", "8000"} stressCommand = []string{"/stress", "--mem-total", "10000000000", "--logtostderr", "--mem-alloc-size", "50000"}
) )
var ( var (
@ -443,8 +443,8 @@ func runOomingReplicationController(c clientset.Interface, ns, name string, repl
Timeout: timeoutRC, Timeout: timeoutRC,
Replicas: replicas, Replicas: replicas,
Annotations: make(map[string]string), Annotations: make(map[string]string),
MemRequest: 1024 * 1024 * 1024, MemRequest: 1024 * 1024 * 300,
MemLimit: 1024 * 1024 * 1024, MemLimit: 1024 * 1024 * 500,
} }
dpConfig := testutils.DeploymentConfig{ dpConfig := testutils.DeploymentConfig{

2
vertical-pod-autoscaler/e2e/v1/full_vpa.go
View File

@ -43,7 +43,7 @@ const (
// the initial values should be outside minimal bounds // the initial values should be outside minimal bounds
initialCPU = int64(10) // mCPU initialCPU = int64(10) // mCPU
initialMemory = int64(10) // MB initialMemory = int64(10) // MB
oomTestTimeout = 8 * time.Minute oomTestTimeout = 12 * time.Minute
) )
var _ = FullVpaE2eDescribe("Pods under VPA", func() { var _ = FullVpaE2eDescribe("Pods under VPA", func() {

2
vertical-pod-autoscaler/pkg/recommender/routines/vpa.go
View File

@ -31,7 +31,7 @@ func GetContainerNameToAggregateStateMap(vpa *model.Vpa) model.ContainerNameToAg
containerResourcePolicy := api_utils.GetContainerResourcePolicy(containerName, vpa.ResourcePolicy) containerResourcePolicy := api_utils.GetContainerResourcePolicy(containerName, vpa.ResourcePolicy)
autoscalingDisabled := containerResourcePolicy != nil && containerResourcePolicy.Mode != nil && autoscalingDisabled := containerResourcePolicy != nil && containerResourcePolicy.Mode != nil &&
*containerResourcePolicy.Mode == vpa_types.ContainerScalingModeOff *containerResourcePolicy.Mode == vpa_types.ContainerScalingModeOff
if !autoscalingDisabled && aggregatedContainerState.TotalSamplesCount > 0 { if !autoscalingDisabled {
aggregatedContainerState.UpdateFromPolicy(containerResourcePolicy) aggregatedContainerState.UpdateFromPolicy(containerResourcePolicy)
filteredContainerNameToAggregateStateMap[containerName] = aggregatedContainerState filteredContainerNameToAggregateStateMap[containerName] = aggregatedContainerState
} }