Merge pull request #1374 from Azure/clean-up-makefile

Clean up makefile 🧹

Makefile

@@ -73,10 +73,6 @@ infra.mgmt.aks.kubeconfigfile:
 	@cd dev-infrastructure && DEPLOY_ENV=$(DEPLOY_ENV) make -s mgmt.aks.kubeconfigfile
 .PHONY: infra.mgmt.aks.kubeconfigfile
 
-infra.imagesync:
-	@cd dev-infrastructure && DEPLOY_ENV=$(DEPLOY_ENV) make imagesync
-.PHONY: infra.imagesync
-
 infra.all:
 	@cd dev-infrastructure && DEPLOY_ENV=$(DEPLOY_ENV) make infra
 .PHONY: infra.all
@@ -93,10 +89,6 @@ infra.region.clean:
 	@cd dev-infrastructure && DEPLOY_ENV=$(DEPLOY_ENV) make region.clean
 .PHONY: infra.region.clean
 
-infra.imagesync.clean:
-	@cd dev-infrastructure && DEPLOY_ENV=$(DEPLOY_ENV) make imagesync.clean
-.PHONY: infra.imagesync.clean
-
 infra.clean:
 	@cd dev-infrastructure && DEPLOY_ENV=$(DEPLOY_ENV) make clean
 .PHONY: infra.clean

dev-infrastructure/Makefile

@@ -48,13 +48,6 @@ feature-registration: # hardcoded to eastus as this is a subscription deployment
 		$(PROMPT_TO_CONFIRM)
 .PHONY: feature-registration
 
-cleanup-orphaned-rolebindings:
-	@scripts/cleanup-orphaned-rolebindings.sh $(SVC_RESOURCEGROUP)
-	@scripts/cleanup-orphaned-rolebindings.sh $(MGMT_RESOURCEGROUP)
-	@scripts/cleanup-orphaned-rolebindings.sh $(REGIONAL_RESOURCEGROUP)
-	@scripts/cleanup-orphaned-rolebindings.sh ${GLOBAL_RESOURCEGROUP}
-.PHONY: cleanup-orphaned-rolebindings
-
 create-mock-identities:
 	az deployment group wait --created --name "aro-hcp-dev-mock-certificates" --resource-group $(GLOBAL_RESOURCEGROUP) --interval 10
 	az deployment group create \
@@ -109,7 +102,6 @@ global.what-if:
 #
 
 region:
-	@scripts/cleanup-orphaned-rolebindings.sh $(REGIONAL_RESOURCEGROUP)
 	../templatize.sh $(DEPLOY_ENV) -p region-pipeline.yaml -P run -c public
 .PHONY: region
 
@@ -129,12 +121,10 @@ region.what-if:
 #
 
 svc:
-	@scripts/cleanup-orphaned-rolebindings.sh $(SVC_RESOURCEGROUP)
 	../templatize.sh $(DEPLOY_ENV) -p svc-pipeline.yaml -P run -c public
 .PHONY: svc
 
 svc.cs-pr-check-msi:
-	@./ensure-no-running-deployment.sh $(SVC_RESOURCEGROUP) cs-integ-msi
 	az deployment group create \
 		--name cs-integ-msi \
 		--resource-group $(SVC_RESOURCEGROUP) \
@@ -184,7 +174,6 @@ svc.what-if:
 .PHONY: svc.what-if
 
 svc.dev-role-assignments:
-	@./ensure-no-running-deployment.sh $(SVC_RESOURCEGROUP) ${ROLE_ASSIGNMENTS_DEPLOYMENT_NAME}
 	az deployment group create \
 		--name ${ROLE_ASSIGNMENTS_DEPLOYMENT_NAME} \
 		--resource-group "${SVC_RESOURCEGROUP}" \
@@ -259,7 +248,6 @@ acr.what-if: acr-svc-cfg.what-if acr-ocp-cfg.what-if
 .PHONY: acr.what-if
 
 acr-svc-cfg: # DEV only setup of caching rules in OCP ACR
-	@./ensure-no-running-deployment.sh $(GLOBAL_RESOURCEGROUP) ${GLOBAL_RG_DEPLOYMENT_NAME}-acr-svc
 	az deployment group create \
 		--name ${GLOBAL_RG_DEPLOYMENT_NAME}-acr-svc \
 		--resource-group $(GLOBAL_RESOURCEGROUP) \
@@ -279,7 +267,6 @@ acr-svc-cfg.what-if:
 .PHONY: acr-svc-cfg.what-if
 
 acr-ocp-cfg: # DEV only setup of caching rules in OCP ACR
-	@./ensure-no-running-deployment.sh $(GLOBAL_RESOURCEGROUP) ${GLOBAL_RG_DEPLOYMENT_NAME}-acr-ocp
 	az deployment group create \
 		--name ${GLOBAL_RG_DEPLOYMENT_NAME}-acr-ocp \
 		--resource-group $(GLOBAL_RESOURCEGROUP) \

dev-infrastructure/docs/development-setup.md

@@ -214,7 +214,6 @@ There are more fine grained cleanup tasks available as well
   make infra.svc.clean
   make infra.mgmt.clean
   make infra.region.clean
-  make infra.imagesync.clean
   ```
 
 > Please note that all resource groups not tagged with `persist=true` will be deleted by our cleanup pipeline after 48 hours. In order to prevent that from happening, run the infrastructure deployment make targets with a `PERSIST=true` env variable defined