Improve makefile targets consistency

Makefile

@@ -1,11 +1,17 @@
 .POSIX:
 
-default: run
+default: apply
 
-.PHONY: run
-run:
+.PHONY: metal
+metal:
 	make -C metal
+
+.PHONY: infra
+infra:
 	make -C infra
+
+.PHONY: apps
+apps:
 	make -C apps
 
 .PHONY: tools
@@ -15,3 +21,6 @@ tools:
 .PHONY: docs
 docs:
 	make -C docs
+
+.PHONY: apply
+apply: metal infra apps

apps/Makefile

@@ -8,5 +8,5 @@ default: apply
 apply:
 	kubectl apply --kustomize .
 
-delete:
+destroy:
 	kubectl delete --kustomize .

infra/Makefile

@@ -3,7 +3,7 @@
 
 TF_IN_AUTOMATION = true
 
-default: init plan apply
+default: init apply
 
 init:
 	terraform init -input=false
@@ -11,7 +11,7 @@ init:
 plan:
 	terraform plan -input=false -out=/tmp/tfplan
 
-apply:
+apply: plan
 	terraform apply -input=false /tmp/tfplan
 
 destroy: