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

Adding Elastic IP Allocations to NLB API #10872

Merged
merged 4 commits into from
Feb 23, 2021
Merged

Adding Elastic IP Allocations to NLB API #10872

merged 4 commits into from
Feb 23, 2021

Conversation

timothyclarke
Copy link
Contributor

This is an implementation of #10706
This allows (static) Elastic IP's to be added to the external loadbalancer of admin interface.
The Loadbalancer must be Network and Public for this change

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

Hi @timothyclarke. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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/test-infra repository.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Feb 18, 2021
@k8s-ci-robot k8s-ci-robot added area/api area/documentation area/provider/aws Issues or PRs related to aws provider labels Feb 18, 2021
@rifelpet
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Feb 18, 2021
@timothyclarke
Copy link
Contributor Author

Lots of thanks to @rifelpet for helping me get the changes to this point and @codablock for adding a similar change in #10741 which gave me a basis for this.

@timothyclarke
Simplifying conditional per code review comments
1a3c675
@timothyclarke
Revert "Simplifying conditional per code review comments"
d59faa3 
This reverts commit 1a3c675
as it turned an optional feature subnets[0].allocationID into a required one
@timothyclarke
Copy link
Contributor Author

/retest

hakman
hakman reviewed Feb 23, 2021
View reviewed changes
upup/pkg/fi/cloudup/awstasks/network_load_balancer.go
@@ -362,6 +362,12 @@ func (e *NetworkLoadBalancer) Find(c *fi.Context) (*NetworkLoadBalancer, error)
}
sm.PrivateIPv4Address = a.PrivateIPv4Address
}
if a.AllocationId != nil {
if sm.AllocationID != nil {
return nil, fmt.Errorf("NLB has more then one AllocationID per subnet, which is unexpected. This is a bug in kOps, please open a GitHub issue.")
Copy link
Member

Choose a reason for hiding this comment

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

Nit, but nice to fix. Same for above.

Suggested change
return nil, fmt.Errorf("NLB has more then one AllocationID per subnet, which is unexpected. This is a bug in kOps, please open a GitHub issue.")
return nil, fmt.Errorf("NLB has more than one AllocationID per subnet, which is unexpected. This is a bug in kOps, please open a GitHub issue.")

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman

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 Feb 23, 2021
@hakman
Copy link
Member

hakman commented Feb 23, 2021

/assign @rifelpet

@k8s-ci-robot k8s-ci-robot merged commit a424958 into kubernetes:master Feb 23, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.20 milestone Feb 23, 2021
@hakman hakman mentioned this pull request Feb 23, 2021
Merged
k8s-ci-robot added a commit that referenced this pull request Feb 23, 2021
@k8s-ci-robot
Merge pull request #10907 from hakman/automated-cherry-pick-of-#10872…
dee18ce 
…-upstream-release-1.20

Automated cherry pick of #10872: Adding Elastic IP Allocations to NLB API
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bharath-123 bharath-123 bharath-123 left review comments

@hakman hakman hakman approved these changes

@joshbranham joshbranham Awaiting requested review from joshbranham

Assignees

@rifelpet rifelpet

@hakman hakman

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/api area/documentation area/provider/aws Issues or PRs related to aws provider 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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.20
Development

Successfully merging this pull request may close these issues.
5 participants
@timothyclarke @k8s-ci-robot @rifelpet @hakman @bharath-123