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

Replace IPPool with IPAddressAllocation API to Claim Pod CIDR in the VPC network #1152

Merged
merged 7 commits into from
Aug 26, 2024
Merged

Replace IPPool with IPAddressAllocation API to Claim Pod CIDR in the VPC network #1152

merged 7 commits into from
Aug 26, 2024

Conversation

DanielXiao
Copy link
Collaborator

@DanielXiao DanielXiao commented Jul 22, 2024 •
edited
Loading

IPAddressAllocation is the new API in nsx-operator for claiming a CIDR in the VPC network. The original IPPool API can not claim Public type IP addresses. Introduce NSXIPManager interface to claim and release a CIDR for a Node. T1 and VPC implementations use different nsx-operator APIs to claim IPs.

What this PR does / why we need it:

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

Special notes for your reviewer:

Release note:

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 22, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: DanielXiao

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 Jul 22, 2024
@k8s-ci-robot k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Jul 22, 2024
@DanielXiao DanielXiao force-pushed the ipaddressallocation branch from 14eb58b to 64f6558 Compare July 23, 2024 01:55
@XudongLiuHarold
Copy link
Member

/hold

This will be merged after our 1.31 release

@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 Jul 23, 2024
XudongLiuHarold
XudongLiuHarold reviewed Aug 12, 2024
View reviewed changes
pkg/cloudprovider/vsphereparavirtual/controllers/routablepod/core.go Show resolved Hide resolved
...ereparavirtual/controllers/routablepod/ipaddressallocation/ipaddressallocation_controller.go Outdated Show resolved Hide resolved
...ereparavirtual/controllers/routablepod/ipaddressallocation/ipaddressallocation_controller.go Outdated Show resolved Hide resolved
pkg/cloudprovider/vsphereparavirtual/controllers/routablepod/node/node_controller.go Show resolved Hide resolved
pkg/cloudprovider/vsphereparavirtual/ippoolmanager/v1alpha2/ippoolmanager.go Outdated Show resolved Hide resolved
pkg/cloudprovider/vsphereparavirtual/nsxipmanager/nsx_vpc.go Outdated Show resolved Hide resolved
pkg/cloudprovider/vsphereparavirtual/nsxipmanager/nsx_vpc.go Outdated Show resolved Hide resolved
@DanielXiao DanielXiao force-pushed the ipaddressallocation branch 2 times, most recently from e59f679 to 1c0df4f Compare August 15, 2024 03:19
@XudongLiuHarold
Copy link
Member

XudongLiuHarold commented Aug 15, 2024 •
edited
Loading

/hold cancel

We will try to merge this one since 1.31 is out

@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 Aug 15, 2024
@DanielXiao DanielXiao force-pushed the ipaddressallocation branch from 4ab2964 to a17ec68 Compare August 16, 2024 06:38
@k8s-infra-cherrypick-robot
Copy link

@XudongLiuHarold: once the present PR merges, I will cherry-pick it on top of release-1.30 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.30

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@XudongLiuHarold
Copy link
Member

/cherry-pick release-1.31

@k8s-infra-cherrypick-robot
Copy link

@XudongLiuHarold: once the present PR merges, I will cherry-pick it on top of release-1.31 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.31

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@XudongLiuHarold
Copy link
Member

/lgtm

Wait for the test result to merge this PR

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 20, 2024
@XudongLiuHarold
Copy link
Member

/hold

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Aug 20, 2024
@DanielXiao
Replace IPPool with IPAddressAllocation API to Claim Pod CIDR in the …
8556daa 
…VPC network

IPAddressAllocation is the new API in nsx-operator for claiming a CIDR
in the VPC network. The original IPPool API can not claim Public type
IP addresses. Introduce NSXIPManager interface to claim and release
a CIDR for a Node. T1 and VPC implementation use different nsx-operator
APIs to claim IPs.
@DanielXiao
Update nsx-operator API mod
2df9cac 
There is a CRD group refactor in nsx-operator API, so we need to
update to latest version.
@DanielXiao
Fix IPAddressVisibility type
bdc1c25 
The const is missleading and valid value is External and Private.
@DanielXiao
Fix AllocationSize
f1b8d77 
The size is number of IP addresses not prefix length.
@DanielXiao DanielXiao force-pushed the ipaddressallocation branch from b7dde04 to f1b8d77 Compare August 22, 2024 05:28
XudongLiuHarold
XudongLiuHarold reviewed Aug 26, 2024
View reviewed changes
Copy link
Member

@XudongLiuHarold XudongLiuHarold left a comment

Choose a reason for hiding this comment

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

/hold cancel

/lgtm

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Aug 26, 2024
@XudongLiuHarold
Copy link
Member

e2e test passed here: team-cluster-api#26

@k8s-ci-robot k8s-ci-robot merged commit 9d1c051 into kubernetes:master Aug 26, 2024
14 checks passed
@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Aug 26, 2024
Merged
@k8s-infra-cherrypick-robot
Copy link

@XudongLiuHarold: new pull request created: #1214

In response to this:

/cherry-pick release-1.31

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

This was referenced Aug 27, 2024
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@XudongLiuHarold XudongLiuHarold XudongLiuHarold left review comments

@divyenpatel divyenpatel Awaiting requested review from divyenpatel

@SandeepPissay SandeepPissay Awaiting requested review from SandeepPissay

@chenlin07 chenlin07 Awaiting requested review from chenlin07

Assignees

@XudongLiuHarold XudongLiuHarold

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@DanielXiao @k8s-ci-robot @XudongLiuHarold @k8s-infra-cherrypick-robot