azurepathfix: skip job creation on Azure Stack Hub

ASH does not support the api version used by the sdk version in
move-blobs, so we skip running it there.

also consistently use the client options on every instantiation.

Author: flavianmissi

cmd/move-blobs/main.go

@@ -299,12 +299,16 @@ func getClient(cloudConfig cloud.Configuration, opts *configOpts) (*container.Cl
 		opts.containerName,
 	)
 	var client *container.Client
+	clientOpts := azcore.ClientOptions{
+		Cloud: cloudConfig,
+	}
+
 	if len(opts.accountKey) > 0 {
 		cred, err := container.NewSharedKeyCredential(opts.storageAccountName, opts.accountKey)
 		if err != nil {
 			return nil, err
 		}
-		client, err = container.NewClientWithSharedKeyCredential(containerURL, cred, nil)
+		client, err = container.NewClientWithSharedKeyCredential(containerURL, cred, &container.ClientOptions{ClientOptions: clientOpts})
 		if err != nil {
 			return nil, err
 		}
@@ -318,7 +322,7 @@ func getClient(cloudConfig cloud.Configuration, opts *configOpts) (*container.Cl
 		if err != nil {
 			return nil, err
 		}
-		client, err = container.NewClient(containerURL, cred, nil)
+		client, err = container.NewClient(containerURL, cred, &container.ClientOptions{ClientOptions: clientOpts})
 		if err != nil {
 			return nil, err
 		}
@@ -335,16 +339,21 @@ func getClient(cloudConfig cloud.Configuration, opts *configOpts) (*container.Cl
 		if err != nil {
 			return nil, err
 		}
-		client, err = container.NewClient(containerURL, cred, nil)
+		client, err = container.NewClient(containerURL, cred, &container.ClientOptions{ClientOptions: clientOpts})
 		if err != nil {
 			return nil, err
 		}
 	} else {
-		cred, err := azidentity.NewDefaultAzureCredential(nil)
+		options := azidentity.DefaultAzureCredentialOptions{
+			ClientOptions: azcore.ClientOptions{
+				Cloud: cloudConfig,
+			},
+		}
+		cred, err := azidentity.NewDefaultAzureCredential(&options)
 		if err != nil {
 			return nil, err
 		}
-		client, err = container.NewClient(containerURL, cred, nil)
+		client, err = container.NewClient(containerURL, cred, &container.ClientOptions{ClientOptions: clientOpts})
 		if err != nil {
 			return nil, err
 		}

pkg/operator/azurepathfixcontroller.go

@@ -3,6 +3,7 @@ package operator
 import (
 	"context"
 	"fmt"
+	"strings"
 	"time"
 
 	batchv1 "k8s.io/api/batch/v1"
@@ -176,6 +177,7 @@ func (c *AzurePathFixController) sync() error {
 	if err != nil {
 		return err
 	}
+
 	azureStorage := imageRegistryConfig.Status.Storage.Azure
 	if azureStorage == nil || len(azureStorage.AccountName) == 0 {
 		return fmt.Errorf("storage account not yet provisioned")
@@ -184,6 +186,12 @@ func (c *AzurePathFixController) sync() error {
 		return fmt.Errorf("storage container not yet provisioned")
 	}
 
+	// the move-blobs cmd does not work on Azure Stack Hub. Users on ASH
+	// will have to copy the blobs on their own using something like az copy.
+	if strings.EqualFold(azureStorage.CloudName, "AZURESTACKCLOUD") {
+		return nil
+	}
+
 	gen := resource.NewGeneratorAzurePathFixJob(
 		c.jobLister,
 		c.batchClient,