Merge pull request kubernetes#3118 from tweks/cr-fix

k8s-ci-robot · web-flow · commit 8b72a5255ab8 · 2020-05-07T05:03:09.000-07:00
Update aggregatedContainerState from containerResourcePolicy
diff --git a/vertical-pod-autoscaler/pkg/recommender/routines/vpa.go b/vertical-pod-autoscaler/pkg/recommender/routines/vpa.go
@@ -32,6 +32,7 @@ func GetContainerNameToAggregateStateMap(vpa *model.Vpa) model.ContainerNameToAg
 		autoscalingDisabled := containerResourcePolicy != nil && containerResourcePolicy.Mode != nil &&
 			*containerResourcePolicy.Mode == vpa_types.ContainerScalingModeOff
 		if !autoscalingDisabled && aggregatedContainerState.TotalSamplesCount > 0 {
+			aggregatedContainerState.UpdateFromPolicy(containerResourcePolicy)
 			filteredContainerNameToAggregateStateMap[containerName] = aggregatedContainerState
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ func GetContainerNameToAggregateStateMap(vpa *model.Vpa) model.ContainerNameToAg`
`32`	`32`	`autoscalingDisabled := containerResourcePolicy != nil && containerResourcePolicy.Mode != nil &&`
`33`	`33`	`*containerResourcePolicy.Mode == vpa_types.ContainerScalingModeOff`
`34`	`34`	`if !autoscalingDisabled && aggregatedContainerState.TotalSamplesCount > 0 {`
	`35`	`+ aggregatedContainerState.UpdateFromPolicy(containerResourcePolicy)`
`35`	`36`	`filteredContainerNameToAggregateStateMap[containerName] = aggregatedContainerState`
`36`	`37`	`}`
`37`	`38`	`}`