Skip to content

K
k3s
Commit d1fef174 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #45586 from shyamjvs/yolo

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
parents b040513a 1fc831e0
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
test/kubemark/stop-kubemark.sh
View file @ d1fef174
...@@ -31,12 +31,12 @@ RESOURCE_DIRECTORY="${KUBEMARK_DIRECTORY}/resources" ...@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment