github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 07:47:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #45586 from shyamjvs/yolo

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 43067, 45586, 45590, 38636, 45599)

Fix bug in hollow-node deletion in stop-kubemark script

Just noticed.

cc @wojtek-t @gmarek
This commit is contained in:
Kubernetes Submit Queue 2017-05-10 19:31:40 -07:00 committed by GitHub
commit d1fef17408
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/kubemark/stop-kubemark.sh
View File

@ -31,12 +31,12 @@ RESOURCE_DIRECTORY="${KUBEMARK_DIRECTORY}/resources"
detect-project &> /dev/null detect-project &> /dev/null
"${KUBECTL}" delete -f "${RESOURCE_DIRECTORY}/addons" &> /dev/null || true "${KUBECTL}" delete -f "${RESOURCE_DIRECTORY}/addons" &> /dev/null || true
"${KUBECTL}" delete -f "${RESOURCE_DIRECTORY}/hollow-node.json" &> /dev/null || true "${KUBECTL}" delete -f "${RESOURCE_DIRECTORY}/hollow-node.yaml" &> /dev/null || true
"${KUBECTL}" delete -f "${RESOURCE_DIRECTORY}/kubemark-ns.json" &> /dev/null || true "${KUBECTL}" delete -f "${RESOURCE_DIRECTORY}/kubemark-ns.json" &> /dev/null || true
rm -rf "${RESOURCE_DIRECTORY}/addons" \ rm -rf "${RESOURCE_DIRECTORY}/addons" \
"${RESOURCE_DIRECTORY}/kubeconfig.kubemark" \ "${RESOURCE_DIRECTORY}/kubeconfig.kubemark" \
"${RESOURCE_DIRECTORY}/hollow-node.json" \ "${RESOURCE_DIRECTORY}/hollow-node.yaml" \
"${RESOURCE_DIRECTORY}/kubemark-master-env.sh" &> /dev/null || true "${RESOURCE_DIRECTORY}/kubemark-master-env.sh" &> /dev/null || true
delete-master-instance-and-resources delete-master-instance-and-resources