Merge pull request #18745 from anvial/backport-pr-18264

fix: backport azure image lookup fix

Author: hpidcock

provider/azure/environ.go

@@ -486,6 +486,7 @@ func (env *azureEnviron) StartInstance(ctx context.ProviderCallContext, args env
 	if err != nil {
 		return nil, errors.Trace(err)
 	}
+	preferGen1Image := false
 	for i := 0; i < 15; i++ {
 		// Identify the instance type and image to provision.
 		instanceSpec, err := env.findInstanceSpec(
@@ -497,7 +498,7 @@ func (env *azureEnviron) StartInstance(ctx context.ProviderCallContext, args env
 				Arch:        arch,
 				Constraints: args.Constraints,
 			},
-			imageStream,
+			imageStream, preferGen1Image,
 		)
 		if err != nil {
 			return nil, err
@@ -515,10 +516,18 @@ func (env *azureEnviron) StartInstance(ctx context.ProviderCallContext, args env
 			deleteInstanceFamily(instanceTypes, instanceSpec.InstanceType.Name)
 			continue
 		}
+		hypervisorGenErr, ok := errorutils.MaybeHypervisorGenNotSupportedError(err)
+		if ok && !preferGen1Image {
+			logger.Warningf("hypervisor generation 2 not supported for %q error: %q", instanceSpec.InstanceType.Name, hypervisorGenErr.Error())
+			logger.Warningf("retrying with generation 1 image")
+			preferGen1Image = true
+			continue
+		}
 		return result, errorutils.SimpleError(err)
 	}
 	return nil, errors.New("no suitable instance type found for this subscription")
 }
+
 func (env *azureEnviron) startInstance(
 	ctx context.ProviderCallContext, args environs.StartInstanceParams,
 	instanceSpec *instances.InstanceSpec, envTags map[string]string,