Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename experimental-cgroups-per-pod flag #39972

Merged

Conversation

derekwaynecarr
Copy link
Member

@derekwaynecarr derekwaynecarr commented Jan 16, 2017

What this PR does / why we need it:

  1. Rename experimental-cgroups-per-qos to cgroups-per-qos
  2. Update hack/local-up-cluster to match CGROUP_DRIVER with docker runtime if used.

Special notes for your reviewer:
We plan to roll this feature out in the upcoming release. Previous node e2e runs were running with this feature on by default. We will default this feature on for all e2es next week.

Release note:

Rename --experiemental-cgroups-per-qos to --cgroups-per-qos

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jan 16, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@derekwaynecarr
Copy link
Member Author

fyi @sjenning @vishh

@k8s-github-robot k8s-github-robot added kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API size/M Denotes a PR that changes 30-99 lines, ignoring generated files. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Jan 16, 2017
@derekwaynecarr derekwaynecarr assigned vishh and unassigned ixdy Jan 16, 2017
@derekwaynecarr
Copy link
Member Author

@k8s-bot kops aws e2e test this

@vishh
Copy link
Contributor

vishh commented Jan 18, 2017

@derekwaynecarr we need to define a roll out plan before this PR can be merged. I think we both will agree that merging this PR earlier is better, so let's start working on a roll out plan asap.

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 19, 2017
@resouer
Copy link
Contributor

resouer commented Jan 19, 2017

nit: just noticed there're still some TODOs in #27204, we need to also define which ones are in the scope of this rollout.

@@ -34,7 +34,7 @@ NET_PLUGIN=${NET_PLUGIN:-""}
NET_PLUGIN_DIR=${NET_PLUGIN_DIR:-""}
SERVICE_CLUSTER_IP_RANGE=${SERVICE_CLUSTER_IP_RANGE:-10.0.0.0/24}
# if enabled, must set CGROUP_ROOT
EXPERIMENTAL_CGROUPS_PER_QOS=${EXPERIMENTAL_CGROUPS_PER_QOS:-false}
CGROUPS_PER_QOS=${CGROUPS_PER_QOS:-false}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this be changed to true? or blank if we are changing the default in the code?

also this whole change causes --cgroup-root to be a required option yes? i.e. if i don't explicitly say --cgroups-per-qos=false, then --cgroup-root is required?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i have reduced this pr scope to just the new flag name but not enabling it.

the enable will be a follow-on pr next week.

@derekwaynecarr derekwaynecarr removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 3, 2017
@derekwaynecarr derekwaynecarr changed the title Enable cgroups-per-pod by default Rename experimental-cgroups-per-pod flag Feb 3, 2017
@derekwaynecarr
Copy link
Member Author

@vishh -- given the propensity for prs of this nature to cause rebase conflicts, i made this just the flag rename so we can have a much smaller pr next week to just change the default.

@k8s-ci-robot
Copy link
Contributor

@derekwaynecarr: The following test(s) failed:

Test name Commit Details Rerun command
Jenkins GCI GCE e2e 75fa285 link @k8s-bot gci gce e2e test this

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@@ -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='--experimental-cgroups-per-qos=true --cgroup-root=/'
KUBELET_ARGS='--cgroups-per-qos=false --cgroup-root=/'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is it false here?

@@ -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='--experimental-cgroups-per-qos=true --cgroup-root=/'
KUBELET_ARGS='--cgroups-per-qos=false --cgroup-root=/'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we disabling in this scenario?

Copy link
Contributor

@vishh vishh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder why pod cgroups are disabled in two test suites. I'm ok with enabling them in a separate PR too, so this PR lgtm

@vishh
Copy link
Contributor

vishh commented Feb 4, 2017

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 4, 2017
@vishh
Copy link
Contributor

vishh commented Feb 4, 2017

/approve

@vishh vishh added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 4, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

The following people have approved this PR: derekwaynecarr, vishh

Needs approval from an approver in each of these OWNERS Files:

We suggest the following people:
cc @dchen1107
You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 40289, 40877, 40879, 39972, 40942)

@k8s-github-robot k8s-github-robot merged commit a777a8e into kubernetes:master Feb 4, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants