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: allow space separated load balancer source ranges #5885

Merged
merged 1 commit into from
Apr 9, 2024

Conversation

jwtty
Copy link
Member

@jwtty jwtty commented Apr 9, 2024

What type of PR is this?

/kind bug

What this PR does / why we need it:

Allow space-separated load balancer source ranges in service annotation. Allow service.beta.kubernetes.io/load-balancer-source-ranges to be used together with service.beta.kubernetes.io/azure-allowed-service-tags.

Which issue(s) this PR fixes:

Fixes #5883

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Allow space-separated load balancer source ranges in service annotation. Allow `service.beta.kubernetes.io/load-balancer-source-ranges` to be used together with `service.beta.kubernetes.io/azure-allowed-service-tags`.

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:


@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Apr 9, 2024
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 9, 2024
Copy link
Contributor

@zarvd zarvd 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
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jwtty, lodrem

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

@MartinForReal
Copy link
Contributor

/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 9, 2024
@k8s-ci-robot k8s-ci-robot merged commit d4f4eb4 into kubernetes-sigs:master Apr 9, 2024
18 checks passed
@jwtty jwtty deleted the lb-src-range branch April 9, 2024 15:25
@jwtty
Copy link
Member Author

jwtty commented Apr 9, 2024

/cherrypick release-1.28

@jwtty
Copy link
Member Author

jwtty commented Apr 9, 2024

/cherrypick release-1.29

@k8s-infra-cherrypick-robot

@jwtty: new pull request created: #5887

In response to this:

/cherry-pick release-1.29

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-infra-cherrypick-robot

@jwtty: #5885 failed to apply on top of branch "release-1.28":

Applying: allow space separated load balancer source ranges
Using index info to reconstruct a base tree...
A	pkg/provider/loadbalancer/configuration.go
A	pkg/provider/loadbalancer/configuration_test.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): pkg/provider/loadbalancer/configuration.go deleted in HEAD and modified in allow space separated load balancer source ranges. Version allow space separated load balancer source ranges of pkg/provider/loadbalancer/configuration.go left in tree.
Auto-merging pkg/provider/loadbalancer/accesscontrol_test.go
CONFLICT (content): Merge conflict in pkg/provider/loadbalancer/accesscontrol_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 allow space separated load balancer source ranges
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-1.28

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-infra-cherrypick-robot

@jwtty: new pull request could not be created: failed to create pull request against kubernetes-sigs/cloud-provider-azure#release-1.29 from head k8s-infra-cherrypick-robot:cherry-pick-5885-to-release-1.29: status code 422 not one of [201], body: {"message":"Validation Failed","errors":[{"resource":"PullRequest","code":"custom","message":"A pull request already exists for k8s-infra-cherrypick-robot:cherry-pick-5885-to-release-1.29."}],"documentation_url":"https://docs.github.com/rest/pulls/pulls#create-a-pull-request"}

In response to this:

/cherrypick release-1.29

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. 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
Development

Successfully merging this pull request may close these issues.

Invalid LoadBalancerSourceRanges when there are spaces in the range values
5 participants