Merge pull request #1981 from feiskyer/abs

Add cloud environment support for ABS backup

pkg/apis/etcd/v1beta2/backup_types.go

@@ -26,6 +26,7 @@ const (
 	BackupStorageTypeABS      BackupStorageType = "ABS"
 	AzureSecretStorageAccount                   = "storage-account"
 	AzureSecretStorageKey                       = "storage-key"
+	AzureCloudKey                               = "cloud"
 )
 
 type BackupStorageType string

pkg/util/azureutil/absfactory/client.go

@@ -18,6 +18,7 @@ import (
 	"fmt"
 
 	"github.com/Azure/azure-sdk-for-go/storage"
+	"github.com/Azure/go-autorest/autorest/azure"
 	api "github.com/coreos/etcd-operator/pkg/apis/etcd/v1beta2"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -29,6 +30,15 @@ type ABSClient struct {
 	ABS *storage.BlobStorageClient
 }
 
+// parseAzureEnvironment returns azure environment by name
+func parseAzureEnvironment(cloudName string) (azure.Environment, error) {
+	if cloudName == "" {
+		return azure.PublicCloud, nil
+	}
+
+	return azure.EnvironmentFromName(cloudName)
+}
+
 // NewClientFromSecret returns a ABS client based on given k8s secret containing azure credentials.
 func NewClientFromSecret(kubecli kubernetes.Interface, namespace, absSecret string) (w *ABSClient, err error) {
 	defer func() {
@@ -44,10 +54,17 @@ func NewClientFromSecret(kubecli kubernetes.Interface, namespace, absSecret stri
 
 	storageAccount := se.Data[api.AzureSecretStorageAccount]
 	storageKey := se.Data[api.AzureSecretStorageKey]
+	cloudName := se.Data[api.AzureCloudKey]
+
+	cloud, err := parseAzureEnvironment(string(cloudName))
+	if err != nil {
+		return nil, err
+	}
 
-	bc, err := storage.NewBasicClient(
+	bc, err := storage.NewBasicClientOnSovereignCloud(
 		string(storageAccount),
-		string(storageKey))
+		string(storageKey),
+		cloud)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create Azure storage client: %v", err)
 	}