Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions pkg/provider/azure_loadbalancer.go
Original file line number Diff line number Diff line change
Expand Up @@ -1703,7 +1703,7 @@ func (az *Cloud) findFrontendIPConfigsOfService(
var fipIsIPv6 bool
var err error
if fipIPVersion != nil {
fipIsIPv6 = fipIPVersion == to.Ptr(armnetwork.IPVersionIPv6)
fipIsIPv6 = *fipIPVersion == armnetwork.IPVersionIPv6
} else {
if fipIsIPv6, err = az.isFIPIPv6(service, config); err != nil {
return nil, err
Expand Down Expand Up @@ -1902,7 +1902,7 @@ func (az *Cloud) reconcileLoadBalancer(ctx context.Context, clusterName string,
var err error
_, _, fipIPVersion := az.serviceOwnsFrontendIP(ctx, ownedFIPConfig, service)
if fipIPVersion != nil {
isIPv6 = fipIPVersion == to.Ptr(armnetwork.IPVersionIPv6)
isIPv6 = *fipIPVersion == armnetwork.IPVersionIPv6
} else {
if isIPv6, err = az.isFIPIPv6(service, ownedFIPConfig); err != nil {
return nil, false, err
Expand Down Expand Up @@ -2608,7 +2608,7 @@ func (az *Cloud) reconcileFrontendIPConfigs(
var isIPv6 bool
var err error
if fipIPVersion != nil {
isIPv6 = fipIPVersion == to.Ptr(armnetwork.IPVersionIPv6)
isIPv6 = *fipIPVersion == armnetwork.IPVersionIPv6
} else {
if isIPv6, err = az.isFIPIPv6(service, config); err != nil {
return nil, toDeleteConfigs, false, err
Expand Down
87 changes: 87 additions & 0 deletions pkg/provider/azure_loadbalancer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8517,6 +8517,93 @@ func TestServiceOwnsFrontendIP(t *testing.T) {
}
}

func TestFindFrontendIPConfigsOfService(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()

testCases := []struct {
desc string
existingPIPs []*armnetwork.PublicIPAddress
fip *armnetwork.FrontendIPConfiguration
service *v1.Service
isIPv6 bool
}{
{
desc: "config works for ipv6 service",
existingPIPs: []*armnetwork.PublicIPAddress{
{
Name: ptr.To("pip1"),
ID: ptr.To("pip1"),
Properties: &armnetwork.PublicIPAddressPropertiesFormat{
IPAddress: ptr.To("fd00::eef0"),
PublicIPAddressVersion: to.Ptr(armnetwork.IPVersionIPv6),
},
},
},
fip: &armnetwork.FrontendIPConfiguration{
Name: ptr.To("auid"),
Properties: &armnetwork.FrontendIPConfigurationPropertiesFormat{
PublicIPAddress: &armnetwork.PublicIPAddress{
ID: ptr.To("pip1"),
},
},
},
service: &v1.Service{
ObjectMeta: metav1.ObjectMeta{
UID: types.UID("secondary"),
Annotations: map[string]string{consts.ServiceAnnotationPIPNameDualStack[false]: "pip1"},
},
},
isIPv6: true,
},
{
desc: "config works for ipv4 service",
existingPIPs: []*armnetwork.PublicIPAddress{
{
Name: ptr.To("pip1"),
ID: ptr.To("pip1"),
Properties: &armnetwork.PublicIPAddressPropertiesFormat{
IPAddress: ptr.To("4.3.2.1"),
PublicIPAddressVersion: to.Ptr(armnetwork.IPVersionIPv4),
},
},
},
fip: &armnetwork.FrontendIPConfiguration{
Name: ptr.To("auid"),
Properties: &armnetwork.FrontendIPConfigurationPropertiesFormat{
PublicIPAddress: &armnetwork.PublicIPAddress{
ID: ptr.To("pip1"),
},
},
},
service: &v1.Service{
ObjectMeta: metav1.ObjectMeta{
UID: types.UID("secondary"),
Annotations: map[string]string{consts.ServiceAnnotationPIPNameDualStack[false]: "pip1"},
},
},
},
}

for _, test := range testCases {
test := test
t.Run(test.desc, func(t *testing.T) {
cloud := GetTestCloud(ctrl)
if test.existingPIPs != nil {
mockPIPsClient := cloud.NetworkClientFactory.GetPublicIPAddressClient().(*mock_publicipaddressclient.MockInterface)
mockPIPsClient.EXPECT().List(gomock.Any(), "rg").Return(test.existingPIPs, nil).MaxTimes(2)
}
configs, err := cloud.findFrontendIPConfigsOfService(context.TODO(), []*armnetwork.FrontendIPConfiguration{test.fip}, test.service)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
assert.Equal(t, 1, len(configs))
assert.NotNil(t, configs[test.isIPv6])
assert.Equal(t, test.fip, configs[test.isIPv6])
})
}
}

func TestReconcileMultipleStandardLoadBalancerNodes(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()
Expand Down