From a16e7e8799709fbe67c80e70074d2fa427c322f6 Mon Sep 17 00:00:00 2001
From: Rajdeep Chauhan <rajdchau@redhat.com>
Date: Wed, 31 Jul 2024 13:01:39 -0400
Subject: [PATCH] ARO-4373 fix oidcstorageaccount var validation (#3743)

---
 cmd/aro/rp.go   | 2 ++
 pkg/env/prod.go | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/cmd/aro/rp.go b/cmd/aro/rp.go
index ef30eaa6a..44f7195e4 100644
--- a/cmd/aro/rp.go
+++ b/cmd/aro/rp.go
@@ -52,6 +52,7 @@ func rp(ctx context.Context, log, audit *logrus.Entry) error {
 	if _env.IsLocalDevelopmentMode() {
 		keys = []string{
 			"PULL_SECRET",
+			env.OIDCStorageAccountName,
 		}
 	} else {
 		keys = []string{
@@ -61,6 +62,7 @@ func rp(ctx context.Context, log, audit *logrus.Entry) error {
 			"CLUSTER_MDM_NAMESPACE",
 			"MDM_ACCOUNT",
 			"MDM_NAMESPACE",
+			env.OIDCStorageAccountName,
 		}
 
 		if _, found := os.LookupEnv("PULL_SECRET"); found {
diff --git a/pkg/env/prod.go b/pkg/env/prod.go
index 6f9fe776e..0015eb262 100644
--- a/pkg/env/prod.go
+++ b/pkg/env/prod.go
@@ -205,10 +205,6 @@ func newProd(ctx context.Context, log *logrus.Entry, component ServiceComponent)
 		p.gatewayDomains = append(p.gatewayDomains, p.acrDomain, acrDataDomain)
 	}
 
-	if err := ValidateVars(OIDCStorageAccountName); err != nil {
-		return nil, err
-	}
-
 	p.ARMHelper, err = newARMHelper(ctx, log, p)
 	if err != nil {
 		return nil, err