fine grained orphaned role assignment cleanup

Signed-off-by: Gerd Oberlechner <[email protected]>
Azure · Oct 29, 2024 · 1871db9 · 1871db9
1 parent a9bbf61
commit 1871db9
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/dev-infrastructure/Makefile b/dev-infrastructure/Makefile
@@ -151,6 +151,7 @@ region.wait:
 .PHONY: region.wait
 
 region: region.wait regional.rg
+	@scripts/cleanup-orphaned-rolebindings.sh $(REGIONAL_RESOURCEGROUP)
 	az deployment group create \
 		--name $(REGIONAL_RG_DEPLOYMENT_NAME) \
 		--resource-group $(REGIONAL_RESOURCEGROUP) \
@@ -192,7 +193,8 @@ svc.wait:
 	@./ensure-no-running-deployment.sh $(SVC_RESOURCEGROUP) $(SVC_RG_DEPLOYMENT_NAME)
 .PHONY: svc.wait
 
-svc: svc.wait svc.rg cleanup-orphaned-rolebindings
+svc: svc.wait svc.rg
+	@scripts/cleanup-orphaned-rolebindings.sh $(SVC_RESOURCEGROUP)
 	az deployment group create \
 		--name $(SVC_RG_DEPLOYMENT_NAME) \
 		--resource-group $(SVC_RESOURCEGROUP) \
@@ -272,7 +274,8 @@ mgmt.wait:
 	@./ensure-no-running-deployment.sh $(MGMT_RESOURCEGROUP) $(MGMG_RG_DEPLOYMENT_NAME)
 .PHONY: mgmt.wait
 
-mgmt: mgmt.wait mgmt.rg cleanup-orphaned-rolebindings
+mgmt: mgmt.wait mgmt.rg
+	@scripts/cleanup-orphaned-rolebindings.sh $(MGMT_RESOURCEGROUP)
 	az deployment group create \
 		--name $(MGMG_RG_DEPLOYMENT_NAME) \
 		--resource-group $(MGMT_RESOURCEGROUP) \