pkg/storage/azure: inject infra lister into GetConfig

Author: flavianmissi

pkg/storage/azure/azure.go

@@ -30,6 +30,7 @@ import (
 	configv1 "github.com/openshift/api/config/v1"
 	imageregistryv1 "github.com/openshift/api/imageregistry/v1"
 	operatorapiv1 "github.com/openshift/api/operator/v1"
+	configlisters "github.com/openshift/client-go/config/listers/config/v1"
 
 	regopclient "github.com/openshift/cluster-image-registry-operator/pkg/client"
 	"github.com/openshift/cluster-image-registry-operator/pkg/defaults"
@@ -82,7 +83,7 @@ func (e *errDoesNotExist) Error() string {
 // load credentials from ImageRegistryPrivateConfigurationUser secret, if this secret is not
 // present this function loads credentials from cluster wide config present on secret
 // CloudCredentialsName.
-func GetConfig(secLister kcorelisters.SecretNamespaceLister) (*Azure, error) {
+func GetConfig(secLister kcorelisters.SecretNamespaceLister, infraLister configlisters.InfrastructureLister) (*Azure, error) {
 	sec, err := secLister.Get(defaults.ImageRegistryPrivateConfigurationUser)
 	if err != nil {
 		if !errors.IsNotFound(err) {
@@ -361,7 +362,7 @@ func (d *driver) CABundle() (string, bool, error) {
 // ConfigEnv configures the environment variables that will be used in the
 // image registry deployment.
 func (d *driver) ConfigEnv() (envs envvar.List, err error) {
-	cfg, err := GetConfig(d.Listers.Secrets)
+	cfg, err := GetConfig(d.Listers.Secrets, d.Listers.Infrastructures)
 	if err != nil {
 		return nil, err
 	}
@@ -449,7 +450,7 @@ func (d *driver) StorageExists(cr *imageregistryv1.Config) (bool, error) {
 		return false, nil
 	}
 
-	cfg, err := GetConfig(d.Listers.Secrets)
+	cfg, err := GetConfig(d.Listers.Secrets, d.Listers.Infrastructures)
 	if err != nil {
 		util.UpdateCondition(cr, defaults.StorageExists, operatorapiv1.ConditionUnknown, storageExistsReasonConfigError, fmt.Sprintf("Unable to get configuration: %s", err))
 		return false, err
@@ -649,7 +650,7 @@ func (d *driver) processUPI(cr *imageregistryv1.Config) {
 
 // CreateStorage attempts to create a storage account and a storage container.
 func (d *driver) CreateStorage(cr *imageregistryv1.Config) error {
-	cfg, err := GetConfig(d.Listers.Secrets)
+	cfg, err := GetConfig(d.Listers.Secrets, d.Listers.Infrastructures)
 	if err != nil {
 		util.UpdateCondition(
 			cr,
@@ -749,7 +750,7 @@ func (d *driver) RemoveStorage(cr *imageregistryv1.Config) (retry bool, err erro
 		return false, nil
 	}
 
-	cfg, err := GetConfig(d.Listers.Secrets)
+	cfg, err := GetConfig(d.Listers.Secrets, d.Listers.Infrastructures)
 	if err != nil {
 		util.UpdateCondition(cr, defaults.StorageExists, operatorapiv1.ConditionUnknown, storageExistsReasonConfigError, fmt.Sprintf("Unable to get configuration: %s", err))
 		return false, err

pkg/storage/azure/azure_test.go

@@ -18,6 +18,7 @@ import (
 	"github.com/Azure/go-autorest/autorest/mocks"
 	"github.com/google/go-cmp/cmp"
 
+	configlisters "github.com/openshift/client-go/config/listers/config/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -159,8 +160,9 @@ func TestGetConfig(t *testing.T) {
 				_ = indexer.Add(o)
 			}
 			lister := corev1listers.NewSecretLister(indexer)
+			infraLister := fakeInfrastructureLister("resource-group-123")
 
-			result, err := GetConfig(lister.Secrets("test"))
+			result, err := GetConfig(lister.Secrets("test"), infraLister)
 			if len(tt.err) != 0 {
 				if err == nil {
 					t.Errorf("expected err %q, nil received instead", tt.err)
@@ -182,6 +184,29 @@ func TestGetConfig(t *testing.T) {
 	}
 }
 
+func fakeInfrastructureLister(resourceGroup string) configlisters.InfrastructureLister {
+	fakeIndexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{})
+	err := fakeIndexer.Add(&configv1.Infrastructure{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "cluster",
+		},
+		Status: configv1.InfrastructureStatus{
+			InfrastructureName: "user-j45xj",
+			Platform:           configv1.OpenStackPlatformType,
+			PlatformStatus: &configv1.PlatformStatus{
+				Type: configv1.AzurePlatformType,
+				Azure: &configv1.AzurePlatformStatus{
+					ResourceGroupName: resourceGroup,
+				},
+			},
+		},
+	})
+	if err != nil {
+		panic(err) // should never happen
+	}
+	return configlisters.NewInfrastructureLister(fakeIndexer)
+}
+
 func TestGenerateAccountName(t *testing.T) {
 	re := regexp.MustCompile(`^[0-9a-z]{3,24}$`)
 	for _, infrastructureName := range []string{