support other Azure cloud environments

go.mod

@@ -15,7 +15,7 @@ require (
 	github.com/go-logr/zapr v0.1.1
 	github.com/google/go-cmp v0.3.1
 	github.com/kevinburke/go-bindata v3.11.0+incompatible
-	github.com/openshift/api v0.0.0-20200522173408-17ada6e4245b
+	github.com/openshift/api v0.0.0-20200609191024-dca637550e8c
 	github.com/openshift/library-go v0.0.0-20200324092245-db2a8546af81
 	github.com/pkg/errors v0.8.1
 	github.com/spf13/cobra v0.0.5

go.sum

@@ -286,8 +286,8 @@ github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQ
 github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
 github.com/opencontainers/runc v0.0.0-20191031171055-b133feaeeb2e/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
 github.com/openshift/api v0.0.0-20200320142426-0de0d539b0c3/go.mod h1:7k3+uZYOir97walbYUqApHUA2OPhkQpVJHt0n7GJ6P4=
-github.com/openshift/api v0.0.0-20200522173408-17ada6e4245b h1:yEY4zF6pEEWdR09wjuDJhupLEDM2vYdUgLoc10C0fFk=
-github.com/openshift/api v0.0.0-20200522173408-17ada6e4245b/go.mod h1:TkhafijfTiRi1Q3120/ZSE4oIWKQ4DGRh3byPywv4Mw=
+github.com/openshift/api v0.0.0-20200609191024-dca637550e8c h1:bKFV0gBWD+jg/xbR4jrf4jBFQE/c/jXj3bzDw8nZghU=
+github.com/openshift/api v0.0.0-20200609191024-dca637550e8c/go.mod h1:l6TGeqJ92DrZBuWMNKcot1iZUHfbYSJyBWHGgg6Dn6s=
 github.com/openshift/build-machinery-go v0.0.0-20200211121458-5e3d6e570160/go.mod h1:1CkcsT3aVebzRBzVTSbiKSkJMsC/CASqxesfqEMfJEc=
 github.com/openshift/build-machinery-go v0.0.0-20200424080330-082bf86082cc/go.mod h1:1CkcsT3aVebzRBzVTSbiKSkJMsC/CASqxesfqEMfJEc=
 github.com/openshift/client-go v0.0.0-20200320150128-a906f3d8e723/go.mod h1:wNBSSt4RZTHhUWyhBE3gxTR32QpF9DB2SfS14u2IxuE=

pkg/dns/azure/client/auth.go

@@ -3,23 +3,17 @@ package client
 import (
 	"github.com/Azure/go-autorest/autorest"
 	"github.com/Azure/go-autorest/autorest/adal"
-	"github.com/Azure/go-autorest/autorest/azure"
 )
 
 func getAuthorizerForResource(config Config) (autorest.Authorizer, error) {
-	env, err := azure.EnvironmentFromName(config.Environment)
-	if err != nil {
-		return nil, err
-	}
-
 	oauthConfig, err := adal.NewOAuthConfig(
-		env.ActiveDirectoryEndpoint, config.TenantID)
+		config.Environment.ActiveDirectoryEndpoint, config.TenantID)
 	if err != nil {
 		return nil, err
 	}
 
 	token, err := adal.NewServicePrincipalToken(
-		*oauthConfig, config.ClientID, config.ClientSecret, env.ResourceManagerEndpoint)
+		*oauthConfig, config.ClientID, config.ClientSecret, config.Environment.ResourceManagerEndpoint)
 	if err != nil {
 		return nil, err
 	}

pkg/dns/azure/client/client.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2017-10-01/dns"
 	privatedns "github.com/Azure/azure-sdk-for-go/services/privatedns/mgmt/2018-09-01/privatedns"
+	"github.com/Azure/go-autorest/autorest/azure"
 	"github.com/pkg/errors"
 )
 
@@ -14,7 +15,7 @@ type DNSClient interface {
 }
 
 type Config struct {
-	Environment    string
+	Environment    azure.Environment
 	SubscriptionID string
 	ClientID       string
 	ClientSecret   string
@@ -84,7 +85,7 @@ func newRecordSetClient(config Config, userAgentExtension string) (*recordSetCli
 		return nil, err
 	}
 
-	rc := dns.NewRecordSetsClient(config.SubscriptionID)
+	rc := dns.NewRecordSetsClientWithBaseURI(config.Environment.ResourceManagerEndpoint, config.SubscriptionID)
 	rc.AddToUserAgent(userAgentExtension)
 	rc.Authorizer = authorizer
 	return &recordSetClient{client: rc}, nil
@@ -129,7 +130,7 @@ func newPrivateRecordSetClient(config Config, userAgentExtension string) (*priva
 		return nil, err
 	}
 
-	prc := privatedns.NewRecordSetsClient(config.SubscriptionID)
+	prc := privatedns.NewRecordSetsClientWithBaseURI(config.Environment.ResourceManagerEndpoint, config.SubscriptionID)
 	prc.AddToUserAgent(userAgentExtension)
 	prc.Authorizer = authorizer
 	return &privateRecordSetClient{client: prc}, nil

pkg/dns/azure/dns.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/Azure/go-autorest/autorest/azure"
 	"github.com/pkg/errors"
 
 	configv1 "github.com/openshift/api/config/v1"
@@ -43,8 +44,12 @@ type provider struct {
 // NewProvider creates a new dns.Provider for Azure. It only supports DNSRecords with
 // type A.
 func NewProvider(config Config, operatorReleaseVersion string) (dns.Provider, error) {
+	env, err := azure.EnvironmentFromName(config.Environment)
+	if err != nil {
+		return nil, fmt.Errorf("could not determine cloud environment: %w", err)
+	}
 	c, err := client.New(client.Config{
-		Environment:    config.Environment,
+		Environment:    env,
 		SubscriptionID: config.SubscriptionID,
 		ClientID:       config.ClientID,
 		ClientSecret:   config.ClientSecret,

pkg/operator/controller/dns/controller.go

@@ -447,8 +447,12 @@ func (r *reconciler) createDNSProvider(dnsConfig *configv1.DNS, platformStatus *
 		}
 		dnsProvider = provider
 	case configv1.AzurePlatformType:
+		environment := platformStatus.Azure.CloudName
+		if environment == "" {
+			environment = configv1.AzurePublicCloud
+		}
 		provider, err := azuredns.NewProvider(azuredns.Config{
-			Environment:    "AzurePublicCloud",
+			Environment:    string(environment),
 			ClientID:       string(creds.Data["azure_client_id"]),
 			ClientSecret:   string(creds.Data["azure_client_secret"]),
 			TenantID:       string(creds.Data["azure_tenant_id"]),