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

Replace `BuildTestContainer` with use of builder

This commit is contained in:
Kevin Wiesmueller 2023-06-27 19:59:21 +00:00
parent 463d7d6f17
commit db507cdde1
6 changed files with 59 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vertical-pod-autoscaler/pkg/updater/logic/updater_test.go
View File

@ -27,6 +27,7 @@ import (
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/assert"
apiv1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
vpa_types "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1"
@ -144,7 +145,7 @@ func testRunOnceBase(
for i := range pods {
pods[i] = test.Pod().WithName("test_"+strconv.Itoa(i)).
AddContainer(test.BuildTestContainer(containerName, "1", "100M")).
AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("1")).WithMemRequest(resource.MustParse("100M")).Get()).
WithCreator(&rc.ObjectMeta, &rc.TypeMeta).
Get()

49
vertical-pod-autoscaler/pkg/updater/priority/priority_processor_test.go
View File

@ -20,6 +20,7 @@ import (
"testing"
corev1 "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"
"k8s.io/autoscaler/vertical-pod-autoscaler/pkg/utils/annotations"
"k8s.io/autoscaler/vertical-pod-autoscaler/pkg/utils/test"
@ -37,7 +38,7 @@ func TestGetUpdatePriority(t *testing.T) {
}{
{
name: "simple scale up",
pod: test.Pod().WithName("POD1").AddContainer(test.BuildTestContainer(containerName, "2", "")).Get(),
pod: test.Pod().WithName("POD1").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("2")).Get()).Get(),
vpa: test.VerticalPodAutoscaler().WithContainer(containerName).WithTarget("10", "").Get(),
expectedPrio: PodPriority{
OutsideRecommendedRange: false,
@ -46,7 +47,7 @@ func TestGetUpdatePriority(t *testing.T) {
},
}, {
name: "simple scale down",
pod: test.Pod().WithName("POD1").AddContainer(test.BuildTestContainer(containerName, "4", "")).Get(),
pod: test.Pod().WithName("POD1").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("4")).Get()).Get(),
vpa: test.VerticalPodAutoscaler().WithContainer(containerName).WithTarget("2", "").Get(),
expectedPrio: PodPriority{
OutsideRecommendedRange: false,
@ -55,7 +56,7 @@ func TestGetUpdatePriority(t *testing.T) {
},
}, {
name: "no resource diff",
pod: test.Pod().WithName("POD1").AddContainer(test.BuildTestContainer(containerName, "2", "")).Get(),
pod: test.Pod().WithName("POD1").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("2")).Get()).Get(),
vpa: test.VerticalPodAutoscaler().WithContainer(containerName).WithTarget("2", "").Get(),
expectedPrio: PodPriority{
OutsideRecommendedRange: false,
@ -64,7 +65,7 @@ func TestGetUpdatePriority(t *testing.T) {
},
}, {
name: "scale up on milliquanitites",
pod: test.Pod().WithName("POD1").AddContainer(test.BuildTestContainer(containerName, "10m", "")).Get(),
pod: test.Pod().WithName("POD1").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("10m")).Get()).Get(),
vpa: test.VerticalPodAutoscaler().WithContainer(containerName).WithTarget("900m", "").Get(),
expectedPrio: PodPriority{
OutsideRecommendedRange: false,
@ -73,7 +74,7 @@ func TestGetUpdatePriority(t *testing.T) {
},
}, {
name: "scale up outside recommended range",
pod: test.Pod().WithName("POD1").AddContainer(test.BuildTestContainer(containerName, "4", "")).Get(),
pod: test.Pod().WithName("POD1").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("4")).Get()).Get(),
vpa: test.VerticalPodAutoscaler().WithContainer(containerName).
WithTarget("10", "").
WithLowerBound("6", "").
@ -85,7 +86,7 @@ func TestGetUpdatePriority(t *testing.T) {
},
}, {
name: "scale down outside recommended range",
pod: test.Pod().WithName("POD1").AddContainer(test.BuildTestContainer(containerName, "8", "")).Get(),
pod: test.Pod().WithName("POD1").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("8")).Get()).Get(),
vpa: test.VerticalPodAutoscaler().WithContainer(containerName).
WithTarget("2", "").
WithLowerBound("1", "").
@ -97,7 +98,7 @@ func TestGetUpdatePriority(t *testing.T) {
},
}, {
name: "scale up with multiple quantities",
pod: test.Pod().WithName("POD1").AddContainer(test.BuildTestContainer(containerName, "2", "")).Get(),
pod: test.Pod().WithName("POD1").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("2")).Get()).Get(),
vpa: test.VerticalPodAutoscaler().WithContainer(containerName).WithTarget("10", "").Get(),
expectedPrio: PodPriority{
OutsideRecommendedRange: false,
@ -106,7 +107,7 @@ func TestGetUpdatePriority(t *testing.T) {
},
}, {
name: "multiple resources, both scale up",
pod: test.Pod().WithName("POD1").AddContainer(test.BuildTestContainer(containerName, "3", "10M")).Get(),
pod: test.Pod().WithName("POD1").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("3")).WithMemRequest(resource.MustParse("10M")).Get()).Get(),
vpa: test.VerticalPodAutoscaler().WithContainer(containerName).WithTarget("6", "20M").Get(),
expectedPrio: PodPriority{
OutsideRecommendedRange: false,
@ -115,7 +116,7 @@ func TestGetUpdatePriority(t *testing.T) {
},
}, {
name: "multiple resources, only one scale up",
pod: test.Pod().WithName("POD1").AddContainer(test.BuildTestContainer(containerName, "4", "10M")).Get(),
pod: test.Pod().WithName("POD1").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("4")).WithMemRequest(resource.MustParse("10M")).Get()).Get(),
vpa: test.VerticalPodAutoscaler().WithContainer(containerName).WithTarget("2", "20M").Get(),
expectedPrio: PodPriority{
OutsideRecommendedRange: false,
@ -124,7 +125,7 @@ func TestGetUpdatePriority(t *testing.T) {
},
}, {
name: "multiple resources, both scale down",
pod: test.Pod().WithName("POD1").AddContainer(test.BuildTestContainer(containerName, "4", "20M")).Get(),
pod: test.Pod().WithName("POD1").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("4")).WithMemRequest(resource.MustParse("20M")).Get()).Get(),
vpa: test.VerticalPodAutoscaler().WithContainer(containerName).WithTarget("2", "10M").Get(),
expectedPrio: PodPriority{
OutsideRecommendedRange: false,
@ -133,7 +134,7 @@ func TestGetUpdatePriority(t *testing.T) {
},
}, {
name: "multiple resources, one outside recommended range",
pod: test.Pod().WithName("POD1").AddContainer(test.BuildTestContainer(containerName, "4", "20M")).Get(),
pod: test.Pod().WithName("POD1").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("4")).WithMemRequest(resource.MustParse("20M")).Get()).Get(),
vpa: test.VerticalPodAutoscaler().WithContainer(containerName).
WithTarget("2", "10M").
WithLowerBound("1", "5M").
@ -145,8 +146,8 @@ func TestGetUpdatePriority(t *testing.T) {
},
}, {
name: "multiple containers, both scale up",
pod: test.Pod().WithName("POD1").AddContainer(test.BuildTestContainer(containerName, "1", "")).
AddContainer(test.BuildTestContainer("test-container-2", "2", "")).Get(),
pod: test.Pod().WithName("POD1").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("1")).Get()).
AddContainer(test.Container().WithName("test-container-2").WithCPURequest(resource.MustParse("2")).Get()).Get(),
vpa: test.VerticalPodAutoscaler().WithContainer(containerName).
WithTarget("4", "").AppendRecommendation(
test.Recommendation().
@ -159,8 +160,8 @@ func TestGetUpdatePriority(t *testing.T) {
},
}, {
name: "multiple containers, both scale down",
pod: test.Pod().WithName("POD1").AddContainer(test.BuildTestContainer(containerName, "3", "")).
AddContainer(test.BuildTestContainer("test-container-2", "7", "")).Get(),
pod: test.Pod().WithName("POD1").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("3")).Get()).
AddContainer(test.Container().WithName("test-container-2").WithCPURequest(resource.MustParse("7")).Get()).Get(),
vpa: test.VerticalPodAutoscaler().WithContainer(containerName).
WithTarget("1", "").AppendRecommendation(
test.Recommendation().
@ -173,8 +174,8 @@ func TestGetUpdatePriority(t *testing.T) {
},
}, {
name: "multiple containers, both scale up, one outside range",
pod: test.Pod().WithName("POD1").AddContainer(test.BuildTestContainer(containerName, "1", "")).
AddContainer(test.BuildTestContainer("test-container-2", "2", "")).Get(),
pod: test.Pod().WithName("POD1").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("1")).Get()).
AddContainer(test.Container().WithName("test-container-2").WithCPURequest(resource.MustParse("2")).Get()).Get(),
vpa: test.VerticalPodAutoscaler().WithContainer(containerName).
WithTarget("4", "").
WithLowerBound("1", "").AppendRecommendation(
@ -193,8 +194,8 @@ func TestGetUpdatePriority(t *testing.T) {
// container1: request={6 CPU, 10 MB}, recommended={8 CPU, 20 MB}
// container2: request={4 CPU, 30 MB}, recommended={7 CPU, 30 MB}
// total: request={10 CPU, 40 MB}, recommended={15 CPU, 50 MB}
pod: test.Pod().WithName("POD1").AddContainer(test.BuildTestContainer(containerName, "6", "10M")).
AddContainer(test.BuildTestContainer("test-container-2", "4", "30M")).Get(),
pod: test.Pod().WithName("POD1").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("6")).WithMemRequest(resource.MustParse("10M")).Get()).
AddContainer(test.Container().WithName("test-container-2").WithCPURequest(resource.MustParse("4")).WithMemRequest(resource.MustParse("30M")).Get()).Get(),
vpa: test.VerticalPodAutoscaler().WithContainer(containerName).
WithTarget("8", "20M").AppendRecommendation(
test.Recommendation().
@ -221,7 +222,7 @@ func TestGetUpdatePriority(t *testing.T) {
// recommendation for a container.
func TestGetUpdatePriority_NoRecommendationForContainer(t *testing.T) {
p := NewProcessor()
pod := test.Pod().WithName("POD1").AddContainer(test.BuildTestContainer("test-container", "5", "10")).Get()
pod := test.Pod().WithName("POD1").AddContainer(test.Container().WithName("test-container").WithCPURequest(resource.MustParse("5")).WithMemRequest(resource.MustParse("10")).Get()).Get()
vpa := test.VerticalPodAutoscaler().WithName("test-vpa").WithContainer("test-container").Get()
result := p.GetUpdatePriority(pod, vpa, nil)
assert.NotNil(t, result)
@ -245,28 +246,28 @@ func TestGetUpdatePriority_VpaObservedContainers(t *testing.T) {
}{
{
name: "with no VpaObservedContainers annotation",
pod: test.Pod().WithName("POD1").AddContainer(test.BuildTestContainer(containerName, "1", "")).Get(),
pod: test.Pod().WithName("POD1").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("1")).Get()).Get(),
recommendation: test.Recommendation().WithContainer(containerName).WithTarget("10", "").Get(),
want: optedInContainerDiff,
},
{
name: "with container listed in VpaObservedContainers annotation",
pod: test.Pod().WithAnnotations(map[string]string{annotations.VpaObservedContainersLabel: containerName}).
WithName("POD1").AddContainer(test.BuildTestContainer(containerName, "1", "")).Get(),
WithName("POD1").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("1")).Get()).Get(),
recommendation: test.Recommendation().WithContainer(containerName).WithTarget("10", "").Get(),
want: optedInContainerDiff,
},
{
name: "with container not listed in VpaObservedContainers annotation",
pod: test.Pod().WithAnnotations(map[string]string{annotations.VpaObservedContainersLabel: ""}).
WithName("POD1").AddContainer(test.BuildTestContainer(containerName, "1", "")).Get(),
WithName("POD1").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("1")).Get()).Get(),
recommendation: test.Recommendation().WithContainer(containerName).WithTarget("10", "").Get(),
want: optedOutContainerDiff,
},
{
name: "with incorrect VpaObservedContainers annotation",
pod: test.Pod().WithAnnotations(map[string]string{annotations.VpaObservedContainersLabel: "abcd;';"}).
WithName("POD1").AddContainer(test.BuildTestContainer(containerName, "1", "")).Get(),
WithName("POD1").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("1")).Get()).Get(),
recommendation: test.Recommendation().WithContainer(containerName).WithTarget("10", "").Get(),
want: optedInContainerDiff,
},

49
vertical-pod-autoscaler/pkg/updater/priority/update_priority_calculator_test.go
View File

@ -26,6 +26,7 @@ import (
"k8s.io/autoscaler/vertical-pod-autoscaler/pkg/utils/test"
apiv1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"github.com/stretchr/testify/assert"
@ -37,10 +38,10 @@ const (
// TODO(bskiba): Refactor the SortPriority tests as a testcase list test.
func TestSortPriority(t *testing.T) {
pod1 := test.Pod().WithName("POD1").AddContainer(test.BuildTestContainer(containerName, "2", "")).Get()
pod2 := test.Pod().WithName("POD2").AddContainer(test.BuildTestContainer(containerName, "4", "")).Get()
pod3 := test.Pod().WithName("POD3").AddContainer(test.BuildTestContainer(containerName, "1", "")).Get()
pod4 := test.Pod().WithName("POD4").AddContainer(test.BuildTestContainer(containerName, "3", "")).Get()
pod1 := test.Pod().WithName("POD1").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("2")).Get()).Get()
pod2 := test.Pod().WithName("POD2").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("4")).Get()).Get()
pod3 := test.Pod().WithName("POD3").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("1")).Get()).Get()
pod4 := test.Pod().WithName("POD4").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("3")).Get()).Get()
vpa := test.VerticalPodAutoscaler().WithContainer(containerName).WithTarget("10", "").Get()
@ -63,9 +64,9 @@ func TestSortPriority(t *testing.T) {
}
func TestSortPriorityResourcesDecrease(t *testing.T) {
pod1 := test.Pod().WithName("POD1").AddContainer(test.BuildTestContainer(containerName, "4", "")).Get()
pod2 := test.Pod().WithName("POD2").AddContainer(test.BuildTestContainer(containerName, "8", "")).Get()
pod3 := test.Pod().WithName("POD3").AddContainer(test.BuildTestContainer(containerName, "10", "")).Get()
pod1 := test.Pod().WithName("POD1").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("4")).Get()).Get()
pod2 := test.Pod().WithName("POD2").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("8")).Get()).Get()
pod3 := test.Pod().WithName("POD3").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("10")).Get()).Get()
vpa := test.VerticalPodAutoscaler().WithContainer(containerName).WithTarget("5", "").Get()
@ -90,7 +91,7 @@ func TestSortPriorityResourcesDecrease(t *testing.T) {
}
func TestUpdateNotRequired(t *testing.T) {
pod1 := test.Pod().WithName("POD1").AddContainer(test.BuildTestContainer(containerName, "4", "")).Get()
pod1 := test.Pod().WithName("POD1").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("4")).Get()).Get()
vpa := test.VerticalPodAutoscaler().WithContainer(containerName).WithTarget("4", "").Get()
priorityProcessor := NewFakeProcessor(map[string]PodPriority{"POD1": {
@ -113,7 +114,7 @@ func TestUseProcessor(t *testing.T) {
recommendationProcessor.On("Apply").Return(processedRecommendation, nil)
vpa := test.VerticalPodAutoscaler().WithContainer(containerName).WithTarget("5", "5M").Get()
pod1 := test.Pod().WithName("POD1").AddContainer(test.BuildTestContainer(containerName, "4", "10M")).Get()
pod1 := test.Pod().WithName("POD1").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("4")).WithMemRequest(resource.MustParse("10M")).Get()).Get()
priorityProcessor := NewFakeProcessor(map[string]PodPriority{
"POD1": {ResourceDiff: 0.0},
@ -134,9 +135,9 @@ func TestUseProcessor(t *testing.T) {
// 2. diverging from the target by more than MinChangePriority.
func TestUpdateLonglivedPods(t *testing.T) {
pods := []*apiv1.Pod{
test.Pod().WithName("POD1").AddContainer(test.BuildTestContainer(containerName, "4", "")).Get(),
test.Pod().WithName("POD2").AddContainer(test.BuildTestContainer(containerName, "1", "")).Get(),
test.Pod().WithName("POD3").AddContainer(test.BuildTestContainer(containerName, "8", "")).Get(),
test.Pod().WithName("POD1").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("4")).Get()).Get(),
test.Pod().WithName("POD2").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("1")).Get()).Get(),
test.Pod().WithName("POD3").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("8")).Get()).Get(),
}
// Both pods are within the recommended range.
@ -168,9 +169,9 @@ func TestUpdateLonglivedPods(t *testing.T) {
// range for at least one container.
func TestUpdateShortlivedPods(t *testing.T) {
pods := []*apiv1.Pod{
test.Pod().WithName("POD1").AddContainer(test.BuildTestContainer(containerName, "4", "")).Get(),
test.Pod().WithName("POD2").AddContainer(test.BuildTestContainer(containerName, "1", "")).Get(),
test.Pod().WithName("POD3").AddContainer(test.BuildTestContainer(containerName, "10", "")).Get(),
test.Pod().WithName("POD1").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("4")).Get()).Get(),
test.Pod().WithName("POD2").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("1")).Get()).Get(),
test.Pod().WithName("POD3").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("10")).Get()).Get(),
}
// Pods 1 and 2 are within the recommended range.
@ -198,7 +199,7 @@ func TestUpdateShortlivedPods(t *testing.T) {
}
func TestUpdatePodWithQuickOOM(t *testing.T) {
pod := test.Pod().WithName("POD1").AddContainer(test.BuildTestContainer(containerName, "4", "")).Get()
pod := test.Pod().WithName("POD1").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("4")).Get()).Get()
// Pretend that the test pod started 11 hours ago.
timestampNow := pod.Status.StartTime.Time.Add(time.Hour * 11)
@ -234,7 +235,7 @@ func TestUpdatePodWithQuickOOM(t *testing.T) {
}
func TestDontUpdatePodWithQuickOOMNoResourceChange(t *testing.T) {
pod := test.Pod().WithName("POD1").AddContainer(test.BuildTestContainer(containerName, "4", "8Gi")).Get()
pod := test.Pod().WithName("POD1").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("4")).WithMemRequest(resource.MustParse("8Gi")).Get()).Get()
// Pretend that the test pod started 11 hours ago.
timestampNow := pod.Status.StartTime.Time.Add(time.Hour * 11)
@ -270,7 +271,7 @@ func TestDontUpdatePodWithQuickOOMNoResourceChange(t *testing.T) {
}
func TestDontUpdatePodWithOOMAfterLongRun(t *testing.T) {
pod := test.Pod().WithName("POD1").AddContainer(test.BuildTestContainer(containerName, "4", "")).Get()
pod := test.Pod().WithName("POD1").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("4")).Get()).Get()
// Pretend that the test pod started 11 hours ago.
timestampNow := pod.Status.StartTime.Time.Add(time.Hour * 11)
@ -331,7 +332,7 @@ func TestQuickOOM_VpaOvservedContainers(t *testing.T) {
for _, tc := range tests {
t.Run(fmt.Sprintf("test case: %s", tc.name), func(t *testing.T) {
pod := test.Pod().WithAnnotations(tc.annotation).
WithName("POD1").AddContainer(test.BuildTestContainer(containerName, "4", "")).Get()
WithName("POD1").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("4")).Get()).Get()
// Pretend that the test pod started 11 hours ago.
timestampNow := pod.Status.StartTime.Time.Add(time.Hour * 11)
@ -416,7 +417,7 @@ func TestQuickOOM_ContainerResourcePolicy(t *testing.T) {
for _, tc := range tests {
t.Run(fmt.Sprintf("test case: %s", tc.name), func(t *testing.T) {
pod := test.Pod().WithAnnotations(map[string]string{annotations.VpaObservedContainersLabel: containerName}).
WithName("POD1").AddContainer(test.BuildTestContainer(containerName, "4", "")).Get()
WithName("POD1").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("4")).Get()).Get()
// Pretend that the test pod started 11 hours ago.
timestampNow := pod.Status.StartTime.Time.Add(time.Hour * 11)
@ -475,10 +476,10 @@ func (p *pod1Admission) CleanUp() {}
func TestAdmission(t *testing.T) {
pod1 := test.Pod().WithName("POD1").AddContainer(test.BuildTestContainer(containerName, "2", "")).Get()
pod2 := test.Pod().WithName("POD2").AddContainer(test.BuildTestContainer(containerName, "4", "")).Get()
pod3 := test.Pod().WithName("POD3").AddContainer(test.BuildTestContainer(containerName, "1", "")).Get()
pod4 := test.Pod().WithName("POD4").AddContainer(test.BuildTestContainer(containerName, "3", "")).Get()
pod1 := test.Pod().WithName("POD1").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("2")).Get()).Get()
pod2 := test.Pod().WithName("POD2").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("4")).Get()).Get()
pod3 := test.Pod().WithName("POD3").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("1")).Get()).Get()
pod4 := test.Pod().WithName("POD4").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("3")).Get()).Get()
vpa := test.VerticalPodAutoscaler().WithContainer(containerName).WithTarget("10", "").Get()

18
vertical-pod-autoscaler/pkg/utils/test/test_utils.go
View File

@ -30,7 +30,7 @@ import (
vpa_types_v1beta1 "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1beta1"
vpa_lister "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/client/listers/autoscaling.k8s.io/v1"
vpa_lister_v1beta1 "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/client/listers/autoscaling.k8s.io/v1beta1"
"k8s.io/client-go/listers/core/v1"
v1 "k8s.io/client-go/listers/core/v1"
"k8s.io/client-go/tools/record"
)
@ -39,22 +39,6 @@ var (
testTimestamp, _ = time.Parse(timeLayout, "2017-04-18 17:35:05")
)
// BuildTestContainer creates container with specified resources
func BuildTestContainer(containerName, cpu, mem string) apiv1.Container {
// TODO: Use builder directly, remove this function.
builder := Container().WithName(containerName)
if len(cpu) > 0 {
cpuVal, _ := resource.ParseQuantity(cpu)
builder = builder.WithCPURequest(cpuVal)
}
if len(mem) > 0 {
memVal, _ := resource.ParseQuantity(mem)
builder = builder.WithMemRequest(memVal)
}
return builder.Get()
}
// BuildTestPolicy creates ResourcesPolicy with specified constraints
func BuildTestPolicy(containerName, minCPU, maxCPU, minMemory, maxMemory string) *vpa_types.PodResourcePolicy {
minCPUVal, _ := resource.ParseQuantity(minCPU)

4
vertical-pod-autoscaler/pkg/utils/vpa/api_test.go
View File

@ -113,7 +113,7 @@ func TestPodMatchesVPA(t *testing.T) {
result bool
}
pod := test.Pod().WithName("test-pod").AddContainer(test.BuildTestContainer(containerName, "1", "100M")).Get()
pod := test.Pod().WithName("test-pod").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("1")).WithMemRequest(resource.MustParse("100M")).Get()).Get()
pod.Labels = map[string]string{"app": "testingApp"}
vpaBuilder := test.VerticalPodAutoscaler().
@ -137,7 +137,7 @@ func TestPodMatchesVPA(t *testing.T) {
}
func TestGetControllingVPAForPod(t *testing.T) {
pod := test.Pod().WithName("test-pod").AddContainer(test.BuildTestContainer(containerName, "1", "100M")).Get()
pod := test.Pod().WithName("test-pod").AddContainer(test.Container().WithName(containerName).WithCPURequest(resource.MustParse("1")).WithMemRequest(resource.MustParse("100M")).Get()).Get()
pod.Labels = map[string]string{"app": "testingApp"}
vpaBuilder := test.VerticalPodAutoscaler().

8
vertical-pod-autoscaler/pkg/utils/vpa/capping_test.go
View File

@ -27,7 +27,7 @@ import (
)
func TestRecommendationNotAvailable(t *testing.T) {
pod := test.Pod().WithName("pod1").AddContainer(test.BuildTestContainer("ctr-name", "", "")).Get()
pod := test.Pod().WithName("pod1").AddContainer(test.Container().WithName("ctr-name").Get()).Get()
podRecommendation := vpa_types.RecommendedPodResources{
ContainerRecommendations: []vpa_types.RecommendedContainerResources{
{
@ -48,7 +48,7 @@ func TestRecommendationNotAvailable(t *testing.T) {
}
func TestRecommendationToLimitCapping(t *testing.T) {
pod := test.Pod().WithName("pod1").AddContainer(test.BuildTestContainer("ctr-name", "", "")).Get()
pod := test.Pod().WithName("pod1").AddContainer(test.Container().WithName("ctr-name").Get()).Get()
pod.Spec.Containers[0].Resources.Limits =
apiv1.ResourceList{
apiv1.ResourceCPU: *resource.NewScaledQuantity(3, 1),
@ -143,7 +143,7 @@ func TestRecommendationToLimitCapping(t *testing.T) {
}
func TestRecommendationCappedToMinMaxPolicy(t *testing.T) {
pod := test.Pod().WithName("pod1").AddContainer(test.BuildTestContainer("ctr-name", "", "")).Get()
pod := test.Pod().WithName("pod1").AddContainer(test.Container().WithName("ctr-name").Get()).Get()
podRecommendation := vpa_types.RecommendedPodResources{
ContainerRecommendations: []vpa_types.RecommendedContainerResources{
{
@ -238,7 +238,7 @@ var applyTestCases = []struct {
}
func TestApply(t *testing.T) {
pod := test.Pod().WithName("pod1").AddContainer(test.BuildTestContainer("ctr-name", "", "")).Get()
pod := test.Pod().WithName("pod1").AddContainer(test.Container().WithName("ctr-name").Get()).Get()
for _, testCase := range applyTestCases {
res, _, err := NewCappingRecommendationProcessor(&fakeLimitRangeCalculator{}).Apply(