X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=Makefile;h=148b02886ad8b3aa9b96e6520d6eef440c7287ca;hb=refs%2Fchanges%2F41%2F4841%2F1;hp=6be01486cafaa0a3ef71f26dd235ce0cb15ca56a;hpb=ff5f274ea672fbb9e99d902d3c321da121d7f20e;p=icn.git

diff --git a/Makefile b/Makefile
index 6be0148..148b028 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,8 @@ jump_server: management_cluster \
 	ironic_bridge \
 	controllers
 
-jump_server_clean: ironic_bridge_clean \
+jump_server_clean: controllers_clean \
+	ironic_bridge_clean \
 	management_cluster_clean
 
 # The jump server requires a K8s cluster to install into
@@ -60,7 +61,7 @@ kubectl:
 	./deploy/kubectl/kubectl.sh deploy
 
 yq:
-	./deploy/yq.sh deploy
+	./deploy/yq/yq.sh deploy
 
 # Provisioning network configuration in the jump server
 
@@ -69,32 +70,55 @@ ironic_bridge:
 	./deploy/ironic/ironic.sh deploy-bridge
 
 ironic_bridge_clean:
+	source user_config.sh && \
 	./deploy/ironic/ironic.sh clean-bridge
 
 # Jump server components
 
-controllers: baremetal_operator \
+controllers: ironic \
+	cert_manager \
+	baremetal_operator \
 	cluster_api \
 	flux
 
-baremetal_operator: ironic cert_manager
+controllers_clean: flux_clean \
+	cluster_api_clean \
+	baremetal_operator_clean \
+	cert_manager_clean \
+	ironic_clean
+
+baremetal_operator:
 	./deploy/baremetal-operator/baremetal-operator.sh deploy
 
 baremetal_operator_clean:
 	./deploy/baremetal-operator/baremetal-operator.sh clean
 
 ironic:
+	source user_config.sh && \
 	./deploy/ironic/ironic.sh deploy
 
+ironic_clean:
+	source user_config.sh && \
+	./deploy/ironic/ironic.sh clean
+
 cert_manager:
 	./deploy/cert-manager/cert-manager.sh deploy
 
+cert_manager_clean:
+	./deploy/cert-manager/cert-manager.sh clean
+
 cluster_api:
 	./deploy/cluster-api/cluster-api.sh deploy
 
+cluster_api_clean:
+	./deploy/cluster-api/cluster-api.sh clean
+
 flux:
 	./deploy/flux/flux.sh deploy
 
+flux_clean:
+	./deploy/flux/flux.sh clean
+
 # Example compute clusters
 
 pod11_cluster:
@@ -105,6 +129,7 @@ pod11_cluster:
 
 pod11_cluster_clean:
 	./deploy/site/pod11/pod11.sh clean
+	./deploy/site/pod11/pod11.sh wait-clean
 
 vm_cluster:
 	./deploy/site/vm/vm.sh deploy
@@ -114,6 +139,7 @@ vm_cluster:
 
 vm_cluster_clean:
 	./deploy/site/vm/vm.sh clean
+	./deploy/site/vm/vm.sh wait-clean
 
 # Test targets