github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 02:09:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17786 from mikedanese/fix-res

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-11-25 10:01:53 -08:00
commit 54bcbb03b0
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/e2e/monitor_resources.go
View File

@ -29,7 +29,7 @@ import (
const datapointAmount = 5 const datapointAmount = 5
var systemContainers = []string{"/docker-daemon", "/kubelet", "/kube-proxy", "/system"} var systemContainers = []string{"/docker-daemon", "/kubelet", "/system"}
//TODO tweak those values. //TODO tweak those values.
var allowedUsage = resourceUsagePerContainer{ var allowedUsage = resourceUsagePerContainer{
@ -43,11 +43,6 @@ var allowedUsage = resourceUsagePerContainer{
MemoryUsageInBytes: 150000000, MemoryUsageInBytes: 150000000,
MemoryWorkingSetInBytes: 150000000, MemoryWorkingSetInBytes: 150000000,
}, },
"/kube-proxy": &containerResourceUsage{
CPUUsageInCores: 0.025,
MemoryUsageInBytes: 100000000,
MemoryWorkingSetInBytes: 100000000,
},
"/system": &containerResourceUsage{ "/system": &containerResourceUsage{
CPUUsageInCores: 0.03, CPUUsageInCores: 0.03,
MemoryUsageInBytes: 100000000, MemoryUsageInBytes: 100000000,