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

Revert the npd change in kubemark. #41716

Merged
merged 1 commit into from
Feb 19, 2017
Merged

Revert the npd change in kubemark. #41716

merged 1 commit into from
Feb 19, 2017

Conversation

Random-Liu
Copy link
Member

@Random-Liu Random-Liu commented Feb 19, 2017 •
edited

This PR reverted #41703 and partially reverted #40206.

This PR changes kubemark back to use the original npd image gcr.io/google_containers/node-problem-detector:v0.3.0-alpha.0.

Will retry the change after #41713 is resolved.

@foxish @shyamjvs @wojtek-t

@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

The following people have approved this PR: Random-Liu

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

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

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Feb 19, 2017
@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 Feb 19, 2017
@Random-Liu Random-Liu added release-note-none Denotes a PR that doesn't merit a release note. sig/scalability Categorizes an issue or PR as relevant to SIG Scalability. and removed release-note-label-needed labels Feb 19, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@Random-Liu
Copy link
Member Author

Random-Liu commented Feb 19, 2017 •
edited

@foxish This reverted #41703 and partially reverted #40206. Actually you can compare it with the original PR line by line.

Let's wait for the test result.

@Random-Liu Random-Liu mentioned this pull request Feb 19, 2017
Closed
@foxish
Copy link
Contributor

foxish commented Feb 19, 2017

/lgtm
Merging

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 19, 2017
@foxish foxish merged commit 3a73d23 into kubernetes:master Feb 19, 2017
@Random-Liu Random-Liu deleted the revert-kubemark-npd-change branch February 19, 2017 19:46
@Random-Liu Random-Liu mentioned this pull request Mar 3, 2017
Merged
k8s-github-robot pushed a commit that referenced this pull request Mar 4, 2017
Merge pull request #42456 from Random-Liu/update-npd-in-kubemark
c6d9d9c 
Automatic merge from submit-queue (batch tested with PRs 42456, 42457, 42414, 42480, 42370)

Update npd in kubemark since #42201 is merged.

Revert #41716.

#42201 has been merged, and #41713 is fixed. Now we could retry update npd in kubemark.

/cc @shyamjvs @wojtek-t @dchen1107
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@foxish foxish

@gmarek gmarek

Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. 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. sig/scalability Categorizes an issue or PR as relevant to SIG Scalability. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@Random-Liu @k8s-github-robot @k8s-reviewable @foxish @gmarek @k8s-ci-robot