Replace hard-code "cpu" and "memory" to consts

This commit is contained in:
xiangpengzhao
2017-08-15 15:56:18 +08:00
parent ba110e9f08
commit 1c4dbcf5ca
20 changed files with 116 additions and 119 deletions

View File

@@ -30,9 +30,8 @@ func TestResourceHelpers(t *testing.T) {
memoryLimit := resource.MustParse("10G")
resourceSpec := api.ResourceRequirements{
Limits: api.ResourceList{
"cpu": cpuLimit,
"memory": memoryLimit,
"kube.io/storage": memoryLimit,
api.ResourceCPU: cpuLimit,
api.ResourceMemory: memoryLimit,
},
}
if res := resourceSpec.Limits.Cpu(); res.Cmp(cpuLimit) != 0 {
@@ -43,8 +42,7 @@ func TestResourceHelpers(t *testing.T) {
}
resourceSpec = api.ResourceRequirements{
Limits: api.ResourceList{
"memory": memoryLimit,
"kube.io/storage": memoryLimit,
api.ResourceMemory: memoryLimit,
},
}
if res := resourceSpec.Limits.Cpu(); res.Value() != 0 {