Skip to content
This repository has been archived by the owner on May 5, 2021. It is now read-only.

Commit

Permalink
Merge pull request kubernetes#1880 from jbartosik/vpa-server-unit-test
Browse files Browse the repository at this point in the history 
Vpa server unit test
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot authored Apr 12, 2019
2 parents 22dba81 + 278c304 commit 4c48c55
Showing 1 changed file with 174 additions and 35 deletions.
209 changes: 174 additions & 35 deletions vertical-pod-autoscaler/pkg/admission-controller/logic/server_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ 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/v1beta2"
vpa_api_util "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/utils/vpa"
)

Expand Down Expand Up @@ -191,39 +192,6 @@ func TestGetPatchesForResourceRequest(t *testing.T) {
addAnnotationRequest([][]string{{cpu}}),
},
},
{
name: "two replacement resources",
podJson: []byte(
`{
"spec": {
"containers": [
{
"resources": {
"requests": {
"cpu": "0"
}
}
}
]
}
}`),
namespace: "default",
recommendResources: []ContainerResources{
{
apiv1.ResourceList{
cpu: resource.MustParse("1"),
unobtanium: resource.MustParse("2"),
},
},
},
recommendAnnotations: vpa_api_util.ContainerToAnnotationsMap{},
recommendName: "name",
expectPatches: []patchRecord{
addResourceRequestPatch(0, cpu, "1"),
addResourceRequestPatch(0, unobtanium, "2"),
addAnnotationRequest([][]string{{cpu, unobtanium}}),
},
},
{
name: "two containers",
podJson: []byte(
Expand Down Expand Up @@ -272,9 +240,11 @@ func TestGetPatchesForResourceRequest(t *testing.T) {
s := NewAdmissionServer(&frp, &fppp)
patches, err := s.getPatchesForPodResourceRequest(tc.podJson, tc.namespace)
if tc.expectError == nil {
assert.Nil(t, err)
assert.NoError(t, err)
} else {
assert.Errorf(t, err, tc.expectError.Error())
if assert.Error(t, err) {
assert.Equal(t, tc.expectError.Error(), err.Error())
}
}
if assert.Equal(t, len(tc.expectPatches), len(patches)) {
for i, gotPatch := range patches {
Expand All @@ -286,3 +256,172 @@ func TestGetPatchesForResourceRequest(t *testing.T) {
})
}
}

func TestGetPatchesForResourceRequest_TwoReplacementResources(t *testing.T) {

fppp := fakePodPreProcessor{}
recommendResources := []ContainerResources{
{
apiv1.ResourceList{
cpu: resource.MustParse("1"),
unobtanium: resource.MustParse("2"),
},
},
}
podJson := []byte(
`{
"spec": {
"containers": [
{
"resources": {
"requests": {
"cpu": "0"
}
}
}
]
}
}`)
recommendAnnotations := vpa_api_util.ContainerToAnnotationsMap{}
frp := fakeRecommendationProvider{recommendResources, recommendAnnotations, "name", nil}
s := NewAdmissionServer(&frp, &fppp)
patches, err := s.getPatchesForPodResourceRequest(podJson, "default")
assert.NoError(t, err)
// Order of updates for cpu and unobtanium depends on order of iterating a map, both possible results are valid.
if assert.Equal(t, len(patches), 3) {
cpuUpdate := addResourceRequestPatch(0, cpu, "1")
unobtaniumUpdate := addResourceRequestPatch(0, unobtanium, "2")
assert.True(t, eqPatch(patches[0], cpuUpdate) || eqPatch(patches[0], unobtaniumUpdate))
assert.True(t, eqPatch(patches[1], cpuUpdate) || eqPatch(patches[1], unobtaniumUpdate))
assert.False(t, eqPatch(patches[0], patches[1]))
assert.True(t, eqPatch(patches[2], addAnnotationRequest([][]string{{cpu, unobtanium}})) || eqPatch(patches[2], addAnnotationRequest([][]string{{unobtanium, cpu}})))
}
}

func TestValidateVPA(t *testing.T) {
badUpdateMode := vpa_types.UpdateMode("bad")
validUpdateMode := vpa_types.UpdateModeOff
badScalingMode := vpa_types.ContainerScalingMode("bad")
validScalingMode := vpa_types.ContainerScalingModeAuto
tests := []struct {
name string
vpa vpa_types.VerticalPodAutoscaler
isCreate bool
expectError error
}{
{
name: "empty update",
vpa: vpa_types.VerticalPodAutoscaler{},
},
{
name: "empty create",
vpa: vpa_types.VerticalPodAutoscaler{},
isCreate: true,
expectError: fmt.Errorf("TargetRef is required. If you're using v1beta1 version of the API, please migrate to v1beta2."),
},
{
name: "no update mode",
vpa: vpa_types.VerticalPodAutoscaler{
Spec: vpa_types.VerticalPodAutoscalerSpec{
UpdatePolicy: &vpa_types.PodUpdatePolicy{},
},
},
expectError: fmt.Errorf("UpdateMode is required if UpdatePolicy is used"),
},
{
name: "bad update mode",
vpa: vpa_types.VerticalPodAutoscaler{
Spec: vpa_types.VerticalPodAutoscalerSpec{
UpdatePolicy: &vpa_types.PodUpdatePolicy{
UpdateMode: &badUpdateMode,
},
},
},
expectError: fmt.Errorf("unexpected UpdateMode value bad"),
},
{
name: "no policy name",
vpa: vpa_types.VerticalPodAutoscaler{
Spec: vpa_types.VerticalPodAutoscalerSpec{
ResourcePolicy: &vpa_types.PodResourcePolicy{
ContainerPolicies: []vpa_types.ContainerResourcePolicy{{}},
},
},
},
expectError: fmt.Errorf("ContainerPolicies.ContainerName is required"),
},
{
name: "invalid scaling mode",
vpa: vpa_types.VerticalPodAutoscaler{
Spec: vpa_types.VerticalPodAutoscalerSpec{
ResourcePolicy: &vpa_types.PodResourcePolicy{
ContainerPolicies: []vpa_types.ContainerResourcePolicy{
{
ContainerName: "loot box",
Mode: &badScalingMode,
},
},
},
},
},
expectError: fmt.Errorf("unexpected Mode value bad"),
},
{
name: "bad limits",
vpa: vpa_types.VerticalPodAutoscaler{
Spec: vpa_types.VerticalPodAutoscalerSpec{
ResourcePolicy: &vpa_types.PodResourcePolicy{
ContainerPolicies: []vpa_types.ContainerResourcePolicy{
{
ContainerName: "loot box",
MinAllowed: apiv1.ResourceList{
cpu: resource.MustParse("100"),
},
MaxAllowed: apiv1.ResourceList{
cpu: resource.MustParse("10"),
},
},
},
},
},
},
expectError: fmt.Errorf("max resource for cpu is lower than min"),
},
{
name: "all valid",
vpa: vpa_types.VerticalPodAutoscaler{
Spec: vpa_types.VerticalPodAutoscalerSpec{
ResourcePolicy: &vpa_types.PodResourcePolicy{
ContainerPolicies: []vpa_types.ContainerResourcePolicy{
{
ContainerName: "loot box",
Mode: &validScalingMode,
MinAllowed: apiv1.ResourceList{
cpu: resource.MustParse("10"),
},
MaxAllowed: apiv1.ResourceList{
cpu: resource.MustParse("100"),
},
},
},
},
UpdatePolicy: &vpa_types.PodUpdatePolicy{
UpdateMode: &validUpdateMode,
},
},
},
},
}
for _, tc := range tests {
t.Run(fmt.Sprintf("test case: %s", tc.name), func(t *testing.T) {
err := validateVPA(&tc.vpa, tc.isCreate)
if tc.expectError == nil {
assert.NoError(t, err)
} else {
if assert.Error(t, err) {
assert.Equal(t, tc.expectError.Error(), err.Error())
}
}
})
}
}

0 comments on commit 4c48c55

Please sign in to comment.