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

Fix ILB subnet discovery to check for VPC as well #895

Merged
merged 1 commit into from
Oct 17, 2019
Merged

Fix ILB subnet discovery to check for VPC as well #895

merged 1 commit into from
Oct 17, 2019

Conversation

spencerhance
Copy link
Contributor

@spencerhance spencerhance commented Oct 17, 2019 •
edited
Loading

Previously, we might accidentally pick a subnet in another VPC
I'm working on unit testing this in another branch. fakeGCE doesn't have a networkURL which makes testing this potentially more complicated.

This will need to be cherry-picked into release-1.7

/assign @MrHohn

@k8s-ci-robot k8s-ci-robot added 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 Oct 17, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @spencerhance. 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 the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Oct 17, 2019
@spencerhance
Copy link
Contributor Author

holding since I am currently verifying in a sandbox
/hold

@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 Oct 17, 2019
@spencerhance
Copy link
Contributor Author

/hold cancel
verified in sandbox

@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 Oct 17, 2019
@MrHohn
Copy link
Member

MrHohn commented Oct 17, 2019

/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 Oct 17, 2019
MrHohn
MrHohn approved these changes Oct 17, 2019
View reviewed changes
Copy link
Member

@MrHohn MrHohn left a comment

Choose a reason for hiding this comment

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

LGTM with a small nit
/approve

pkg/loadbalancers/features/l7ilb.go Outdated
if subnet.Role == "ACTIVE" && subnet.Purpose == "INTERNAL_HTTPS_LOAD_BALANCER" {
sameNetwork, err := isSameNetwork(subnet.Network, cloud.NetworkURL())
if err != nil {
return "", fmt.Errorf("Error comparing subnets: %v", err)
Copy link
Member

Choose a reason for hiding this comment

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

nit: return "", fmt.Errorf("error comparing subnets: %v", err)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 17, 2019
@spencerhance
Fix ILB subnet discovery to check for VPC as well
beb8ce9 
Previously, we might accidentally pick a subnet in another VPC
MrHohn
MrHohn approved these changes Oct 17, 2019
View reviewed changes
Copy link
Member

@MrHohn MrHohn left a comment

Choose a reason for hiding this comment

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

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: MrHohn, spencerhance

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 merged commit bdeebd6 into kubernetes:master Oct 17, 2019
@spencerhance spencerhance mentioned this pull request Oct 17, 2019
Merged
k8s-ci-robot added a commit that referenced this pull request Oct 17, 2019
@k8s-ci-robot
Merge pull request #897 from spencerhance/cherry-pick-895-into-1-7
53e1dab 
Cherry pick #895 into 1 7
@spencerhance spencerhance deleted the ilb-subnet-vpc-fix branch June 29, 2020 22:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MrHohn MrHohn MrHohn approved these changes

@rramkumar1 rramkumar1 Awaiting requested review from rramkumar1

Assignees

@MrHohn MrHohn

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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@spencerhance @k8s-ci-robot @MrHohn