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

fix loadbalancer status comparison #125225

Merged
merged 2 commits into from
May 31, 2024
Merged

fix loadbalancer status comparison #125225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f28b8fe
fix loadbalancer status comparison
aojea May 30, 2024
59adf3f
remove unused function LoadBalancerStatusEqual
aojea May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 0 additions & 29 deletions pkg/apis/core/v1/helper/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,35 +140,6 @@ func IsServiceIPSet(service *v1.Service) bool {
return service.Spec.ClusterIP != v1.ClusterIPNone && service.Spec.ClusterIP != ""
}

// LoadBalancerStatusEqual evaluates the given load balancers' ingress IP addresses
// and hostnames and returns true if equal or false if otherwise
// TODO: make method on LoadBalancerStatus?
func LoadBalancerStatusEqual(l, r *v1.LoadBalancerStatus) bool {
return ingressSliceEqual(l.Ingress, r.Ingress)
}

func ingressSliceEqual(lhs, rhs []v1.LoadBalancerIngress) bool {
if len(lhs) != len(rhs) {
return false
}
for i := range lhs {
if !ingressEqual(&lhs[i], &rhs[i]) {
return false
}
}
return true
}

func ingressEqual(lhs, rhs *v1.LoadBalancerIngress) bool {
if lhs.IP != rhs.IP {
return false
}
if lhs.Hostname != rhs.Hostname {
return false
}
return true
}

// GetAccessModesAsString returns a string representation of an array of access modes.
// modes, when present, are always in the same order: RWO,ROX,RWX,RWOP.
func GetAccessModesAsString(modes []v1.PersistentVolumeAccessMode) string {
Expand Down
83 changes: 0 additions & 83 deletions pkg/apis/core/v1/helper/helpers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,86 +723,3 @@ func TestHugePageUnitSizeFromByteSize(t *testing.T) {
}
}
}

func TestLoadBalancerStatusEqual(t *testing.T) {

testCases := []struct {
left *v1.LoadBalancerStatus
right *v1.LoadBalancerStatus
name string
expectVal bool
}{{
name: "left equals right",
left: &v1.LoadBalancerStatus{
Ingress: []v1.LoadBalancerIngress{{
IP: "1.1.1.1",
Hostname: "host1",
}},
},
right: &v1.LoadBalancerStatus{
Ingress: []v1.LoadBalancerIngress{{
IP: "1.1.1.1",
Hostname: "host1",
}},
},
expectVal: true,
}, {
name: "length of LoadBalancerIngress slice is not equal",
left: &v1.LoadBalancerStatus{
Ingress: []v1.LoadBalancerIngress{{
IP: "1.1.1.1",
Hostname: "host1",
}, {
IP: "1.1.1.2",
Hostname: "host1",
}},
},
right: &v1.LoadBalancerStatus{
Ingress: []v1.LoadBalancerIngress{{
IP: "1.1.1.1",
Hostname: "host1",
}},
},
expectVal: false,
}, {
name: "LoadBalancerIngress ip is not equal",
left: &v1.LoadBalancerStatus{
Ingress: []v1.LoadBalancerIngress{{
IP: "1.1.1.2",
Hostname: "host1",
}},
},
right: &v1.LoadBalancerStatus{
Ingress: []v1.LoadBalancerIngress{{
IP: "1.1.1.1",
Hostname: "host1",
}},
},
expectVal: false,
}, {
name: "LoadBalancerIngress hostname is not equal",
left: &v1.LoadBalancerStatus{
Ingress: []v1.LoadBalancerIngress{{
IP: "1.1.1.1",
Hostname: "host2",
}},
},
right: &v1.LoadBalancerStatus{
Ingress: []v1.LoadBalancerIngress{{
IP: "1.1.1.1",
Hostname: "host1",
}},
},
expectVal: false,
}}

for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
v := LoadBalancerStatusEqual(tc.left, tc.right)
if v != tc.expectVal {
t.Errorf("test %s failed. left input=%v, right input=%v, Got %v but expected %v",
tc.name, tc.left, tc.right, v, tc.expectVal)
}
})
}
}
28 changes: 2 additions & 26 deletions staging/src/k8s.io/cloud-provider/service/helpers/helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"strings"

v1 "k8s.io/api/core/v1"
apiequality "k8s.io/apimachinery/pkg/api/equality"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/strategicpatch"
Expand Down Expand Up @@ -124,7 +125,7 @@ func HasLBFinalizer(service *v1.Service) bool {

// LoadBalancerStatusEqual checks if load balancer status are equal
func LoadBalancerStatusEqual(l, r *v1.LoadBalancerStatus) bool {
return ingressSliceEqual(l.Ingress, r.Ingress)
return apiequality.Semantic.DeepEqual(l.Ingress, r.Ingress)
}

// PatchService patches the given service's Status or ObjectMeta based on the original and
Expand Down Expand Up @@ -160,28 +161,3 @@ func getPatchBytes(oldSvc, newSvc *v1.Service) ([]byte, error) {
return patchBytes, nil

}

func ingressSliceEqual(lhs, rhs []v1.LoadBalancerIngress) bool {
if len(lhs) != len(rhs) {
return false
}
for i := range lhs {
if !ingressEqual(&lhs[i], &rhs[i]) {
return false
}
}
return true
}

func ingressEqual(lhs, rhs *v1.LoadBalancerIngress) bool {
if lhs.IP != rhs.IP {
return false
}
if lhs.Hostname != rhs.Hostname {
return false
}
if lhs.IPMode != rhs.IPMode {
return false
}
return true
}
150 changes: 150 additions & 0 deletions staging/src/k8s.io/cloud-provider/service/helpers/helper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes/fake"
utilnet "k8s.io/utils/net"
"k8s.io/utils/ptr"
)

/*
Expand Down Expand Up @@ -347,3 +348,152 @@ func Test_getPatchBytes(t *testing.T) {
func addAnnotations(svc *v1.Service) {
svc.Annotations["foo"] = "bar"
}

func TestLoadBalancerStatusEqual(t *testing.T) {
tests := []struct {
name string
l *v1.LoadBalancerStatus
r *v1.LoadBalancerStatus
want bool
}{
{
name: "empty",
l: &v1.LoadBalancerStatus{},
r: &v1.LoadBalancerStatus{},
want: true,
},
{
name: "same ip",
l: &v1.LoadBalancerStatus{
Ingress: []v1.LoadBalancerIngress{
{IP: "192.168.0.1"},
},
},
r: &v1.LoadBalancerStatus{
Ingress: []v1.LoadBalancerIngress{
{IP: "192.168.0.1"},
},
},
want: true,
},
{
name: "different ip",
l: &v1.LoadBalancerStatus{
Ingress: []v1.LoadBalancerIngress{
{IP: "192.168.0.2"},
},
},
r: &v1.LoadBalancerStatus{
Ingress: []v1.LoadBalancerIngress{
{IP: "192.168.0.1"},
},
},
want: false,
},
{
name: "same ipmode",
Copy link
Member Author

Choose a reason for hiding this comment

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

this failed before, as are different pointer values

l: &v1.LoadBalancerStatus{
Ingress: []v1.LoadBalancerIngress{
{IP: "192.168.0.1", IPMode: ptr.To(v1.LoadBalancerIPModeVIP)},
},
},
r: &v1.LoadBalancerStatus{
Ingress: []v1.LoadBalancerIngress{
{IP: "192.168.0.1", IPMode: ptr.To(v1.LoadBalancerIPModeVIP)},
},
},
want: true,
},
{
name: "only one ipmode set",
l: &v1.LoadBalancerStatus{
Ingress: []v1.LoadBalancerIngress{
{IP: "192.168.0.1"},
},
},
r: &v1.LoadBalancerStatus{
Ingress: []v1.LoadBalancerIngress{
{IP: "192.168.0.1", IPMode: ptr.To(v1.LoadBalancerIPModeVIP)},
},
},
want: false,
},
{
name: "different ipmode",
l: &v1.LoadBalancerStatus{
Ingress: []v1.LoadBalancerIngress{
{IP: "192.168.0.1", IPMode: ptr.To(v1.LoadBalancerIPModeProxy)},
},
},
r: &v1.LoadBalancerStatus{
Ingress: []v1.LoadBalancerIngress{
{IP: "192.168.0.1", IPMode: ptr.To(v1.LoadBalancerIPModeVIP)},
},
},
want: false,
},
{
name: "same ports",
l: &v1.LoadBalancerStatus{
Ingress: []v1.LoadBalancerIngress{
{IP: "192.168.0.1", Ports: []v1.PortStatus{{Port: 80, Protocol: v1.ProtocolTCP}}},
},
},
r: &v1.LoadBalancerStatus{
Ingress: []v1.LoadBalancerIngress{
{IP: "192.168.0.1", Ports: []v1.PortStatus{{Port: 80, Protocol: v1.ProtocolTCP}}},
},
},
want: true,
},
{
name: "same ports different protocol",
l: &v1.LoadBalancerStatus{
Ingress: []v1.LoadBalancerIngress{
{IP: "192.168.0.1", Ports: []v1.PortStatus{{Port: 80, Protocol: v1.ProtocolTCP}}},
},
},
r: &v1.LoadBalancerStatus{
Ingress: []v1.LoadBalancerIngress{
{IP: "192.168.0.1", Ports: []v1.PortStatus{{Port: 80, Protocol: v1.ProtocolUDP}}},
},
},
want: false,
},
{
name: "only one port",
l: &v1.LoadBalancerStatus{
Ingress: []v1.LoadBalancerIngress{
{IP: "192.168.0.1", Ports: []v1.PortStatus{{Port: 80, Protocol: v1.ProtocolTCP}}},
},
},
r: &v1.LoadBalancerStatus{
Ingress: []v1.LoadBalancerIngress{
{IP: "192.168.0.1", Ports: []v1.PortStatus{}},
},
},
want: false,
},
{
name: "only one port",
l: &v1.LoadBalancerStatus{
Ingress: []v1.LoadBalancerIngress{
{IP: "192.168.0.1", Ports: []v1.PortStatus{{Port: 80, Protocol: v1.ProtocolTCP}}},
},
},
r: &v1.LoadBalancerStatus{
Ingress: []v1.LoadBalancerIngress{
{IP: "192.168.0.1", Ports: []v1.PortStatus{}},
},
},
want: false,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := LoadBalancerStatusEqual(tt.l, tt.r); got != tt.want {
t.Errorf("LoadBalancerStatusEqual() = %v, want %v", got, tt.want)
}
})
}
}