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 #88505: Honor status.podIP over status.podIPs and node.spec.podCIDR over node.spec.PodCIDRs when mismatched #88507

Merged
merged 1 commit into from Mar 9, 2020
Merged

Automated cherry pick of #88505: Honor status.podIP over status.podIPs and node.spec.podCIDR over node.spec.PodCIDRs when mismatched #88507

merged 1 commit into from Mar 9, 2020

Conversation

liggitt
Copy link
Member

@liggitt liggitt commented Feb 25, 2020

Cherry pick of #88505 on release-1.16.

#88505: Honor status.podIP over status.podIPs

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

@k8s-ci-robot k8s-ci-robot added this to the v1.16 milestone Feb 25, 2020
@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. 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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Feb 25, 2020
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. sig/apps Categorizes an issue or PR as relevant to SIG Apps. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Feb 25, 2020
@tpepper
Copy link
Member

tpepper commented Feb 27, 2020

/kind bug
/kind api-change
/priority critical-urgent
from master PR (not yet merged to master)

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. 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. labels Feb 27, 2020
@tpepper
Copy link
Member

tpepper commented Feb 27, 2020

/hold
pending master clarification to avoid drive-by lgtm

@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 Feb 27, 2020
@liggitt liggitt force-pushed the automated-cherry-pick-of-#88505-upstream-release-1.16 branch from 4c5aab4 to ae24427 Compare March 2, 2020 19:42
@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 Mar 2, 2020
@liggitt liggitt requested review from khenidak and thockin and removed request for zmerlynn and deads2k March 2, 2020 19:44
@liggitt liggitt changed the title Automated cherry pick of #88505: Honor status.podIP over status.podIPs Automated cherry pick of #88505: Honor status.podIP over status.podIPs and node.spec.podCIDR over node.spec.PodCIDRs when mismatched Mar 2, 2020
@liggitt liggitt mentioned this pull request Mar 2, 2020
Merged
@liggitt
Copy link
Member Author

liggitt commented Mar 2, 2020

/test pull-kubernetes-e2e-gce-alpha-features

@liggitt
Copy link
Member Author

liggitt commented Mar 2, 2020

/retest

@liggitt
Copy link
Member Author

liggitt commented Mar 3, 2020

master PR is merged
/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 Mar 3, 2020
@aojea
Copy link
Member

aojea commented Mar 3, 2020

master PR is merged

/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 3, 2020
@thockin
Copy link
Member

thockin commented Mar 3, 2020

Thanks!

/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: liggitt, thockin

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

@liggitt
Copy link
Member Author

liggitt commented Mar 5, 2020

@kubernetes/patch-release-team this is ready

@tpepper tpepper added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Mar 9, 2020
@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 Mar 9, 2020
@k8s-ci-robot k8s-ci-robot merged commit ef2f47e into kubernetes:release-1.16 Mar 9, 2020
@liggitt liggitt deleted the automated-cherry-pick-of-#88505-upstream-release-1.16 branch March 10, 2020 02:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@khenidak khenidak Awaiting requested review from khenidak

@thockin thockin Awaiting requested review from thockin

Assignees

@thockin thockin

@aojea aojea

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/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API 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. sig/apps Categorizes an issue or PR as relevant to SIG Apps. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.16
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@liggitt @tpepper @aojea @thockin @k8s-ci-robot