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 … #5254

Merged
merged 2 commits into from
Jan 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ require (
github.com/spf13/cobra v1.7.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.4
golang.org/x/crypto v0.14.0
golang.org/x/sys v0.13.0
golang.org/x/crypto v0.17.0
golang.org/x/sys v0.15.0
golang.org/x/text v0.14.0
k8s.io/api v0.25.15
k8s.io/apimachinery v0.25.15
Expand Down Expand Up @@ -113,7 +113,7 @@ require (
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.10.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/term v0.15.0 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 // indirect
Expand Down
174 changes: 6 additions & 168 deletions go.sum

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions pkg/provider/azure_standard.go
Original file line number Diff line number Diff line change
Expand Up @@ -262,10 +262,6 @@ func getIPConfigByIPFamily(nic network.Interface, IPv6 bool) (*network.Interface
return nil, fmt.Errorf("failed to determine the ipconfig(IPv6=%v). nicname=%q", IPv6, pointer.StringDeref(nic.Name, ""))
}

func isInternalLoadBalancer(lb *network.LoadBalancer) bool {
return strings.HasSuffix(*lb.Name, consts.InternalLoadBalancerNameSuffix)
}

// getBackendPoolName the LB BackendPool name for a service.
// to ensure backward and forward compat:
// SingleStack -v4 (pre v1.16) => BackendPool name == clusterName
Expand Down
4 changes: 4 additions & 0 deletions pkg/provider/azure_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -354,3 +354,7 @@ func getResourceGroupAndNameFromNICID(ipConfigurationID string) (string, string,
}
return nicResourceGroup, nicName, nil
}

func isInternalLoadBalancer(lb *network.LoadBalancer) bool {
return strings.HasSuffix(strings.ToLower(*lb.Name), consts.InternalLoadBalancerNameSuffix)
}
38 changes: 38 additions & 0 deletions pkg/provider/azure_utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -314,3 +314,41 @@ func TestRemoveDuplicatedSecurityRules(t *testing.T) {
})
}
}

func TestIsInternalLoadBalancer(t *testing.T) {
tests := []struct {
name string
lb network.LoadBalancer
expected bool
}{
{
name: "internal load balancer",
lb: network.LoadBalancer{
Name: pointer.String("test-internal"),
},
expected: true,
},
{
name: "internal load balancer",
lb: network.LoadBalancer{
Name: pointer.String("TEST-INTERNAL"),
},
expected: true,
},
{
name: "not internal load balancer",
lb: network.LoadBalancer{
Name: pointer.String("test"),
},
expected: false,
},
}

for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
lb := test.lb
result := isInternalLoadBalancer(&lb)
assert.Equal(t, test.expected, result)
})
}
}
13 changes: 7 additions & 6 deletions vendor/golang.org/x/crypto/cryptobyte/asn1.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/golang.org/x/crypto/internal/alias/alias.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/golang.org/x/crypto/internal/alias/alias_purego.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/golang.org/x/crypto/internal/poly1305/mac_noasm.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/golang.org/x/crypto/internal/poly1305/sum_amd64.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/golang.org/x/crypto/internal/poly1305/sum_amd64.s

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/golang.org/x/crypto/internal/poly1305/sum_ppc64le.s

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/golang.org/x/crypto/internal/poly1305/sum_s390x.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/golang.org/x/crypto/internal/poly1305/sum_s390x.s

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/golang.org/x/crypto/salsa20/salsa/salsa20_amd64.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/golang.org/x/crypto/salsa20/salsa/salsa20_amd64.s

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/golang.org/x/crypto/salsa20/salsa/salsa20_noasm.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/golang.org/x/sys/cpu/asm_aix_ppc64.s

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/golang.org/x/sys/cpu/cpu_aix.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/golang.org/x/sys/cpu/cpu_arm64.s

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/golang.org/x/sys/cpu/cpu_gc_arm64.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/golang.org/x/sys/cpu/cpu_gc_s390x.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions vendor/golang.org/x/sys/cpu/cpu_gc_x86.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/golang.org/x/sys/cpu/cpu_gccgo_arm64.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/golang.org/x/sys/cpu/cpu_gccgo_s390x.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions vendor/golang.org/x/sys/cpu/cpu_gccgo_x86.c

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions vendor/golang.org/x/sys/cpu/cpu_gccgo_x86.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/golang.org/x/sys/cpu/cpu_linux.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions vendor/golang.org/x/sys/cpu/cpu_linux_mips64x.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/golang.org/x/sys/cpu/cpu_linux_noinit.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions vendor/golang.org/x/sys/cpu/cpu_linux_ppc64x.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/golang.org/x/sys/cpu/cpu_loong64.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/golang.org/x/sys/cpu/cpu_mips64x.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/golang.org/x/sys/cpu/cpu_mipsx.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/golang.org/x/sys/cpu/cpu_other_arm.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/golang.org/x/sys/cpu/cpu_other_arm64.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions vendor/golang.org/x/sys/cpu/cpu_other_mips64x.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions vendor/golang.org/x/sys/cpu/cpu_other_ppc64x.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.