scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-12-10 01:55:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #41349 from derekwaynecarr/enable-pod-cgroups

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 41349, 41532, 41256, 41587, 41657)

Enable pod level cgroups by default

**What this PR does / why we need it**:
It enables pod level cgroups by default.

**Special notes for your reviewer**:
This is intended to be enabled by default on 2/14/2017 per the plan outlined here:
https://github.com/kubernetes/community/pull/314

**Release note**:
```release-note
Each pod has its own associated cgroup by default.
```
This commit is contained in:
Kubernetes Submit Queue
2017-02-22 08:12:37 -08:00
committed by GitHub
parent eef16cf141 43ae6f49ad
commit d1687d2f67
9 changed files with 51 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e_node/jenkins/benchmark/jenkins-benchmark.properties
View File

@@ -5,5 +5,5 @@ GCE_PROJECT=k8s-jkns-ci-node-e2e
CLEANUP=true
GINKGO_FLAGS='--skip="\[Flaky\]"'
TEST_ARGS='--feature-gates=DynamicKubeletConfig=true'
KUBELET_ARGS='--cgroups-per-qos=false --cgroup-root=/'
KUBELET_ARGS='--cgroups-per-qos=true --cgroup-root=/'
PARALLELISM=1

2
test/e2e_node/jenkins/conformance/jenkins-conformance.properties
View File

@@ -3,4 +3,4 @@ GCE_IMAGE_CONFIG_PATH=test/e2e_node/jenkins/image-config.yaml
GCE_ZONE=us-central1-f
GCE_PROJECT=k8s-jkns-ci-node-e2e
CLEANUP=true
KUBELET_ARGS='--cgroups-per-qos=false --cgroup-root=/'
KUBELET_ARGS='--cgroups-per-qos=true --cgroup-root=/'