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

Jump to bottom

Automated cherry pick of #101093: Fix startupProbe behaviour changed #101226

Merged
merged 2 commits into from Apr 28, 2021
Merged

Automated cherry pick of #101093: Fix startupProbe behaviour changed #101226

merged 2 commits into from Apr 28, 2021

Conversation

wzshiming
Copy link
Member

@wzshiming wzshiming commented Apr 19, 2021 •
edited by liggitt

Cherry pick of #101093 on release-1.18.

#101093: Fix startupProbe behaviour changed

For details on the cherry pick process, see the cherry pick requests page.

Fixed a regression in 1.18.18 where startupProbe stopped working after a container's first restart

@wzshiming
Fix test
f521904 
Signed-off-by: Shiming Zhang <wzshiming@foxmail.com>
@wzshiming
Fix startupProbe behaviour changed
0d15405 
Signed-off-by: Shiming Zhang <wzshiming@foxmail.com>
@k8s-ci-robot k8s-ci-robot added this to the v1.18 milestone Apr 19, 2021
@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/S Denotes a PR that changes 10-29 lines, ignoring generated files. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Apr 19, 2021
@wzshiming wzshiming changed the title Automated cherry pick of #101093: Fix test Automated cherry pick of #101093: Fix startupProbe behaviour changed Apr 19, 2021
@k8s-ci-robot k8s-ci-robot added area/kubelet sig/node Categorizes an issue or PR as relevant to SIG Node. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Apr 19, 2021
@ehashman ehashman added this to Triage in SIG Node PR Triage Apr 19, 2021
@wzshiming wzshiming moved this from Triage to Needs Approver in SIG Node PR Triage Apr 20, 2021
@wzshiming wzshiming moved this from Needs Approver to Triage in SIG Node PR Triage Apr 20, 2021
@matthyx
Copy link
Contributor

matthyx commented Apr 20, 2021

/lgtm
/kind bug
/priority important-soon
/triage accepted

@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. triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed do-not-merge/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-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Apr 20, 2021
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 20, 2021
@ehashman ehashman moved this from Triage to Needs Approver in SIG Node PR Triage Apr 21, 2021
@mrunalp
Copy link
Contributor

mrunalp commented Apr 22, 2021

/approve

@mrunalp mrunalp moved this from Needs Approver to Done in SIG Node PR Triage Apr 22, 2021
@liggitt liggitt added the kind/regression Categorizes issue or PR as related to a regression from a prior release. label Apr 27, 2021
@mrunalp
Copy link
Contributor

mrunalp commented Apr 28, 2021

/approve

@wzshiming wzshiming mentioned this pull request Apr 28, 2021
Closed
@klueska
Copy link
Contributor

klueska commented Apr 28, 2021

/approve

1 similar comment
@sjenning
Copy link
Contributor

/approve

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 28, 2021
hasheddan
hasheddan approved these changes Apr 28, 2021
View reviewed changes
Copy link
Contributor

@hasheddan hasheddan left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hasheddan, klueska, mrunalp, sjenning, wzshiming

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

@hasheddan hasheddan added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Apr 28, 2021
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Apr 28, 2021
@k8s-ci-robot k8s-ci-robot merged commit 84fe7b4 into kubernetes:release-1.18 Apr 28, 2021
@wzshiming wzshiming deleted the automated-cherry-pick-of-#101093-upstream-release-1.18 branch April 29, 2021 07:15
@pacoxu pacoxu mentioned this pull request Jun 24, 2021
Closed
@k8s-ci-robot k8s-ci-robot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Sep 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hasheddan hasheddan hasheddan approved these changes

@dchen1107 dchen1107 Awaiting requested review from dchen1107

@resouer resouer Awaiting requested review from resouer

Assignees

@matthyx matthyx

@hasheddan hasheddan

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubelet 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. kind/regression Categorizes issue or PR as related to a regression from a prior release. 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. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/node Categorizes an issue or PR as relevant to SIG Node. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
SIG Node PR Triage
Done
Milestone
v1.18
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@wzshiming @matthyx @mrunalp @klueska @sjenning @k8s-ci-robot @hasheddan @liggitt