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.

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

Fix subnet annotation checking for Azure internal loadbalancer #74498

Merged
merged 1 commit into from Feb 26, 2019

Conversation

@feiskyer
Copy link
Member

feiskyer commented Feb 25, 2019

What type of PR is this?

Uncomment only one /kind <> line, hit enter to put that in a new line, and remove leading whitespaces from that line:

/kind api-change
/kind bug
/kind cleanup
/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake

What this PR does / why we need it:

Fix subnet annotation checking for Azure internal loadbalancer. When the annotation is set with empty string, return nil instead in subet(), so that default subnet configured in cloud provider config file would be used.

More unit tests are also added for this function.

Which issue(s) this PR fixes:

Fixes #74497

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

Fix subnet annotation checking for Azure internal loadbalancer

/priority important-soon
/sig azure
/assign @andyzhangx @khenidak

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Feb 25, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: feiskyer

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

@feiskyer

This comment has been minimized.

Copy link
Member Author

feiskyer commented Feb 25, 2019

/retest

@feiskyer

This comment has been minimized.

Copy link
Member Author

feiskyer commented Feb 26, 2019

cc @andyzhangx PTAL

@@ -1538,7 +1538,7 @@ func requiresInternalLoadBalancer(service *v1.Service) bool {

func subnet(service *v1.Service) *string {
if requiresInternalLoadBalancer(service) {
if l, found := service.Annotations[ServiceAnnotationLoadBalancerInternalSubnet]; found {
if l, found := service.Annotations[ServiceAnnotationLoadBalancerInternalSubnet]; found && strings.TrimSpace(l) != "" {

This comment has been minimized.

@andyzhangx

andyzhangx Feb 26, 2019

Member

if it returns pointer to "", code will jump to following, and then still return error:

subnet, existsSubnet, err := az.getSubnet(az.VnetName, *subnetName)

This comment has been minimized.

@feiskyer

feiskyer Feb 26, 2019

Author Member

it won't error if this case, because nil would be returned.

@andyzhangx
Copy link
Member

andyzhangx left a comment

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm label Feb 26, 2019

@k8s-ci-robot k8s-ci-robot merged commit 3c92a6d into kubernetes:master Feb 26, 2019

16 checks passed

cla/linuxfoundation feiskyer authorized
Details
pull-kubernetes-bazel-build Job succeeded.
Details
pull-kubernetes-bazel-test Job succeeded.
Details
pull-kubernetes-cross Skipped.
pull-kubernetes-e2e-gce Job succeeded.
Details
pull-kubernetes-e2e-gce-100-performance Job succeeded.
Details
pull-kubernetes-e2e-gce-device-plugin-gpu Job succeeded.
Details
pull-kubernetes-godeps Skipped.
pull-kubernetes-integration Job succeeded.
Details
pull-kubernetes-kubemark-e2e-gce-big Job succeeded.
Details
pull-kubernetes-local-e2e Skipped.
pull-kubernetes-node-e2e Job succeeded.
Details
pull-kubernetes-typecheck Job succeeded.
Details
pull-kubernetes-verify Job succeeded.
Details
pull-publishing-bot-validate Skipped.
tide In merge pool.
Details

@feiskyer feiskyer deleted the feiskyer:fix-subnet branch Feb 26, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.