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: The case of load balancer name should be ignored when determing … #5225

Merged
merged 1 commit into from Jan 8, 2024

Conversation

nilo19
Copy link
Contributor

@nilo19 nilo19 commented Jan 7, 2024

…if it is an internal load balancer.

What type of PR is this?

/kind bug

What this PR does / why we need it:

fix: The case of load balancer name should be ignored when determing if it is an internal load balancer.

Which issue(s) this PR fixes:

Fixes #5192

Special notes for your reviewer:

Does this PR introduce a user-facing change?

fix: The case of load balancer name should be ignored when determing if it is an internal load balancer.

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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 7, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nilo19

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 Jan 7, 2024
@lzhecheng
Copy link
Contributor

/lgtm
/retest

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 8, 2024
@k8s-ci-robot k8s-ci-robot merged commit 9abef39 into kubernetes-sigs:master Jan 8, 2024
18 checks passed
@nilo19 nilo19 deleted the fix/lb-name-case branch January 9, 2024 00:27
@nilo19
Copy link
Contributor Author

nilo19 commented Jan 9, 2024

/cherrypick release-1.28

@k8s-infra-cherrypick-robot

@nilo19: #5225 failed to apply on top of branch "release-1.28":

Applying: fix: The case of load balancer name should be ignored when determing if it is an internal load balancer.
Using index info to reconstruct a base tree...
A	kubetest2-aks/go.mod
M	pkg/provider/azure_standard.go
M	pkg/provider/azure_utils.go
M	pkg/provider/azure_utils_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/provider/azure_utils_test.go
CONFLICT (content): Merge conflict in pkg/provider/azure_utils_test.go
Auto-merging pkg/provider/azure_utils.go
Auto-merging pkg/provider/azure_standard.go
CONFLICT (modify/delete): kubetest2-aks/go.mod deleted in HEAD and modified in fix: The case of load balancer name should be ignored when determing if it is an internal load balancer.. Version fix: The case of load balancer name should be ignored when determing if it is an internal load balancer. of kubetest2-aks/go.mod left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix: The case of load balancer name should be ignored when determing if it is an internal load balancer.
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.

@feiskyer
Copy link
Member

feiskyer commented Jan 9, 2024

@nilo19 manual cherry-picking is required for this fix

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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Should ignore the case of lb name when determing if the load balancer is an internal one
5 participants