azurepathfixcontroller: return error if account name is not present

openshift · Feb 15, 2024 · aceec22 · aceec22
1 parent 33d4dad
commit aceec22
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/pkg/operator/azurepathfixcontroller.go b/pkg/operator/azurepathfixcontroller.go
@@ -168,6 +168,14 @@ func (c *AzurePathFixController) sync() error {
 	if err != nil {
 		return err
 	}
+	azureStorage := imageRegistryConfig.Status.Storage.Azure
+	if azureStorage == nil || (azureStorage != nil && len(azureStorage.AccountName) == 0) {
+		return fmt.Errorf("storage account not yet provisioned")
+	}
+	if azureStorage == nil || (azureStorage != nil && len(azureStorage.Container) == 0) {
+		return fmt.Errorf("storage container not yet provisioned")
+	}
+
 	gen := resource.NewGeneratorAzurePathFixJob(
 		c.jobLister,
 		c.batchClient,

diff --git a/pkg/resource/azurepathfixjob.go b/pkg/resource/azurepathfixjob.go
@@ -81,9 +81,14 @@ func (gapfj *generatorAzurePathFixJob) expected() (runtime.Object, error) {
 		return nil, fmt.Errorf("unable to get cluster proxy configuration: %v", err)
 	}
 
+	azureStorage := gapfj.cr.Status.Storage.Azure
+	if azureStorage == nil {
+		return fmt.Errorf("storage not yet provisioned")
+	}
+
 	envs := []corev1.EnvVar{
-		{Name: "AZURE_STORAGE_ACCOUNT_NAME", Value: gapfj.cr.Spec.Storage.Azure.AccountName}, // use cr.Status ?
-		{Name: "AZURE_CONTAINER_NAME", Value: gapfj.cr.Spec.Storage.Azure.Container},
+		{Name: "AZURE_STORAGE_ACCOUNT_NAME", Value: azureStorage.AccountName},
+		{Name: "AZURE_CONTAINER_NAME", Value: azureStorage.Container},
 		{Name: "AZURE_CLIENT_ID", Value: azureCfg.ClientID},
 		{Name: "AZURE_TENANT_ID", Value: azureCfg.TenantID},
 		{Name: "AZURE_CLIENT_SECRET", Value: azureCfg.ClientSecret},
@@ -98,7 +103,7 @@ func (gapfj *generatorAzurePathFixJob) expected() (runtime.Object, error) {
 		}},
 	}
 
-	if len(gapfj.cr.Spec.Storage.Azure.CloudName) > 0 {
+	if len(azureStorage.CloudName) > 0 {
 		envs = append(envs, corev1.EnvVar{Name: "AZURE_ENVIRONMENT", Value: gapfj.cr.Spec.Storage.Azure.CloudName})
 	}