Skip to content

Commit

Permalink
Delete kind cluster after tests run. Inside a real Prow job it is bet…
Browse files Browse the repository at this point in the history
…ter to clean up at runtime instead of leaving that to the Prow job cleanup code because the later sometimes times out.

Signed-off-by: Mucahit Kurt <mucahitkurt@gmail.com>
  • Loading branch information
mucahitkurt committed Nov 18, 2019
1 parent 5ce1e19 commit bcd02d3
Showing 1 changed file with 14 additions and 1 deletion.
15 changes: 14 additions & 1 deletion release-tools/prow.sh
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,13 @@ EOF
KUBECONFIG="$(kind get kubeconfig-path --name=csi-prow)"
export KUBECONFIG
}

# Deletes kind cluster
delete_cluster() {
if kind get clusters | grep -q csi-prow; then
run kind delete cluster --name=csi-prow || die "kind delete failed"
fi
unset KUBECONFIG
}
# Looks for the deployment as specified by CSI_PROW_DEPLOYMENT and CSI_PROW_KUBERNETES_VERSION
# in the given directory.
find_deployment () {
Expand Down Expand Up @@ -1017,6 +1023,12 @@ main () {
fi
fi
fi
# Inside a real Prow job it is better to clean up at runtime
# instead of leaving that to the Prow job cleanup code
# because the later sometimes times out (https://github.com/kubernetes-csi/csi-release-tools/issues/24#issuecomment-554765872).
if [ "$JOB_NAME" ]; then
delete_cluster
fi
fi

if tests_need_alpha_cluster && [ "${CSI_PROW_E2E_ALPHA_GATES}" ]; then
Expand Down Expand Up @@ -1047,6 +1059,7 @@ main () {
fi
fi
fi
delete_cluster
fi
fi

Expand Down

0 comments on commit bcd02d3

Please sign in to comment.