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

Enable node e2e accounting on systemd #26289

Merged

Conversation

derekwaynecarr
Copy link
Member

Updated the e2e setup.sh script to enable cpu and memory accounting.

Related to #26198

/cc @pwittrock

@k8s-github-robot k8s-github-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. release-note-label-needed labels May 25, 2016
@derekwaynecarr
Copy link
Member Author

@pwittrock - i don't quite know when in the flow or if this script is invoked or not to know how to respond to the pr checks... please assist.

@derekwaynecarr derekwaynecarr added this to the v1.3 milestone May 25, 2016
@derekwaynecarr derekwaynecarr added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-label-needed labels May 25, 2016
# tested rhel 7 (3.10.0-229.7.2.el7.x86_64) using systemd 219
if [ -d /etc/systemd ]; then
sudo mkdir -p /etc/systemd/system.conf.d/
sudo cat <<EOF >/etc/systemd/system.conf.d/kubernetes-accounting.conf
Copy link
Member Author

Choose a reason for hiding this comment

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

@ingvagabund on rhel 7 with systemd 219, i had to use the above path.

@pwittrock
Copy link
Member

This script is only invoked manually as part of the manual process of creating an image. Your changes should not have caused any failures. These are most likely flakes.

@pwittrock
Copy link
Member

@k8s-bot e2e test this issue: #26270

@pwittrock
Copy link
Member

@k8s-bot node e2e test this issue: #25993

@pwittrock pwittrock assigned pwittrock and unassigned fejta May 25, 2016
@pwittrock
Copy link
Member

@derekwaynecarr If you have not already, the best way to test that this script does what you want is to create a new rhel host, run the script on the pristine host and then run the node e2e test suite against that host using the comment in e2e-node-jenkins.sh with your *.properties file (copied from the template.properties)

@pwittrock
Copy link
Member

@derekwaynecarr Let me know if you are satisfied with any testing you have done using this script to setup the rhel host.

@derekwaynecarr
Copy link
Member Author

@pwittrock - I was out of office most of yesterday, testing this now on GCE vanilla rhel 7 image.

@pwittrock
Copy link
Member

@derekwaynecarr SGTM. Wanted to make sure I wasn't blocking you.

Install docker from RHEL repo on RHEL
@k8s-github-robot k8s-github-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 27, 2016
@derekwaynecarr
Copy link
Member Author

  • Tested script on rhel, centos, debian jessie
  • Updated how docker is installed on RHEL to use RHEL packages

/cc @pwittrock @vishh

@vishh
Copy link
Contributor

vishh commented May 27, 2016

@pwittrock @derekwaynecarr Are we adding RHEL and CentOS nodes to our node test pool?

@pwittrock
Copy link
Member

We should if this makes it so they pass consistently.

@derekwaynecarr
Copy link
Member Author

derekwaynecarr commented May 31, 2016

@pwittrock @vishh - I don't know what test pools you run internally, but the goal here was to just get the script updated to enable accounting globally however you guys setup the base images. If you run this script on any systemd system, it should do the right thing for you and let us unblock other PRs.

CI stack for Red Hat stuff can be invoked on a per PR basis by just saying:

@redhat-k8s-bot test this (if the pr is labeled team/node)

@pwittrock pwittrock added e2e-not-required lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Jun 1, 2016
@pwittrock pwittrock removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 1, 2016
@pwittrock
Copy link
Member

I am going to setup an instance with this script, and then lgtm it

@pwittrock
Copy link
Member

@derekwaynecarr I tried to verify this today but ran into some trouble. Will pick it up again tomorrow.

@pwittrock pwittrock added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 2, 2016
@k8s-github-robot
Copy link

@k8s-bot test this

Tests are more than 96 hours old. Re-running tests.

@pwittrock
Copy link
Member

@k8s-bot e2e test this issue: #26210

artifacts

@k8s-bot
Copy link

k8s-bot commented Jun 2, 2016

GCE e2e build/test failed for commit 67493aa.

Please reference the list of currently known flakes when examining this failure. If you request a re-test, you must reference the issue describing the flake.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit c114f32 into kubernetes:master Jun 2, 2016
k8s-github-robot pushed a commit that referenced this pull request Jun 4, 2016
Automatic merge from submit-queue

Update Node e2e Core OS image to run systemd with CPU & Memory accounting enabled by default

cc @derekwaynecarr 

For #26289
k8s-github-robot pushed a commit that referenced this pull request Jun 11, 2016
Automatic merge from submit-queue

Fix system container detection

```release-note
Fix system container detection in kubelet on systemd.

This fixed environments where CPU and Memory Accounting were not enabled on the unit 
that launched the kubelet or docker from reporting the root cgroup when 
monitoring usage stats for those components.
```

Fixes #25909

/cc @vishh @ncdc @eparis @wojtek-t - this reverts the revert #26478

This should merge when node e2e setups were updated per #26289
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. 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.

7 participants