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

Bug 1783585: CRI-O: Set conmon_cgroup to "pod" #1296

Merged
merged 1 commit into from Dec 6, 2019

Conversation

umohnani8
Copy link
Contributor

Upstream cri-o has moved to set the conmon-cgroup to system.slice
by default. But we want the conmon cgroup to be under the pod by
default in OpenShift. So explicitly setting it here in the MCO
templates for crio.conf

Signed-off-by: Urvashi Mohnani umohnani@redhat.com

- What I did

- How to verify it

- Description for the changelog

Upstream cri-o has moved to set the conmon-cgroup to system.slice
by default. But we want the conmon cgroup to be under the pod by
default in OpenShift. So explicitly setting it here in the MCO
templates for crio.conf

Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Dec 2, 2019
@umohnani8
Copy link
Contributor Author

@mrunalp @haircommander @runcom PTAL

@umohnani8
Copy link
Contributor Author

/retest

@kikisdeliveryservice kikisdeliveryservice requested review from kikisdeliveryservice and runcom and removed request for LorbusChris December 2, 2019 18:11
@kikisdeliveryservice
Copy link
Contributor

/skip

@kikisdeliveryservice
Copy link
Contributor

/retest

@haircommander
Copy link
Member

/lgtm
@mrunalp or @runcom needs to approve methinks

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 2, 2019
@umohnani8
Copy link
Contributor Author

/retest

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Dec 3, 2019

@umohnani8: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/prow/e2e-aws-scaleup-rhel7 8b05346 link /test e2e-aws-scaleup-rhel7

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.

@kikisdeliveryservice
Copy link
Contributor

/test e2e-aws

@kikisdeliveryservice kikisdeliveryservice changed the title Set conmon_cgroup to "pod" CRI-O: Set conmon_cgroup to "pod" Dec 4, 2019
@kikisdeliveryservice
Copy link
Contributor

/test e2e-gcp-op

@mrunalp
Copy link
Member

mrunalp commented Dec 5, 2019

/approve

Copy link
Contributor

@kikisdeliveryservice kikisdeliveryservice left a comment

Choose a reason for hiding this comment

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

Approved on behalf of @mrunalp 😸

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, kikisdeliveryservice, mrunalp, umohnani8

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [kikisdeliveryservice]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 5, 2019
@openshift-merge-robot openshift-merge-robot merged commit a3f3b29 into openshift:master Dec 6, 2019
@LorbusChris
Copy link
Member

/cherry-pick fcos

@openshift-cherrypick-robot

@LorbusChris: new pull request created: #1308

In response to this:

/cherry-pick fcos

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.

@rphillips
Copy link
Contributor

/cherrypick release-4.3

@openshift-cherrypick-robot

@rphillips: new pull request created: #1344

In response to this:

/cherrypick release-4.3

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.

@rphillips
Copy link
Contributor

/retitle Bug 1783585: CRI-O: Set conmon_cgroup to "pod"

@openshift-ci-robot openshift-ci-robot changed the title CRI-O: Set conmon_cgroup to "pod" Bug 1783585: CRI-O: Set conmon_cgroup to "pod" Dec 13, 2019
@openshift-ci-robot
Copy link
Contributor

@umohnani8: All pull requests linked via external trackers have merged. Bugzilla bug 1783585 has been moved to the MODIFIED state.

In response to this:

Bug 1783585: CRI-O: Set conmon_cgroup to "pod"

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.

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. lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

10 participants