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 #62172: When using custom network with IP-alias, use the former's #62193: Fix IP-alias subnet creation logic #62398: Fix subnet cleanup logic when using IP-aliases with custom #62847

Merged
merged 3 commits into from
Apr 19, 2018
Merged

Automated cherry pick of #62172: When using custom network with IP-alias, use the former's #62193: Fix IP-alias subnet creation logic #62398: Fix subnet cleanup logic when using IP-aliases with custom #62847

merged 3 commits into from
Apr 19, 2018

Conversation

shyamjvs
Copy link
Member

@shyamjvs shyamjvs commented Apr 19, 2018 •
edited
Loading

Cherry pick of #62172 #62193 #62398 on release-1.10.

#62172: When using custom network with IP-alias, use the former's
#62193: Fix IP-alias subnet creation logic
#62398: Fix subnet cleanup logic when using IP-aliases with custom

NONE

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Apr 19, 2018
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Apr 19, 2018
@k8s-github-robot k8s-github-robot added the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Apr 19, 2018
@shyamjvs
Copy link
Member Author

This are fixes required to make (ip-alias + custom subnet) combination work for clusters.

/cc @wojtek-t

@k8s-ci-robot k8s-ci-robot requested a review from wojtek-t April 19, 2018 13:03
@shyamjvs shyamjvs added this to the v1.10 milestone Apr 19, 2018
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Apr 19, 2018
@shyamjvs shyamjvs added kind/bug Categorizes issue or PR as related to a bug. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. and removed milestone/incomplete-labels labels Apr 19, 2018
@k8s-github-robot
Copy link

[MILESTONENOTIFIER] Milestone Pull Request Needs Approval

@MaciekPytel @shyamjvs @wojtek-t @kubernetes/sig-cluster-lifecycle-misc

Action required: This pull request must have the status/approved-for-milestone label applied by a SIG maintainer.

Pull Request Labels
  • sig/cluster-lifecycle: Pull Request will be escalated to these SIGs if needed.
  • priority/critical-urgent: Never automatically move pull request out of a release milestone; continually escalate to contributor and SIG through all available channels.
  • kind/bug: Fixes a bug discovered during the current release.
Help

@wojtek-t
Copy link
Member

/lgtm
/approve no-issue

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: shyamjvs, wojtek-t

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 Apr 19, 2018
@shyamjvs
Copy link
Member Author

@wojtek-t Maybe we should apply the cherrypick to get this merged soon for fixing presubmits?

@shyamjvs
Copy link
Member Author

Or wait for Maciek to wake up in the US timezone :)

@MaciekPytel MaciekPytel 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 19, 2018
@MaciekPytel
Copy link
Contributor

@shyamjvs This PR is first in submit queue and we're not rushing for patch release (yet), so we can just wait for it to get merged.

@MaciekPytel
Copy link
Contributor

/retest

@k8s-github-robot
Copy link

Automatic merge from submit-queue.

@k8s-github-robot k8s-github-robot merged commit 760f0f6 into kubernetes:release-1.10 Apr 19, 2018
@shyamjvs shyamjvs mentioned this pull request Apr 19, 2018
Merged
@shyamjvs shyamjvs deleted the automated-cherry-pick-of-#62172-#62193-#62398-upstream-release-1.10 branch April 19, 2018 19:16
@cblecker cblecker mentioned this pull request Apr 20, 2018
Merged
@shyamjvs shyamjvs mentioned this pull request Apr 23, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wojtek-t wojtek-t Awaiting requested review from wojtek-t

Assignees

@MaciekPytel MaciekPytel

@wojtek-t wojtek-t

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. milestone/needs-approval priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. release-note-none Denotes a PR that doesn't merit a release note. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.10
Development

Successfully merging this pull request may close these issues.
5 participants
@shyamjvs @k8s-github-robot @wojtek-t @k8s-ci-robot @MaciekPytel