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

[1.11] Automated cherry pick of #75144: kubelet: updated logic of verifying a static critical pod #74996

Merged
merged 1 commit into from Apr 1, 2019
Merged

[1.11] Automated cherry pick of #75144: kubelet: updated logic of verifying a static critical pod #74996

merged 1 commit into from Apr 1, 2019

Conversation

Huang-Wei
Copy link
Member

@Huang-Wei Huang-Wei commented Mar 5, 2019 •
edited

Cherry pick of #75144 on release-1.11.

#75144: kubelet: updated logic of verifying a static critical pod

@k8s-ci-robot k8s-ci-robot added do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Mar 5, 2019
@Huang-Wei Huang-Wei changed the title Automated cherry pick of #74222: kubelet: return mirror pod in GetActivePods() [1.11] Automated cherry pick of #74222: kubelet: return mirror pod in GetActivePods() Mar 5, 2019
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 5, 2019
@Huang-Wei
Copy link
Member Author

/kind bug
/priority important-soon
/sig node

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. sig/node Categorizes an issue or PR as relevant to SIG Node. and removed needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Mar 5, 2019
@Huang-Wei Huang-Wei force-pushed the automated-cherry-pick-of-#74222-upstream-release-1.11 branch 3 times, most recently from ff6c559 to 9df175b Compare March 5, 2019 22:38
@Huang-Wei
Copy link
Member Author

/assign @derekwaynecarr
for approval

/assign @feiskyer
for 1.11 patch release

@Huang-Wei Huang-Wei mentioned this pull request Mar 6, 2019
Closed
@Huang-Wei
Copy link
Member Author

/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 7, 2019
@Huang-Wei Huang-Wei force-pushed the automated-cherry-pick-of-#74222-upstream-release-1.11 branch from 9df175b to 4edc2ad Compare March 15, 2019 08:30
@Huang-Wei Huang-Wei changed the title [1.11] Automated cherry pick of #74222: kubelet: return mirror pod in GetActivePods() [1.11] Automated cherry pick of #75144: kubelet: updated logic of verifying a static critical pod Mar 15, 2019
@Huang-Wei
Copy link
Member Author

/retest

@Huang-Wei Huang-Wei force-pushed the automated-cherry-pick-of-#74222-upstream-release-1.11 branch 2 times, most recently from f292610 to dd30816 Compare March 15, 2019 20:40
@Huang-Wei
kubelet: updated logic of verifying a static critical pod
416a76f 
- check if a pod is static by its static pod info
- meanwhile, check if a pod is critical by its corresponding mirror pod info
@Huang-Wei Huang-Wei force-pushed the automated-cherry-pick-of-#74222-upstream-release-1.11 branch from dd30816 to 416a76f Compare March 15, 2019 20:45
@Huang-Wei
Copy link
Member Author

/retest

@Huang-Wei
Copy link
Member Author

/hold cancel

Good to be merged now.

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 16, 2019
@Huang-Wei
Copy link
Member Author

@derekwaynecarr could you help to /approve? @feiskyer wants to include this in upcoming 1.11 release. Thanks!

@derekwaynecarr
Copy link
Member

/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 21, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: derekwaynecarr, Huang-Wei

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:

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 21, 2019
@foxish foxish added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Apr 1, 2019
@foxish foxish added this to the v1.11 milestone Apr 1, 2019
@k8s-ci-robot k8s-ci-robot merged commit dd668fc into kubernetes:release-1.11 Apr 1, 2019
@Huang-Wei Huang-Wei deleted the automated-cherry-pick-of-#74222-upstream-release-1.11 branch April 23, 2019 22:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dchen1107 dchen1107 Awaiting requested review from dchen1107

@ncdc ncdc Awaiting requested review from ncdc

Assignees

@feiskyer feiskyer

@derekwaynecarr derekwaynecarr

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. sig/node Categorizes an issue or PR as relevant to SIG Node. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.11
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@Huang-Wei @derekwaynecarr @k8s-ci-robot @feiskyer @foxish