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

Cherry pick of #106164 and #104705 on release-1.22 #107580

Merged
merged 2 commits into from Jan 26, 2022
Merged

Cherry pick of #106164 and #104705 on release-1.22 #107580

merged 2 commits into from Jan 26, 2022

Conversation

nilo19
Copy link
Member

@nilo19 nilo19 commented Jan 15, 2022 •
edited by liggitt

Cherry pick of #106164 and #104705 on release-1.22.

#106164: fix: remove outdated ipv4 route when the corresponding node
#104705: fix: ignore the case when comparing azure tags in service annotation

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

fix a 1.21 regression: remove outdated ipv4 route when the corresponding node is deleted; 
fix: ignore the case when comparing azure tags in service annotation (azure)

@k8s-ci-robot k8s-ci-robot added this to the v1.22 milestone Jan 15, 2022
@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/M Denotes a PR that changes 30-99 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 Jan 15, 2022
@k8s-ci-robot k8s-ci-robot added area/cloudprovider sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jan 15, 2022
@nilo19
Copy link
Member Author

nilo19 commented Jan 15, 2022

/priority critical-urgent
/triage accepted
/sig cloud-provider
/area provider/azure
cc @feiskyer

@k8s-ci-robot k8s-ci-robot added priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. triage/accepted Indicates an issue or PR is ready to be actively worked on. area/provider/azure Issues or PRs related to azure provider and removed 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 Jan 15, 2022
@nilo19
Copy link
Member Author

nilo19 commented Jan 15, 2022

/kind bug

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. and removed do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Jan 15, 2022
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 15, 2022
@nilo19 nilo19 changed the title Automated cherry pick of #106164: fix: remove outdated ipv4 route when the corresponding node Cherry pick of #106164 and #104705 on release-1.22 Jan 15, 2022
@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 Jan 15, 2022
feiskyer
feiskyer approved these changes Jan 16, 2022
View reviewed changes
Copy link
Member

@feiskyer feiskyer left a comment

Choose a reason for hiding this comment

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

/lgtm
/assign @andrewsykim

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 16, 2022
andrewsykim
andrewsykim reviewed Jan 18, 2022
View reviewed changes
Copy link
Member

@andrewsykim andrewsykim left a comment

Choose a reason for hiding this comment

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

/approve

ack'ing that this is a bug fix

We should probaly separate the cherry-picks into separate PRs but will defer to release leads on that one

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andrewsykim, feiskyer, nilo19

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 Jan 18, 2022
@bridgetkromhout
Copy link
Member

/cc kubernetes/release-managers

@k8s-ci-robot k8s-ci-robot requested a review from a team January 18, 2022 02:54
@puerco
Copy link
Member

puerco commented Jan 25, 2022

Thanks @nilo19 !
Yes like @andrewsykim said, it is easier for us to have the CPs separate, as we can check the matching sets more easily.

Anyway, thanks for handling this!
/lgtm

@puerco puerco added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jan 25, 2022
@bridgetkromhout
Copy link
Member

bridgetkromhout commented Jan 25, 2022 •
edited

@puerco I thought that your addition of the cherry-pick-approved label would cause the bot to remove the "do not merge" - can you please check and fix if needed? Thanks!

@puerco
Copy link
Member

puerco commented Jan 25, 2022

@bridgetkromhout , yup I think we have a little race somewhere and this sometimes happens.
Thanks for the ping it had fallen off my radar!

@puerco puerco removed the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jan 25, 2022
@nilo19
Copy link
Member Author

nilo19 commented Jan 26, 2022

@puerco #104705 is based on #106164. It would take a lot more time to fix if separated into two PRs.

@puerco puerco added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jan 26, 2022
@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 Jan 26, 2022
@puerco
Copy link
Member

puerco commented Jan 26, 2022

@nilo19 , yeah no problem. When it makes more sense send them together and we'll review it 👍 :)

@k8s-ci-robot k8s-ci-robot merged commit de17b6f into kubernetes:release-1.22 Jan 26, 2022
@liggitt liggitt added the kind/regression Categorizes issue or PR as related to a regression from a prior release. label Apr 27, 2022
@liggitt liggitt removed the kind/regression Categorizes issue or PR as related to a regression from a prior release. label Sep 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andrewsykim andrewsykim andrewsykim left review comments

@feiskyer feiskyer feiskyer approved these changes

@karataliu karataliu Awaiting requested review from karataliu

@ritazh ritazh Awaiting requested review from ritazh

Assignees

@feiskyer feiskyer

@puerco puerco

@andrewsykim andrewsykim

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/cloudprovider area/provider/azure Issues or PRs related to azure provider 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/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
v1.22
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@nilo19 @k8s-ci-robot @bridgetkromhout @puerco @feiskyer @andrewsykim @liggitt