Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up makefile 🧹 #1374

Merged
merged 4 commits into from
Feb 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,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
Expand All @@ -85,10 +81,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
Expand Down
13 changes: 0 additions & 13 deletions dev-infrastructure/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,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 \
Expand Down Expand Up @@ -108,7 +101,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

Expand All @@ -128,12 +120,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) \
Expand Down Expand Up @@ -183,7 +173,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}" \
Expand Down Expand Up @@ -258,7 +247,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) \
Expand All @@ -278,7 +266,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) \
Expand Down
1 change: 0 additions & 1 deletion dev-infrastructure/docs/development-setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions dev-infrastructure/ensure-no-running-deployment.sh

This file was deleted.

18 changes: 0 additions & 18 deletions dev-infrastructure/scripts/cleanup-orphaned-rolebindings.sh

This file was deleted.