Merge pull request #18194 from hakman/fix-not-found-disk

azure: Handle missing resource group in disk listing

Author: k8s-ci-robot

tests/e2e/kubetest2-kops/deployer/up.go

@@ -238,8 +238,8 @@ func (d *deployer) createCluster(zones []string, adminAccess string, yes bool) e
 		}
 	case "azure":
 		// Use SKUs for which there is enough quota
-		args = appendIfUnset(args, "--control-plane-size", "Standard_D4als_v7")
-		args = appendIfUnset(args, "--node-size", "Standard_D4als_v7")
+		args = appendIfUnset(args, "--control-plane-size", "Standard_D4ls_v6")
+		args = appendIfUnset(args, "--node-size", "Standard_D4ls_v6")
 	case "gce":
 		if isArm {
 			args = appendIfUnset(args, "--control-plane-size", "t2a-standard-2")

upup/pkg/fi/cloudup/azure/disk.go

@@ -18,8 +18,10 @@ package azure
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
+	"github.com/Azure/azure-sdk-for-go/sdk/azcore"
 	"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
 	compute "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute"
 )
@@ -50,11 +52,19 @@ func (c *disksClientImpl) CreateOrUpdate(ctx context.Context, resourceGroupName,
 }
 
 func (c *disksClientImpl) List(ctx context.Context, resourceGroupName string) ([]*compute.Disk, error) {
+	if resourceGroupName == "" {
+		return nil, nil
+	}
+
 	var l []*compute.Disk
 	pager := c.c.NewListByResourceGroupPager(resourceGroupName, nil)
 	for pager.More() {
 		resp, err := pager.NextPage(ctx)
 		if err != nil {
+			var respErr *azcore.ResponseError
+			if errors.As(err, &respErr) && respErr.ErrorCode == "ResourceGroupNotFound" {
+				return nil, nil
+			}
 			return nil, fmt.Errorf("listing disks: %w", err)
 		}
 		l = append(l, resp.Value...)

upup/pkg/fi/cloudup/azuretasks/applicationsecuritygroup.go

@@ -65,6 +65,10 @@ func (asg *ApplicationSecurityGroup) Find(c *fi.CloudupContext) (*ApplicationSec
 	if found == nil {
 		return nil, nil
 	}
+	if found.Properties != nil && found.Properties.ProvisioningState != nil && *found.Properties.ProvisioningState == network.ProvisioningStateFailed {
+		klog.Warningf("found application security group %q in failed provisioning state", *asg.Name)
+		return nil, nil
+	}
 
 	asg.ID = found.ID
 

upup/pkg/fi/cloudup/azuretasks/disk.go

@@ -67,6 +67,10 @@ func (d *Disk) Find(c *fi.CloudupContext) (*Disk, error) {
 	if found == nil {
 		return nil, nil
 	}
+	if found.Properties != nil && fi.ValueOf(found.Properties.ProvisioningState) == "Failed" {
+		klog.Warningf("found disk %q in failed provisioning state", *d.Name)
+		return nil, nil
+	}
 
 	disk := &Disk{
 		Name:      d.Name,

upup/pkg/fi/cloudup/azuretasks/loadbalancer.go

@@ -155,6 +155,10 @@ func (lb *LoadBalancer) Find(c *fi.CloudupContext) (*LoadBalancer, error) {
 	if found == nil {
 		return nil, nil
 	}
+	if found.Properties != nil && found.Properties.ProvisioningState != nil && *found.Properties.ProvisioningState == network.ProvisioningStateFailed {
+		klog.Warningf("found load balancer %q in failed provisioning state", *lb.Name)
+		return nil, nil
+	}
 
 	lbProperties := found.Properties
 

upup/pkg/fi/cloudup/azuretasks/natgateway.go

@@ -67,6 +67,10 @@ func (ngw *NatGateway) Find(c *fi.CloudupContext) (*NatGateway, error) {
 	if found == nil {
 		return nil, nil
 	}
+	if found.Properties != nil && found.Properties.ProvisioningState != nil && *found.Properties.ProvisioningState == network.ProvisioningStateFailed {
+		klog.Warningf("found NAT gateway %q in failed provisioning state", *ngw.Name)
+		return nil, nil
+	}
 
 	ngw.ID = found.ID
 

upup/pkg/fi/cloudup/azuretasks/networksecuritygroup.go

@@ -73,6 +73,10 @@ func (nsg *NetworkSecurityGroup) Find(c *fi.CloudupContext) (*NetworkSecurityGro
 	if found == nil {
 		return nil, nil
 	}
+	if found.Properties != nil && found.Properties.ProvisioningState != nil && *found.Properties.ProvisioningState == network.ProvisioningStateFailed {
+		klog.Warningf("found network security group %q in failed provisioning state", *nsg.Name)
+		return nil, nil
+	}
 
 	actual := &NetworkSecurityGroup{
 		Name:      nsg.Name,

upup/pkg/fi/cloudup/azuretasks/publicipaddress.go

@@ -66,6 +66,10 @@ func (p *PublicIPAddress) Find(c *fi.CloudupContext) (*PublicIPAddress, error) {
 	if found == nil {
 		return nil, nil
 	}
+	if found.Properties != nil && found.Properties.ProvisioningState != nil && *found.Properties.ProvisioningState == network.ProvisioningStateFailed {
+		klog.Warningf("found public IP address %q in failed provisioning state", *p.Name)
+		return nil, nil
+	}
 
 	p.ID = found.ID
 

upup/pkg/fi/cloudup/azuretasks/routetable.go

@@ -65,6 +65,10 @@ func (r *RouteTable) Find(c *fi.CloudupContext) (*RouteTable, error) {
 	if found == nil {
 		return nil, nil
 	}
+	if found.Properties != nil && found.Properties.ProvisioningState != nil && *found.Properties.ProvisioningState == network.ProvisioningStateFailed {
+		klog.Warningf("found route table %q in failed provisioning state", *r.Name)
+		return nil, nil
+	}
 
 	r.ID = found.ID
 

upup/pkg/fi/cloudup/azuretasks/subnet.go

@@ -89,6 +89,10 @@ func (s *Subnet) Find(c *fi.CloudupContext) (*Subnet, error) {
 	if found.Properties == nil {
 		return nil, fmt.Errorf("found subnet without properties")
 	}
+	if found.Properties.ProvisioningState != nil && *found.Properties.ProvisioningState == network.ProvisioningStateFailed {
+		klog.Warningf("found subnet %q in failed provisioning state", *s.Name)
+		return nil, nil
+	}
 
 	s.ID = found.ID