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

Automated cherry pick of #118716 upstream release 1.27 #118911

Merged
merged 4 commits into from
Jul 7, 2023
Merged

Automated cherry pick of #118716 upstream release 1.27 #118911

merged 4 commits into from
Jul 7, 2023

Conversation

alculquicondor
Copy link
Member

@alculquicondor alculquicondor commented Jun 27, 2023 •
edited
Loading

What type of PR is this?

/kind bug

What this PR does / why we need it:

Cherry pick of #118716 and #118935

Which issue(s) this PR fixes:

Fixes #118587

Special notes for your reviewer:

Does this PR introduce a user-facing change?

The Daemonset controller creates replacements for terminal Pods, which can appear during VM preemptions or when using Pod finalizers

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

@alculquicondor
Skip terminal Pods with a deletion timestamp from the Daemonset sync
316de2b 
Change-Id: I64a347a87c02ee2bd48be10e6fff380c8c81f742
@alculquicondor
Review comments and fix integration test
ccbe591 
Change-Id: I3eb5ec62bce8b4b150726a1e9b2b517c4e993713
@alculquicondor
Include deleted terminal pods in history
313e1e0 
Change-Id: I8b921157e6be1c809dd59f8035ec259ea4d96301
@k8s-ci-robot k8s-ci-robot added this to the v1.27 milestone Jun 27, 2023
@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. release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. 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. area/test sig/apps Categorizes an issue or PR as relevant to SIG Apps. sig/testing Categorizes an issue or PR as relevant to SIG Testing. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jun 27, 2023
@alculquicondor
Copy link
Member Author

/assign @soltysh

This was referenced Jun 27, 2023
Merged
Merged
soltysh
soltysh approved these changes Jun 28, 2023
View reviewed changes
Copy link
Contributor

@soltysh soltysh left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

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

LGTM label has been added.

Git tree hash: d3088d98d14db311830535d55b38879a2180fffd

@soltysh
Copy link
Contributor

soltysh commented Jun 28, 2023

/label tide/merge-method-squash
/priority backlog
/triage accepted

@k8s-ci-robot k8s-ci-robot added priority/backlog Higher priority than priority/awaiting-more-evidence. triage/accepted Indicates an issue or PR is ready to be actively worked on. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Jun 28, 2023
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Jun 28, 2023
@alculquicondor
Copy link
Member Author

/cc kubernetes/release-managers

@k8s-ci-robot k8s-ci-robot requested a review from a team June 28, 2023 12:00
@aojea
Copy link
Member

aojea commented Jun 28, 2023

please hold until this was clarified

#118928
/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 Jun 28, 2023
@alculquicondor
Exclude terminal pods from Daemonset e2e tests
3ed66b1 
Change-Id: Ic29ca1739ebdc54822d1751fcd56a99c628021c4
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 30, 2023
@alculquicondor
Copy link
Member Author

Cherry-picked #118935 as well

/hold cancel

@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 Jun 30, 2023
@alculquicondor
Copy link
Member Author

/retest

1 similar comment
@alculquicondor
Copy link
Member Author

/retest

soltysh
soltysh approved these changes Jul 6, 2023
View reviewed changes
Copy link
Contributor

@soltysh soltysh 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 k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 6, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: f6bdce1dfb72c816cf5d1fd58ab90626dad9665d

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alculquicondor, soltysh

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

@alculquicondor
Copy link
Member Author

/priority important-soon
/cc kubernetes/release-managers

@k8s-ci-robot k8s-ci-robot added the priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. label Jul 6, 2023
@Verolop Verolop added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jul 7, 2023
@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 Jul 7, 2023
@k8s-ci-robot k8s-ci-robot merged commit c655001 into kubernetes:release-1.27 Jul 7, 2023
11 checks passed
@soltysh soltysh mentioned this pull request Aug 8, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@soltysh soltysh soltysh approved these changes

@atiratree atiratree Awaiting requested review from atiratree

@lavalamp lavalamp Awaiting requested review from lavalamp

Assignees

@soltysh soltysh

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/test 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/backlog Higher priority than priority/awaiting-more-evidence. 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/apps Categorizes an issue or PR as relevant to SIG Apps. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
v1.27
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@alculquicondor @k8s-ci-robot @soltysh @aojea @Verolop