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

Backport CIDR allocator fixes to 1.8 #62041

Merged
merged 1 commit into from
Apr 4, 2018
Merged

Backport CIDR allocator fixes to 1.8 #62041

merged 1 commit into from
Apr 4, 2018
+354 −154

Conversation

satyasm
Copy link
Contributor

@satyasm satyasm commented Apr 2, 2018

What this PR does / why we need it:
Backport of the IPAM allocator enhancements to 1.8 branch.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:
Doing a manual backport as the file structures have changed.

Release note:

Backport of the IPAM allocator enhancements to 1.8 branch.

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. 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. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 2, 2018
@satyasm
Copy link
Contributor Author

satyasm commented Apr 2, 2018

/assign @bowei

@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 2, 2018
@bowei
Copy link
Member

bowei commented Apr 2, 2018

/ok-to-test

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Apr 2, 2018
@bowei
Copy link
Member

bowei commented Apr 2, 2018

/lgtm

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

bowei commented Apr 2, 2018

/approve no-issue

@satyasm
Copy link
Contributor Author

satyasm commented Apr 2, 2018

/assign @jpbetz

can you please help with merging these fixes into the 1.8 branch? thanks!

@satyasm satyasm force-pushed the cloud-cidr-fixes-release-1.8 branch from 9a8807d to 5f166a4 Compare April 2, 2018 22:26
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 2, 2018
@satyasm
Copy link
Contributor Author

satyasm commented Apr 2, 2018

please hold on to this PR till the errors are fixed.

@satyasm satyasm force-pushed the cloud-cidr-fixes-release-1.8 branch from 5f166a4 to 08bdc13 Compare April 2, 2018 23:42
@jpbetz jpbetz 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 2, 2018
@satyasm
Copy link
Contributor Author

satyasm commented Apr 3, 2018 •
edited
Loading

/assign @dchen1107

for approval to backport to 1.8, as recommended by the bot.

@bowei
Copy link
Member

bowei commented Apr 3, 2018

/lgtm

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

bowei commented Apr 3, 2018

/approve no-issue

@jpbetz jpbetz added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 3, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: bowei, satyasm

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

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel comment for consistent failures.

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel comment for consistent failures.

@jpbetz jpbetz added the priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. label Apr 4, 2018
@jpbetz jpbetz merged commit 1df6a83 into kubernetes:release-1.8 Apr 4, 2018
@albertvaka
Copy link

Is this a backport from 1.9? I mean, does 1.9 already include these fixes or only 1.10+?

@satyasm
Copy link
Contributor Author

satyasm commented Apr 13, 2018

the fixes were spread across 1.10 and head. the fixes post 1.10 have been back-ported to 1.10. This is a combined backport of all the fixes as current exists on head.

@albertvaka
Copy link

So 1.9 doesn't have these changes?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dchen1107 dchen1107 Awaiting requested review from dchen1107

@deads2k deads2k Awaiting requested review from deads2k

Assignees

@jpbetz jpbetz

@bowei bowei

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. 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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@satyasm @bowei @k8s-ci-robot @fejta-bot @albertvaka @jpbetz @k8s-github-robot