Merge pull request #7819 from iamzili/vpa-cpu-sample-fix

VPA: Remove obsolete comment and a few lines of code from addCPUSample

vertical-pod-autoscaler/pkg/recommender/model/aggregate_container_state.go

@@ -37,7 +37,6 @@ package model
 
 import (
 	"fmt"
-	"math"
 	"time"
 
 	corev1 "k8s.io/api/core/v1"
@@ -207,12 +206,8 @@ func (a *AggregateContainerState) SubtractSample(sample *ContainerUsageSample) {
 
 func (a *AggregateContainerState) addCPUSample(sample *ContainerUsageSample) {
 	cpuUsageCores := CoresFromCPUAmount(sample.Usage)
-	cpuRequestCores := CoresFromCPUAmount(sample.Request)
-	// Samples are added with the weight equal to the current request. This means that
-	// whenever the request is increased, the history accumulated so far effectively decays,
-	// which helps react quickly to CPU starvation.
 	a.AggregateCPUUsage.AddSample(
-		cpuUsageCores, math.Max(cpuRequestCores, minSampleWeight), sample.MeasureStart)
+		cpuUsageCores, minSampleWeight, sample.MeasureStart)
 	if sample.MeasureStart.After(a.LastSampleStart) {
 		a.LastSampleStart = sample.MeasureStart
 	}

vertical-pod-autoscaler/pkg/recommender/model/container_test.go

@@ -86,9 +86,9 @@ func TestAggregateContainerUsageSamples(t *testing.T) {
 	// Verify that CPU measures are added to the CPU histogram.
 	// The weight should be equal to the current request.
 	timeStep := memoryAggregationInterval / 2
-	test.mockCPUHistogram.On("AddSample", 3.14, 2.3, testTimestamp)
-	test.mockCPUHistogram.On("AddSample", 6.28, 2.3, testTimestamp.Add(timeStep))
-	test.mockCPUHistogram.On("AddSample", 1.57, 2.3, testTimestamp.Add(2*timeStep))
+	test.mockCPUHistogram.On("AddSample", 3.14, minSampleWeight, testTimestamp)
+	test.mockCPUHistogram.On("AddSample", 6.28, minSampleWeight, testTimestamp.Add(timeStep))
+	test.mockCPUHistogram.On("AddSample", 1.57, minSampleWeight, testTimestamp.Add(2*timeStep))
 	// Verify that memory peaks are added to the memory peaks histogram.
 	memoryAggregationWindowEnd := testTimestamp.Add(memoryAggregationInterval)
 	test.mockMemoryHistogram.On("AddSample", 5.0, 1.0, memoryAggregationWindowEnd)