Update the ARO operator to set and use DefaultAzureCredential via env…

… vars
Azure · Nov 8, 2023 · edccb1e · edccb1e
1 parent f7951eb
commit edccb1e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/pkg/operator/controllers/checkers/serviceprincipalchecker/checker.go b/pkg/operator/controllers/checkers/serviceprincipalchecker/checker.go
@@ -22,18 +22,14 @@ type servicePrincipalChecker interface {
 type checker struct {
 	log *logrus.Entry
 
-	credentials        func(ctx context.Context) (*clusterauthorizer.Credentials, error)
-	getTokenCredential func(azEnv *azureclient.AROEnvironment, credentials *clusterauthorizer.Credentials) (azcore.TokenCredential, error)
+	getTokenCredential func(azEnv *azureclient.AROEnvironment) (azcore.TokenCredential, error)
 	newSPValidator     func(azEnv *azureclient.AROEnvironment) dynamic.ServicePrincipalValidator
 }
 
 func newServicePrincipalChecker(log *logrus.Entry, client client.Client) *checker {
 	return &checker{
 		log: log,
 
-		credentials: func(ctx context.Context) (*clusterauthorizer.Credentials, error) {
-			return clusterauthorizer.AzCredentials(ctx, client)
-		},
 		getTokenCredential: clusterauthorizer.GetTokenCredential,
 		newSPValidator: func(azEnv *azureclient.AROEnvironment) dynamic.ServicePrincipalValidator {
 			return dynamic.NewServicePrincipalValidator(log, azEnv, dynamic.AuthorizerClusterServicePrincipal)
@@ -47,14 +43,9 @@ func (r *checker) Check(ctx context.Context, AZEnvironment string) error {
 		return err
 	}
 
-	azCred, err := r.credentials(ctx)
-	if err != nil {
-		return err
-	}
-
 	spDynamic := r.newSPValidator(&azEnv)
 
-	spTokenCredential, err := r.getTokenCredential(&azEnv, azCred)
+	spTokenCredential, err := r.getTokenCredential(&azEnv)
 	if err != nil {
 		return err
 	}

diff --git a/pkg/operator/deploy/staticresources/master/deployment.yaml.tmpl b/pkg/operator/deploy/staticresources/master/deployment.yaml.tmpl
@@ -28,8 +28,23 @@ spec:
         - master
         image: "{{ .Image }}"
         name: aro-operator
-        {{ if .IsLocalDevelopment}}
         env:
+        - name: AZURE_CLIENT_ID
+          valueFrom:
+            secretKeyRef:
+              name: azure-cloud-credentials
+              key: azure_client_id
+        - name: AZURE_CLIENT_SECRET
+          valueFrom:
+            secretKeyRef:
+              name: azure-cloud-credentials
+              key: azure_client_secret
+        - name: AZURE_TENANT_ID
+          valueFrom:
+            secretKeyRef:
+              name: azure-cloud-credentials
+              key: azure_tenant_id
+        {{ if .IsLocalDevelopment}}
         - name: "RP_MODE"
           value: "development"
         {{ end }}