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

[release-1.29] fix: Support switching from loadbalancer to externalName for services #7567

Merged
merged 1 commit into from
Nov 13, 2024
Merged

[release-1.29] fix: Support switching from loadbalancer to externalName for services #7567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 9 additions & 16 deletions pkg/provider/azure_loadbalancer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,15 +711,12 @@ func (az *Cloud) cleanOrphanedLoadBalancer(lb *network.LoadBalancer, existingLBs
}

// safeDeleteLoadBalancer deletes the load balancer after decoupling it from the vmSet
func (az *Cloud) safeDeleteLoadBalancer(lb network.LoadBalancer, clusterName, vmSetName string, service *v1.Service) *retry.Error {
lbBackendPoolIDs := az.getBackendPoolIDs(clusterName, pointer.StringDeref(lb.Name, ""))
func (az *Cloud) safeDeleteLoadBalancer(lb network.LoadBalancer, _, vmSetName string, service *v1.Service) *retry.Error {
lbBackendPoolIDsToDelete := []string{}
v4Enabled, v6Enabled := getIPFamiliesEnabled(service)
if v4Enabled {
lbBackendPoolIDsToDelete = append(lbBackendPoolIDsToDelete, lbBackendPoolIDs[consts.IPVersionIPv4])
}
if v6Enabled {
lbBackendPoolIDsToDelete = append(lbBackendPoolIDsToDelete, lbBackendPoolIDs[consts.IPVersionIPv6])
if lb.LoadBalancerPropertiesFormat != nil && lb.BackendAddressPools != nil {
for _, bp := range *lb.BackendAddressPools {
lbBackendPoolIDsToDelete = append(lbBackendPoolIDsToDelete, ptr.Deref(bp.ID, ""))
}
}
if _, err := az.VMSet.EnsureBackendPoolDeleted(service, lbBackendPoolIDsToDelete, vmSetName, lb.BackendAddressPools, true); err != nil {
return retry.NewError(false, fmt.Errorf("safeDeleteLoadBalancer: failed to EnsureBackendPoolDeleted: %w", err))
Expand Down Expand Up @@ -1499,7 +1496,7 @@ func (az *Cloud) isFrontendIPChanged(
if fipIPVersion != "" {
isIPv6 = fipIPVersion == network.IPv6
} else {
if isIPv6, err = az.isFIPIPv6(service, pipRG, &config); err != nil {
if isIPv6, err = az.isFIPIPv6(service, &config); err != nil {
return false, err
}
}
Expand Down Expand Up @@ -1648,7 +1645,6 @@ func (az *Cloud) findFrontendIPConfigsOfService(
service *v1.Service,
) (map[bool]*network.FrontendIPConfiguration, error) {
fipsOfServiceMap := map[bool]*network.FrontendIPConfiguration{}
pipRG := az.getPublicIPAddressResourceGroup(service)
for _, config := range *fipConfigs {
config := config
owns, _, fipIPVersion := az.serviceOwnsFrontendIP(config, service)
Expand All @@ -1658,7 +1654,7 @@ func (az *Cloud) findFrontendIPConfigsOfService(
if fipIPVersion != "" {
fipIsIPv6 = fipIPVersion == network.IPv6
} else {
if fipIsIPv6, err = az.isFIPIPv6(service, pipRG, &config); err != nil {
if fipIsIPv6, err = az.isFIPIPv6(service, &config); err != nil {
return nil, err
}
}
Expand Down Expand Up @@ -1833,7 +1829,6 @@ func (az *Cloud) reconcileLoadBalancer(ctx context.Context, clusterName string,
}

// update probes/rules
pipRG := az.getPublicIPAddressResourceGroup(service)
for _, ownedFIPConfig := range ownedFIPConfigs {
if ownedFIPConfig == nil {
continue
Expand All @@ -1848,7 +1843,7 @@ func (az *Cloud) reconcileLoadBalancer(ctx context.Context, clusterName string,
if fipIPVersion != "" {
isIPv6 = fipIPVersion == network.IPv6
} else {
if isIPv6, err = az.isFIPIPv6(service, pipRG, ownedFIPConfig); err != nil {
if isIPv6, err = az.isFIPIPv6(service, ownedFIPConfig); err != nil {
return nil, err
}
}
Expand Down Expand Up @@ -2503,8 +2498,6 @@ func (az *Cloud) reconcileFrontendIPConfigs(clusterName string,
}
}

pipRG := az.getPublicIPAddressResourceGroup(service)

for i := len(newConfigs) - 1; i >= 0; i-- {
config := newConfigs[i]
isServiceOwnsFrontendIP, _, fipIPVersion := az.serviceOwnsFrontendIP(config, service)
Expand All @@ -2518,7 +2511,7 @@ func (az *Cloud) reconcileFrontendIPConfigs(clusterName string,
if fipIPVersion != "" {
isIPv6 = fipIPVersion == network.IPv6
} else {
if isIPv6, err = az.isFIPIPv6(service, pipRG, &config); err != nil {
if isIPv6, err = az.isFIPIPv6(service, &config); err != nil {
return nil, toDeleteConfigs, false, err
}
}
Expand Down
2 changes: 2 additions & 0 deletions pkg/provider/azure_loadbalancer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6248,6 +6248,8 @@ func TestCleanOrphanedLoadBalancerLBInUseByVMSS(t *testing.T) {
expectedVMSS := buildTestVMSSWithLB(testVMSSName, "vmss-vm-", []string{testLBBackendpoolID0}, false)
mockVMSSClient := cloud.VirtualMachineScaleSetsClient.(*mockvmssclient.MockInterface)
mockVMSSClient.EXPECT().List(gomock.Any(), "rg").Return([]compute.VirtualMachineScaleSet{expectedVMSS}, nil)
mockVMSSClient.EXPECT().Get(gomock.Any(), "rg", testVMSSName).Return(expectedVMSS, nil)
mockVMSSClient.EXPECT().CreateOrUpdate(gomock.Any(), "rg", testVMSSName, gomock.Any()).Return(nil)

service := getTestService("test", v1.ProtocolTCP, nil, false, 80)
lb := getTestLoadBalancer(pointer.String("test"), pointer.String("rg"), pointer.String("test"), pointer.String("test"), service, consts.LoadBalancerSkuStandard)
Expand Down
3 changes: 1 addition & 2 deletions pkg/provider/azure_privatelinkservice.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,14 @@ func (az *Cloud) reconcilePrivateLinkService(
wantPLS bool,
) error {
isinternal := requiresInternalLoadBalancer(service)
pipRG := az.getPublicIPAddressResourceGroup(service)
_, _, fipIPVersion := az.serviceOwnsFrontendIP(*fipConfig, service)
serviceName := getServiceName(service)
var isIPv6 bool
var err error
if fipIPVersion != "" {
isIPv6 = fipIPVersion == network.IPv6
} else {
if isIPv6, err = az.isFIPIPv6(service, pipRG, fipConfig); err != nil {
if isIPv6, err = az.isFIPIPv6(service, fipConfig); err != nil {
klog.Errorf("reconcilePrivateLinkService for service(%s): failed to get FIP IP family: %v", serviceName, err)
return err
}
Expand Down
5 changes: 4 additions & 1 deletion pkg/provider/azure_utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,9 +437,12 @@ func getResourceByIPFamily(resource string, isDualStack, isIPv6 bool) string {

// isFIPIPv6 checks if the frontend IP configuration is of IPv6.
// NOTICE: isFIPIPv6 assumes the FIP is owned by the Service and it is the primary Service.
func (az *Cloud) isFIPIPv6(service *v1.Service, _ string, fip *network.FrontendIPConfiguration) (bool, error) {
func (az *Cloud) isFIPIPv6(service *v1.Service, fip *network.FrontendIPConfiguration) (bool, error) {
isDualStack := isServiceDualStack(service)
if !isDualStack {
if len(service.Spec.IPFamilies) == 0 {
return false, nil
}
return service.Spec.IPFamilies[0] == v1.IPv6Protocol, nil
}
return managedResourceHasIPv6Suffix(pointer.StringDeref(fip.Name, "")), nil
Expand Down
11 changes: 10 additions & 1 deletion pkg/provider/azure_utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,12 +869,21 @@ func TestIsFIPIPv6(t *testing.T) {
},
expectedIsIPv6: true,
},
{
desc: "enpty ip families",
svc: v1.Service{
Spec: v1.ServiceSpec{
IPFamilies: []v1.IPFamily{},
},
},
expectedIsIPv6: false,
},
}
for _, tc := range testcases {
tc := tc
t.Run(tc.desc, func(t *testing.T) {
az := GetTestCloud(ctrl)
isIPv6, err := az.isFIPIPv6(&tc.svc, "rg", tc.fip)
isIPv6, err := az.isFIPIPv6(&tc.svc, tc.fip)
assert.Nil(t, err)
assert.Equal(t, tc.expectedIsIPv6, isIPv6)
})
Expand Down
4 changes: 3 additions & 1 deletion pkg/provider/azure_vmss.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1971,7 +1971,9 @@ func (ss *ScaleSet) EnsureBackendPoolDeleted(service *v1.Service, backendPoolIDs

for _, backendPool := range *backendAddressPools {
for _, backendPoolID := range backendPoolIDs {
if strings.EqualFold(*backendPool.ID, backendPoolID) && backendPool.BackendIPConfigurations != nil {
if strings.EqualFold(*backendPool.ID, backendPoolID) &&
backendPool.BackendAddressPoolPropertiesFormat != nil &&
backendPool.BackendIPConfigurations != nil {
for _, ipConf := range *backendPool.BackendIPConfigurations {
if ipConf.ID == nil {
continue
Expand Down