github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-29 21:29:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #50665 from xiangpengzhao/hardcode-to-const

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 50257, 50247, 50665, 50554, 51077)

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

**What this PR does / why we need it**:
There are many places using hard coded "cpu" and "memory" as resource name. This PR replace them to consts.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:
/kind cleanup

**Release note**:

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue
2017-08-23 02:35:09 -07:00
committed by GitHub
parent 443f7e2af4 1c4dbcf5ca
commit 178a5ff314
20 changed files with 116 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/api/resource/helpers_test.go
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 {

8
pkg/api/v1/resource/helpers_test.go
View File

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

2
pkg/kubelet/kubelet_test.go
View File

@@ -563,7 +563,7 @@ func TestHandleMemExceeded(t *testing.T) {
spec := v1.PodSpec{NodeName: string(kl.nodeName),
Containers: []v1.Container{{Resources: v1.ResourceRequirements{
Requests: v1.ResourceList{
"memory": resource.MustParse("90"),
v1.ResourceMemory: resource.MustParse("90"),
},
}}},
}

32
pkg/kubelet/preemption/preemption_test.go
View File

@@ -338,47 +338,47 @@ func getTestPods() map[string]*v1.Pod {
allPods := map[string]*v1.Pod{
tinyBurstable: getPodWithResources(tinyBurstable, v1.ResourceRequirements{
Requests: v1.ResourceList{
"cpu": resource.MustParse("1m"),
"memory": resource.MustParse("1Mi"),
v1.ResourceCPU: resource.MustParse("1m"),
v1.ResourceMemory: resource.MustParse("1Mi"),
},
}),
bestEffort: getPodWithResources(bestEffort, v1.ResourceRequirements{}),
critical: getPodWithResources(critical, v1.ResourceRequirements{
Requests: v1.ResourceList{
"cpu": resource.MustParse("100m"),
"memory": resource.MustParse("100Mi"),
v1.ResourceCPU: resource.MustParse("100m"),
v1.ResourceMemory: resource.MustParse("100Mi"),
},
}),
burstable: getPodWithResources(burstable, v1.ResourceRequirements{
Requests: v1.ResourceList{
"cpu": resource.MustParse("100m"),
"memory": resource.MustParse("100Mi"),
v1.ResourceCPU: resource.MustParse("100m"),
v1.ResourceMemory: resource.MustParse("100Mi"),
},
}),
guaranteed: getPodWithResources(guaranteed, v1.ResourceRequirements{
Requests: v1.ResourceList{
"cpu": resource.MustParse("100m"),
"memory": resource.MustParse("100Mi"),
v1.ResourceCPU: resource.MustParse("100m"),
v1.ResourceMemory: resource.MustParse("100Mi"),
},
Limits: v1.ResourceList{
"cpu": resource.MustParse("100m"),
"memory": resource.MustParse("100Mi"),
v1.ResourceCPU: resource.MustParse("100m"),
v1.ResourceMemory: resource.MustParse("100Mi"),
},
}),
highRequestBurstable: getPodWithResources(highRequestBurstable, v1.ResourceRequirements{
Requests: v1.ResourceList{
"cpu": resource.MustParse("300m"),
"memory": resource.MustParse("300Mi"),
v1.ResourceCPU: resource.MustParse("300m"),
v1.ResourceMemory: resource.MustParse("300Mi"),
},
}),
highRequestGuaranteed: getPodWithResources(highRequestGuaranteed, v1.ResourceRequirements{
Requests: v1.ResourceList{
"cpu": resource.MustParse("300m"),
"memory": resource.MustParse("300Mi"),
v1.ResourceCPU: resource.MustParse("300m"),
v1.ResourceMemory: resource.MustParse("300Mi"),
},
Limits: v1.ResourceList{
"cpu": resource.MustParse("300m"),
"memory": resource.MustParse("300Mi"),
v1.ResourceCPU: resource.MustParse("300m"),
v1.ResourceMemory: resource.MustParse("300Mi"),
},
}),
}

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{