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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 2 commits into from
Jun 4, 2016
Merged

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

merged 2 commits into from
Jun 4, 2016

Conversation

vishh
Copy link
Contributor

@vishh vishh commented May 31, 2016

@googlebot
Copy link

We found a Contributor License Agreement for you (the sender of this pull request) and all commit authors, but as best as we can tell these commits were authored by someone else. If that's the case, please add them to this pull request and have them confirm that they're okay with these commits being contributed to Google. If we're mistaken and you did author these commits, just reply here to confirm.

@vishh vishh added this to the v1.3 milestone May 31, 2016
@vishh vishh added the release-note-none Denotes a PR that doesn't merit a release note. label May 31, 2016
@vishh vishh mentioned this pull request May 31, 2016
Merged
@k8s-github-robot k8s-github-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label May 31, 2016
derekwaynecarr
derekwaynecarr reviewed May 31, 2016
View reviewed changes
test/e2e_node/environment/setup_host.sh

# Setup systemd if required
sudo mkdir -p /etc/systemd/system.conf.d
Copy link
Member

Choose a reason for hiding this comment

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

is there a reason you dropped the if check here:
https://github.com/kubernetes/kubernetes/pull/26289/files#diff-6cfc24c58556b86ef8ff98e630f74f35R33

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The script is run manually and that's why I did not include any validation. My stack overflowed, and I missed your existing patch for updating this script. You can override this script with #26289.

@derekwaynecarr
Copy link
Member

I am confused why this PR carries my first commit? Doesn't this PR need to merge first?

@googlebot
Copy link

CLAs look good, thanks!

@k8s-github-robot k8s-github-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 31, 2016
@vishh
Copy link
Contributor Author

vishh commented May 31, 2016

@derekwaynecarr Yeah. I did not mean to include your patch in the PR. Removed your commit.

@k8s-github-robot
Copy link

@derekwaynecarr
You must link to the test flake issue which caused you to request this manual re-test.
Re-test requests should be in the form of: k8s-bot test this issue: #<number>
Here is the list of open test flakes.

@derekwaynecarr
Copy link
Member

LGTM @pwittrock - any other comments?

@pwittrock
Copy link
Member

Nope, LGTM

@pwittrock pwittrock added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 3, 2016
@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 3, 2016
vishh added 2 commits June 3, 2016 16:14
@vishh
update attributes on node e2e copy image script
7665120 
Signed-off-by: Vishnu kannan <vishnuk@google.com>
@vishh
update coreos node e2e images to include updated systemd config
82718c1 
Signed-off-by: Vishnu kannan <vishnuk@google.com>
@vishh
Copy link
Contributor Author

vishh commented Jun 3, 2016

Rebased

@k8s-github-robot k8s-github-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 3, 2016
@vishh vishh added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 4, 2016
@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Jun 4, 2016

GCE e2e build/test passed for commit 82718c1.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 5c8dd57 into kubernetes:master Jun 4, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@pwittrock pwittrock

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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.3
Development

Successfully merging this pull request may close these issues.
6 participants
@vishh @googlebot @derekwaynecarr @k8s-github-robot @pwittrock @k8s-bot