scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve test casing on resource defaults sample plugin

Browse Source
This commit is contained in:
derekwaynecarr
2015-02-06 13:50:09 -05:00
parent 94d852e8a6
commit 409abdc745
2 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugin/pkg/admission/resourcedefaults/admission.go
View File

@@ -55,7 +55,9 @@ func (resourceDefaults) Admit(a admission.Attributes) (err error) {
obj := a.GetObject()
pod := obj.(*api.Pod)
for index := range pod.Spec.Containers {
pod.Spec.Containers[index].Resources.Limits = api.ResourceList{}
if pod.Spec.Containers[index].Resources.Limits == nil {
pod.Spec.Containers[index].Resources.Limits = api.ResourceList{}
}
if pod.Spec.Containers[index].Resources.Limits.Memory().Value() == 0 {
pod.Spec.Containers[index].Resources.Limits[api.ResourceMemory] = resource.MustParse(defaultMemory)
}

45
plugin/pkg/admission/resourcedefaults/admission_test.go
View File

@@ -21,6 +21,7 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/admission"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource"
)
func TestAdmission(t *testing.T) {
@@ -51,3 +52,47 @@ func TestAdmission(t *testing.T) {
}
}
}
func TestIgnoreAdmission(t *testing.T) {
namespace := "default"
handler := NewResourceDefaults()
pod := api.Pod{
ObjectMeta: api.ObjectMeta{Name: "123", Namespace: "ns"},
Spec: api.PodSpec{
Volumes: []api.Volume{{Name: "vol"}},
Containers: []api.Container{
{
Name: "ctr",
Image: "image",
Resources: api.ResourceRequirementSpec{
Limits: getResourceLimits("2", "750Mi"),
},
},
},
},
}
err := handler.Admit(admission.NewAttributesRecord(&pod, namespace, "pods", "CREATE"))
if err != nil {
t.Errorf("Unexpected error returned from admission handler")
}
for i := range pod.Spec.Containers {
memory := pod.Spec.Containers[i].Resources.Limits.Memory().String()
cpu := pod.Spec.Containers[i].Resources.Limits.Cpu().String()
if memory != "750Mi" {
t.Errorf("Unexpected memory value %s", memory)
}
if cpu != "2" {
t.Errorf("Unexpected cpu value %s", cpu)
}
}
}
func getResourceLimits(cpu, memory string) api.ResourceList {
res := api.ResourceList{}
res[api.ResourceCPU] = resource.MustParse(cpu)
res[api.ResourceMemory] = resource.MustParse(memory)
return res
}