github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-11-28 03:47:34 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubelet/rkt/rkt_test.go
View File

@@ -1073,8 +1073,8 @@ func TestSetApp(t *testing.T) {
Command: []string{"/bin/bar", "$(env-bar)"},
WorkingDir: tmpDir,
Resources: v1.ResourceRequirements{
Limits: v1.ResourceList{"cpu": resource.MustParse("50m"), "memory": resource.MustParse("50M")},
Requests: v1.ResourceList{"cpu": resource.MustParse("5m"), "memory": resource.MustParse("5M")},
Limits: v1.ResourceList{v1.ResourceCPU: resource.MustParse("50m"), v1.ResourceMemory: resource.MustParse("50M")},
Requests: v1.ResourceList{v1.ResourceCPU: resource.MustParse("5m"), v1.ResourceMemory: resource.MustParse("5M")},
},
},
mountPoints: []appctypes.MountPoint{
@@ -1137,8 +1137,8 @@ func TestSetApp(t *testing.T) {
Args: []string{"hello", "world", "$(env-bar)"},
WorkingDir: tmpDir,
Resources: v1.ResourceRequirements{
Limits: v1.ResourceList{"cpu": resource.MustParse("50m")},
Requests: v1.ResourceList{"memory": resource.MustParse("5M")},
Limits: v1.ResourceList{v1.ResourceCPU: resource.MustParse("50m")},
Requests: v1.ResourceList{v1.ResourceMemory: resource.MustParse("5M")},
},
},
mountPoints: []appctypes.MountPoint{