Detect Cloud Instance by Region as Fallback

charts/internal/machineclass/templates/machineclass.yaml

@@ -34,6 +34,10 @@ nodeTemplate:
   zone: {{ $machineClass.nodeTemplate.zone }}
 {{- end }}
 providerSpec:
+  {{- if hasKey $machineClass "cloudConfiguration" }}
+  cloudConfiguration:
+{{ toYaml $machineClass.cloudConfiguration | indent 4 }}
+  {{- end }}
   location: {{ $machineClass.region }}
   properties:
     {{- if $machineClass.securityProfile }}

pkg/apis/azure/types_cloudprofile.go

@@ -77,3 +77,16 @@ type MachineType struct {
 	// AcceleratedNetworking is an indicator if the machine type supports Azure accelerated networking.
 	AcceleratedNetworking *bool
 }
+
+// The (currently) supported values for the names of clouds to use in the CloudConfiguration.
+const (
+	AzureChinaCloudName  string = "AzureChina"
+	AzureGovCloudName    string = "AzureGovernment"
+	AzurePublicCloudName string = "AzurePublic"
+)
+
+// The known prefixes in of region names for the various instances.
+var (
+	AzureGovRegionPrefixes   = []string{"usgov", "usdod", "ussec"}
+	AzureChinaRegionPrefixes = []string{"china"}
+)

pkg/azure/client/client_opts.go

@@ -6,19 +6,15 @@ package client
 
 import (
 	"crypto/tls"
-	"fmt"
 	"math"
 	"net"
 	"net/http"
-	"strings"
 	"sync"
 	"time"
 
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/arm"
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/cloud"
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
-
-	"github.com/gardener/gardener-extension-provider-azure/pkg/apis/azure"
 )
 
 const (
@@ -76,45 +72,6 @@ func getAzureClientOpts() *arm.ClientOptions {
 	}
 }
 
-// AzureCloudConfigurationFromCloudConfiguration returns the cloud.Configuration corresponding to the given cloud configuration name (as part of our CloudConfiguration)
-func AzureCloudConfigurationFromCloudConfiguration(cloudConfiguration *azure.CloudConfiguration) (cloud.Configuration, error) {
-	if cloudConfiguration == nil {
-		return cloud.AzurePublic, nil
-	}
-
-	cloudConfigurationName := cloudConfiguration.Name
-	switch {
-	case strings.EqualFold(cloudConfigurationName, "AzurePublic"):
-		return cloud.AzurePublic, nil
-	case strings.EqualFold(cloudConfigurationName, "AzureGovernment"):
-		return cloud.AzureGovernment, nil
-	case strings.EqualFold(cloudConfigurationName, "AzureChina"):
-		return cloud.AzureChina, nil
-
-	default:
-		return cloud.Configuration{}, fmt.Errorf("unknown cloud configuration name '%s'", cloudConfigurationName)
-	}
-}
-
-// CloudEnvVarNameFromCloudConfiguration returns the names of env-vars used by the upstream-controllers corresponding to the given cloud configuration name (as part of our CloudConfiguration)
-func CloudEnvVarNameFromCloudConfiguration(cloudConfiguration *azure.CloudConfiguration) (string, error) {
-	if cloudConfiguration == nil {
-		return "AZUREPUBLICCLOUD", nil
-	}
-
-	cloudConfigurationName := cloudConfiguration.Name
-	switch {
-	case strings.EqualFold(cloudConfigurationName, "AzurePublic"):
-		return "AZUREPUBLICCLOUD", nil
-	case strings.EqualFold(cloudConfigurationName, "AzureGovernment"):
-		return "AZUREUSGOVERNMENT", nil
-	case strings.EqualFold(cloudConfigurationName, "AzureChina"):
-		return "AZURECHINACLOUD", nil
-	default:
-		return "", fmt.Errorf("unknown cloud configuration name '%s'", cloudConfigurationName)
-	}
-}
-
 func getRetriableStatusCode() []int {
 	return []int{
 		http.StatusRequestTimeout,      // 408

pkg/azure/client/helper.go

@@ -6,12 +6,17 @@ package client
 
 import (
 	"errors"
+	"fmt"
 	"net/http"
+	"strings"
 
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore"
+	"github.com/Azure/azure-sdk-for-go/sdk/azcore/cloud"
 	"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
 	"github.com/Azure/go-autorest/autorest"
 	azerrors "github.com/AzureAD/microsoft-authentication-library-for-go/apps/errors"
+
+	"github.com/gardener/gardener-extension-provider-azure/pkg/apis/azure"
 )
 
 // FilterNotFoundError returns nil for NotFound errors.
@@ -62,3 +67,66 @@ func IsAzureAPIUnauthorized(err error) bool {
 	inErr := &azidentity.AuthenticationFailedError{}
 	return errors.As(err, &inErr)
 }
+
+// CloudConfiguration returns a CloudConfiguration for the given input, prioritising the given CloudConfiguration if both inputs are not nil. In essence
+// this function unifies both ways to configure the instance to connect to into a single type - our CloudConfiguration.
+func CloudConfiguration(cloudConfiguration *azure.CloudConfiguration, region *string) (*azure.CloudConfiguration, error) {
+	if cloudConfiguration != nil {
+		return cloudConfiguration, nil
+	} else if region != nil {
+		return cloudConfigurationFromRegion(*region), nil
+	}
+	return nil, fmt.Errorf("either CloudConfiguration or region must not be nil to determine Azure Cloud configuration")
+}
+
+// AzureCloudConfiguration is a convenience function to get the corresponding Azure Cloud configuration (from the Azure SDK) to the given input,
+// preferring the cloudConfiguration if both values are not nil.
+func AzureCloudConfiguration(cloudConfiguration *azure.CloudConfiguration, region *string) (cloud.Configuration, error) {
+	cloudConf, err := CloudConfiguration(cloudConfiguration, region)
+	if err != nil {
+		return cloud.Configuration{}, err
+	}
+	return AzureCloudConfigurationFromCloudConfiguration(cloudConf)
+}
+
+// cloudConfigurationFromRegion returns a matching cloudConfiguration corresponding to a well known cloud instance for the given region
+func cloudConfigurationFromRegion(region string) *azure.CloudConfiguration {
+	switch {
+	case hasAnyPrefix(region, azure.AzureGovRegionPrefixes...):
+		return &azure.CloudConfiguration{Name: azure.AzureGovCloudName}
+	case hasAnyPrefix(region, azure.AzureChinaRegionPrefixes...):
+		return &azure.CloudConfiguration{Name: azure.AzureChinaCloudName}
+	default:
+		return &azure.CloudConfiguration{Name: azure.AzurePublicCloudName}
+	}
+}
+
+// AzureCloudConfigurationFromCloudConfiguration returns the cloud.Configuration corresponding to the given cloud configuration name (as part of our CloudConfiguration).
+func AzureCloudConfigurationFromCloudConfiguration(cloudConfiguration *azure.CloudConfiguration) (cloud.Configuration, error) {
+	if cloudConfiguration == nil {
+		return cloud.AzurePublic, nil
+	}
+
+	cloudConfigurationName := cloudConfiguration.Name
+	switch {
+	case strings.EqualFold(cloudConfigurationName, azure.AzurePublicCloudName):
+		return cloud.AzurePublic, nil
+	case strings.EqualFold(cloudConfigurationName, azure.AzureGovCloudName):
+		return cloud.AzureGovernment, nil
+	case strings.EqualFold(cloudConfigurationName, azure.AzureChinaCloudName):
+		return cloud.AzureChina, nil
+
+	default:
+		return cloud.Configuration{}, fmt.Errorf("unknown cloud configuration name '%s'", cloudConfigurationName)
+	}
+}
+
+func hasAnyPrefix(s string, prefixes ...string) bool {
+	lString := strings.ToLower(s)
+	for _, p := range prefixes {
+		if strings.HasPrefix(lString, strings.ToLower(p)) {
+			return true
+		}
+	}
+	return false
+}

pkg/controller/backupbucket/actuator.go

@@ -41,7 +41,7 @@ func (a *actuator) Reconcile(ctx context.Context, _ logr.Logger, backupBucket *e
 		return err
 	}
 
-	azCloudConfiguration, err := azureclient.AzureCloudConfigurationFromCloudConfiguration(backupConfig.CloudConfiguration)
+	azCloudConfiguration, err := azureclient.AzureCloudConfiguration(backupConfig.CloudConfiguration, &backupBucket.Spec.Region)
 	if err != nil {
 		return err
 	}
@@ -98,9 +98,19 @@ func (a *actuator) delete(ctx context.Context, _ logr.Logger, backupBucket *exte
 		return err
 	}
 
-	var cloudConfiguration *azure.CloudConfiguration
+	var (
+		cloudConfiguration *azure.CloudConfiguration
+		region             *string
+	)
+
 	if backupBucket != nil {
 		cloudConfiguration = backupBucketConfig.CloudConfiguration
+		region = &backupBucket.Spec.Region
+	}
+
+	cloudConfiguration, err = azureclient.CloudConfiguration(cloudConfiguration, region)
+	if err != nil {
+		return err
 	}
 
 	if secret != nil {

pkg/controller/bastion/actuator_delete.go

@@ -44,7 +44,8 @@ func (a *actuator) Delete(ctx context.Context, log logr.Logger, bastion *extensi
 		cloudConfiguration = cloudProfile.CloudConfiguration
 	}
 
-	azCloudConfiguration, err := azureclient.AzureCloudConfigurationFromCloudConfiguration(cloudConfiguration)
+	azCloudConfiguration, err := azureclient.AzureCloudConfiguration(cloudConfiguration, &cluster.Shoot.Spec.Region)
+
 	if err != nil {
 		return err
 	}

pkg/controller/bastion/actuator_reconcile.go

@@ -71,7 +71,7 @@ func (a *actuator) Reconcile(ctx context.Context, log logr.Logger, bastion *exte
 		cloudConfiguration = cloudProfile.CloudConfiguration
 	}
 
-	azCloudConfiguration, err := azureclient.AzureCloudConfigurationFromCloudConfiguration(cloudConfiguration)
+	azCloudConfiguration, err := azureclient.AzureCloudConfiguration(cloudConfiguration, &opt.Location)
 	if err != nil {
 		return err
 	}
@@ -151,7 +151,7 @@ func getInfrastructureStatus(ctx context.Context, a *actuator, cluster *extensio
 		return nil, err
 	}
 
-	if worker == nil || worker.Spec.InfrastructureProviderStatus == nil {
+	if worker.Spec.InfrastructureProviderStatus == nil {
 		return nil, errors.New("infrastructure provider status must be not empty for worker")
 	}
 

pkg/controller/controlplane/valuesprovider.go

@@ -39,10 +39,8 @@ import (
 
 	"github.com/gardener/gardener-extension-provider-azure/charts"
 	apisazure "github.com/gardener/gardener-extension-provider-azure/pkg/apis/azure"
-	"github.com/gardener/gardener-extension-provider-azure/pkg/apis/azure/helper"
 	azureapihelper "github.com/gardener/gardener-extension-provider-azure/pkg/apis/azure/helper"
 	"github.com/gardener/gardener-extension-provider-azure/pkg/azure"
-	azureclient "github.com/gardener/gardener-extension-provider-azure/pkg/azure/client"
 	"github.com/gardener/gardener-extension-provider-azure/pkg/features"
 	"github.com/gardener/gardener-extension-provider-azure/pkg/internal"
 )
@@ -462,24 +460,8 @@ func getConfigChartValues(infraStatus *apisazure.InfrastructureStatus, cp *exten
 		maxNodes = maxNodes + worker.Maximum
 	}
 
-	cloudProfile, err := helper.CloudProfileConfigFromCluster(cluster)
-	if err != nil {
-		return nil, err
-	}
-
-	var cloudConfiguration *apisazure.CloudConfiguration
-	if cloudProfile != nil {
-		cloudConfiguration = cloudProfile.CloudConfiguration
-	}
-
-	azureCloudEnvVarName, err := azureclient.CloudEnvVarNameFromCloudConfiguration(cloudConfiguration)
-	if err != nil {
-		return nil, err
-	}
-
 	// Collect config chart values.
 	values := map[string]interface{}{
-		"cloud":             azureCloudEnvVarName,
 		"tenantId":          ca.TenantID,
 		"subscriptionId":    ca.SubscriptionID,
 		"aadClientId":       ca.ClientID,

pkg/controller/controlplane/valuesprovider_test.go

@@ -155,7 +155,6 @@ var _ = Describe("ValuesProvider", func() {
 		cluster = generateCluster(cidr, k8sVersion, false, nil, nil, nil)
 
 		ControlPlaneChartValues = map[string]interface{}{
-			"cloud":             "AZUREPUBLICCLOUD",
 			"tenantId":          "TenantID",
 			"subscriptionId":    "SubscriptionID",
 			"aadClientId":       "ClientID",
@@ -774,6 +773,7 @@ func generateCluster(cidr, k8sVersion string, vpaEnabled bool, shootAnnotations
 					},
 				},
 			},
+			Region: "eu-west-1a",
 			Networking: &gardencorev1beta1.Networking{
 				Pods: &cidr,
 			},

pkg/controller/dnsrecord/actuator.go

@@ -52,7 +52,7 @@ func (a *actuator) Reconcile(ctx context.Context, log logr.Logger, dns *extensio
 		return err
 	}
 
-	azCloudConfiguration, err := azureclient.AzureCloudConfigurationFromCloudConfiguration(dnsRecordConfig.CloudConfiguration)
+	azCloudConfiguration, err := azureclient.AzureCloudConfiguration(dnsRecordConfig.CloudConfiguration, dns.Spec.Region)
 	if err != nil {
 		return err
 	}
@@ -106,7 +106,8 @@ func (a *actuator) Delete(ctx context.Context, log logr.Logger, dns *extensionsv
 		return err
 	}
 
-	azCloudConfiguration, err := azureclient.AzureCloudConfigurationFromCloudConfiguration(dnsRecordConfig.CloudConfiguration)
+	azCloudConfiguration, err := azureclient.AzureCloudConfiguration(dnsRecordConfig.CloudConfiguration, dns.Spec.Region)
+
 	if err != nil {
 		return err
 	}

pkg/controller/dnsrecord/actuator_test.go

@@ -94,6 +94,7 @@ var _ = Describe("Actuator", func() {
 				Name:       domainName,
 				RecordType: extensionsv1alpha1.DNSRecordTypeA,
 				Values:     []string{address},
+				Region:     ptr.To("Foobar"),
 			},
 		}
 

pkg/controller/infrastructure/flow_reconciler.go

@@ -74,7 +74,12 @@ func (f *FlowReconciler) Reconcile(ctx context.Context, infra *extensionsv1alpha
 		return err
 	}
 
-	azCloudConfiguration, err := azureclient.AzureCloudConfigurationFromCloudConfiguration(cloudProfile.CloudConfiguration)
+	var cloudConfiguration *azure.CloudConfiguration
+	if cloudProfile != nil {
+		cloudConfiguration = cloudProfile.CloudConfiguration
+	}
+
+	azCloudConfiguration, err := azureclient.AzureCloudConfiguration(cloudConfiguration, &cluster.Shoot.Spec.Region)
 	if err != nil {
 		return err
 	}
@@ -113,7 +118,12 @@ func (f *FlowReconciler) Delete(ctx context.Context, infra *extensionsv1alpha1.I
 		return err
 	}
 
-	azCloudConfiguration, err := azureclient.AzureCloudConfigurationFromCloudConfiguration(cloudProfile.CloudConfiguration)
+	var cloudConfiguration *azure.CloudConfiguration
+	if cloudProfile != nil {
+		cloudConfiguration = cloudProfile.CloudConfiguration
+	}
+
+	azCloudConfiguration, err := azureclient.AzureCloudConfiguration(cloudConfiguration, &cluster.Shoot.Spec.Region)
 	if err != nil {
 		return err
 	}

pkg/controller/infrastructure/terraform_reconciler.go

@@ -246,28 +246,12 @@ func NoOpStateInitializer(_ context.Context, _ client.Client, _, _ string, _ *me
 	return nil
 }
 
-func (r *TerraformReconciler) getClientFactory(ctx context.Context, infra *extensionsv1alpha1.Infrastructure, cluster *controller.Cluster) (azureclient.Factory, error) {
-	cloudProfile, err := helper.CloudProfileConfigFromCluster(cluster)
-	if err != nil {
-		return nil, err
-	}
-
-	var cloudConfiguration *azure.CloudConfiguration
-	if cloudProfile != nil {
-		cloudConfiguration = cloudProfile.CloudConfiguration
-	}
-
-	azCloudConfiguration, err := azureclient.AzureCloudConfigurationFromCloudConfiguration(cloudConfiguration)
-	if err != nil {
-		return nil, err
-	}
-
+func (r *TerraformReconciler) getClientFactory(ctx context.Context, infra *extensionsv1alpha1.Infrastructure, _ *controller.Cluster) (azureclient.Factory, error) {
 	return DefaultAzureClientFactoryFunc(
 		ctx,
 		r.Client,
 		infra.Spec.SecretRef,
 		false,
-		azureclient.WithCloudConfiguration(azCloudConfiguration),
 	)
 }
 

pkg/controller/worker/actuator.go

@@ -82,7 +82,7 @@ func (d *delegateFactory) WorkerDelegate(ctx context.Context, worker *extensions
 		cloudConfiguration = cloudProfile.CloudConfiguration
 	}
 
-	azCloudConfiguration, err := azureclient.AzureCloudConfigurationFromCloudConfiguration(cloudConfiguration)
+	azCloudConfiguration, err := azureclient.AzureCloudConfiguration(cloudConfiguration, &cluster.Shoot.Spec.Region)
 	if err != nil {
 		return nil, err
 	}