From 8954e02334a32e07f0b5fa09679a2b5c484b4a9d Mon Sep 17 00:00:00 2001 From: Todd Malsbary Date: Tue, 1 Mar 2022 12:56:01 -0800 Subject: [PATCH] Add additional clean targets Signed-off-by: Todd Malsbary Change-Id: I60306d7663cf35a7645af21f5f873167730e4672 --- Makefile | 29 ++++++++++++++++++++++--- deploy/baremetal-operator/baremetal-operator.sh | 2 +- deploy/cert-manager/cert-manager.sh | 2 +- deploy/flux/flux.sh | 2 +- deploy/ironic/ironic.sh | 2 +- deploy/site/pod11/pod11.sh | 11 ++++++++++ deploy/site/vm/vm.sh | 11 ++++++++++ 7 files changed, 52 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 6be0148..9e6115d 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 @@ -73,11 +74,19 @@ ironic_bridge_clean: # 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: @@ -86,15 +95,27 @@ baremetal_operator_clean: ironic: ./deploy/ironic/ironic.sh deploy +ironic_clean: + ./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 +126,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 +136,7 @@ vm_cluster: vm_cluster_clean: ./deploy/site/vm/vm.sh clean + ./deploy/site/vm/vm.sh wait-clean # Test targets diff --git a/deploy/baremetal-operator/baremetal-operator.sh b/deploy/baremetal-operator/baremetal-operator.sh index 4aa3eff..34c5977 100755 --- a/deploy/baremetal-operator/baremetal-operator.sh +++ b/deploy/baremetal-operator/baremetal-operator.sh @@ -32,7 +32,7 @@ function deploy { } function clean { - kustomize build ${SCRIPTDIR}/icn | kubectl delete -f - + kustomize build ${SCRIPTDIR}/icn | kubectl delete --ignore-not-found=true -f - } case $1 in diff --git a/deploy/cert-manager/cert-manager.sh b/deploy/cert-manager/cert-manager.sh index 89ca9cc..8983ce2 100755 --- a/deploy/cert-manager/cert-manager.sh +++ b/deploy/cert-manager/cert-manager.sh @@ -29,7 +29,7 @@ function deploy { } function clean { - kustomize build ${SCRIPTDIR}/icn | kubectl delete -f - + kustomize build ${SCRIPTDIR}/icn | kubectl delete --ignore-not-found=true -f - } case $1 in diff --git a/deploy/flux/flux.sh b/deploy/flux/flux.sh index cf1ec8f..ac31281 100755 --- a/deploy/flux/flux.sh +++ b/deploy/flux/flux.sh @@ -12,7 +12,7 @@ function deploy { } function clean { - flux uninstall + flux uninstall -s } case $1 in diff --git a/deploy/ironic/ironic.sh b/deploy/ironic/ironic.sh index d4f4bdd..6aefde6 100755 --- a/deploy/ironic/ironic.sh +++ b/deploy/ironic/ironic.sh @@ -100,7 +100,7 @@ function deploy { } function clean { - kustomize build ${SCRIPTDIR}/icn | kubectl delete -f - + kustomize build ${SCRIPTDIR}/icn | kubectl delete --ignore-not-found=true -f - rm -rf ${IRONIC_DATA_DIR} } diff --git a/deploy/site/pod11/pod11.sh b/deploy/site/pod11/pod11.sh index 7c052ff..28530fc 100644 --- a/deploy/site/pod11/pod11.sh +++ b/deploy/site/pod11/pod11.sh @@ -49,11 +49,22 @@ function wait_for_all_ready { wait_for is_control_plane_ready } +function is_cluster_deleted { + ! kubectl -n ${SITE_NAMESPACE} get cluster icn +} + +function wait_for_all_deleted { + WAIT_FOR_INTERVAL=60s + WAIT_FOR_TRIES=30 + wait_for is_cluster_deleted +} + case $1 in "build-source") build_source ;; "clean") clean ;; "deploy") deploy ;; "wait") wait_for_all_ready ;; + "wait-clean") wait_for_all_deleted ;; *) cat <