Skip to content

Commit ef8cf33

Browse files
authored
Vagrant fixes (#125)
* Fix destroy before bootkube clone * Fix multiple calls of vagrant-destroy.sh
1 parent 82818d8 commit ef8cf33

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ vagrant: ## Run vagrant against a previously up'd cluster. Example: make vagrant
3838

3939
vagrant-destroy: ## Destroy a previously created local VM cluster
4040
@hack/vagrant-destroy.sh
41-
@HACK_MULTI_NODE="true" hack/vagrant-destroy.sh
4241

4342
vagrant-clean: vagrant-destroy ## Destroy a previously created local VM cluster and remove all downloaded/generated assets
4443
@rm -rf hack/_output

hack/vagrant-destroy.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ export HACK_DIR
88
# shellcheck source=vagrant-common.sh
99
. "${HACK_DIR}/vagrant-common.sh"
1010

11+
if [ ! -d "${BK_CLONE_DIR}" ]; then
12+
echo "INFO: Bootkube repo not found. Nothing to destroy."
13+
exit 0
14+
fi
15+
1116
for i in "${BK_CLONE_DIR}/hack/single-node" "${BK_CLONE_DIR}/hack/multi-node"; do
1217
echo "INFO: Running vagrant destroy -f in ${i}"
1318
cd "${i}"

0 commit comments

Comments
 (0)