Disable cgroups-per-qos flag until implementation is stabilized

This commit is contained in:
derekwaynecarr
2016-08-11 17:06:06 -04:00
parent 4ddfe172ce
commit fde285cd8f
9 changed files with 62 additions and 47 deletions

View File

@@ -82,7 +82,8 @@ func (e *E2EServices) Start() error {
// out of the test.
"--node-name", framework.TestContext.NodeName,
"--disable-kubenet="+strconv.FormatBool(framework.TestContext.DisableKubenet),
"--cgroups-per-qos="+strconv.FormatBool(framework.TestContext.CgroupsPerQOS),
// TODO: enable when flag is introduced in 1.5
// "--cgroups-per-qos="+strconv.FormatBool(framework.TestContext.CgroupsPerQOS),
"--manifest-path", framework.TestContext.ManifestPath,
"--eviction-hard", framework.TestContext.EvictionHard,
)
@@ -365,9 +366,10 @@ func (es *e2eService) startKubeletServer() (*server, error) {
"--eviction-pressure-transition-period", "30s",
)
if framework.TestContext.CgroupsPerQOS {
cmdArgs = append(cmdArgs,
"--cgroups-per-qos", "true",
)
// TODO: enable this when the flag is stable and available in kubelet.
// cmdArgs = append(cmdArgs,
// "--cgroups-per-qos", "true",
// )
}
if !framework.TestContext.DisableKubenet {
cwd, err := os.Getwd()