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

Fix dind compatibility with centos/rhel #6543

Merged
merged 1 commit into from
Jan 8, 2016

Conversation

marun
Copy link
Contributor

@marun marun commented Jan 5, 2016

Kubelet's cgroup manipulation of the dind daemon is not compatible with
centos/rhel. This change disables the offending cgroup manipulation
when the kubelet is running with dind.

@openshift-bot
Copy link
Contributor

Evaluated for origin testonlyextended up to f423c67

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/testonlyextended SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin/8191/) (Extended Tests: networking)

@marun
Copy link
Contributor Author

marun commented Jan 6, 2016

cc: @mrunalp

@marun
Copy link
Contributor Author

marun commented Jan 6, 2016

[test][extended:core]

Kubelet's cgroup manipulation of the dind daemon is not compatible with
centos/rhel.  This change disables the offending cgroup manipulation
when the kubelet is running with dind.
@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 04ca9d5

@marun
Copy link
Contributor Author

marun commented Jan 7, 2016

cc: @eparis @rajatchopra @pravisankar @danmcp

Please prioritize getting this merged. As per the testonlyextended SUCCESS from a couple of days ago, this change enables pre-merge execution of the networking extended tests.

@eparis
Copy link
Member

eparis commented Jan 7, 2016

[merge] this only touches the dind testing stuff.

//
// TODO(marun) Make dind cgroups compatible with openshift
// This workaround should become unnecessary once user namespaces
if value := cmdutil.Env("OPENSHIFT_DIND", ""); value == "true" {
Copy link
Contributor

Choose a reason for hiding this comment

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

we should back out this change. Env vars shouldn't be part of the input to building runtime config from serialized config... it makes config non-deterministic

Copy link
Member

Choose a reason for hiding this comment

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

that's a fair request, can you open an issue

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't think this should be backed out without an alternate solution, since it is required for networking ci to prevent regressions. What alternative approach to disabling the kubelet's broken cgroup manipulation would you suggest?

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin/8280/) (Extended Tests: core)

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_requests_origin/4562/) (Image: devenv-rhel7_3099)

@eparis
Copy link
Member

eparis commented Jan 8, 2016

[merge] flake flake flake flake flake

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 04ca9d5

openshift-bot pushed a commit that referenced this pull request Jan 8, 2016
@openshift-bot openshift-bot merged commit ec81918 into openshift:master Jan 8, 2016
@marun marun deleted the dind-rhel-compat branch January 8, 2016 21:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants