github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #17825 from gmarek/fix-jenkins 

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2015-12-07 04:51:43 -08:00
parent b5539cc7ef 4c0b789949
commit 33eda2ffb5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/monitor_resources.go
View File

@ -30,17 +30,17 @@ const datapointAmount = 5
var systemContainers = []string{"/docker-daemon", "/kubelet", "/system"} var systemContainers = []string{"/docker-daemon", "/kubelet", "/system"}
//TODO tweak those values.
var allowedUsage = resourceUsagePerContainer{ var allowedUsage = resourceUsagePerContainer{
"/docker-daemon": &containerResourceUsage{ "/docker-daemon": &containerResourceUsage{
CPUUsageInCores: 0.08, CPUUsageInCores: 0.08,
MemoryUsageInBytes: 4500000000, MemoryUsageInBytes: 4500000000,
MemoryWorkingSetInBytes: 1500000000, MemoryWorkingSetInBytes: 1500000000,
}, },
// TODO: Make Kubelet constraints sane again when #17774 is fixed.
"/kubelet": &containerResourceUsage{ "/kubelet": &containerResourceUsage{
CPUUsageInCores: 0.1, CPUUsageInCores: 0.1,
MemoryUsageInBytes: 150000000, MemoryUsageInBytes: 1000000000,
MemoryWorkingSetInBytes: 150000000, MemoryWorkingSetInBytes: 250000000,
}, },
"/system": &containerResourceUsage{ "/system": &containerResourceUsage{
CPUUsageInCores: 0.03, CPUUsageInCores: 0.03,
@ -94,7 +94,7 @@ var _ = Describe("Resource usage of system containers", func() {
for i := 0; i < datapointAmount; i++ { for i := 0; i < datapointAmount; i++ {
for _, node := range nodeList.Items { for _, node := range nodeList.Items {
resourceUsage, err := getOneTimeResourceUsageOnNode(c, node.Name, 5*time.Second, func() []string { resourceUsage, err := getOneTimeResourceUsageOnNode(c, node.Name, 15*time.Second, func() []string {
if providerIs("gce", "gke") { if providerIs("gce", "gke") {
return systemContainers return systemContainers
} else { } else {