Skip to content

Commit

Permalink
Fix make vagrant-deploy after namespace change
Browse files Browse the repository at this point in the history
Signed-off-by: David Vossel <[email protected]>
  • Loading branch information
davidvossel committed Nov 17, 2017
1 parent 54c961c commit a8381a2
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions cluster/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,14 @@ EOF

echo "Cleaning up ..."
# Work around https://github.com/kubernetes/kubernetes/issues/33517
cluster/kubectl.sh --core delete -f manifests/virt-handler.yaml --cascade=false --grace-period 0 2>/dev/null || :
cluster/kubectl.sh --core delete pods -l=daemon=virt-handler --force --grace-period 0 2>/dev/null || :
$KUBECTL delete -f manifests/virt-handler.yaml --cascade=false --grace-period 0 2>/dev/null || :
$KUBECTL delete pods -n kube-system -l=daemon=virt-handler --force --grace-period 0 2>/dev/null || :

cluster/kubectl.sh --core delete -f manifests/libvirt.yaml --cascade=false --grace-period 0 2>/dev/null || :
cluster/kubectl.sh --core delete pods -l=daemon=libvirt --force --grace-period 0 2>/dev/null || :

# Make sure TPRs are deleted, we use CRDs now
cluster/kubectl.sh --core delete thirdpartyresources --all || :
$KUBECTL delete -f manifests/libvirt.yaml --cascade=false --grace-period 0 2>/dev/null || :
$KUBECTL delete pods -n kube-system -l=daemon=libvirt --force --grace-period 0 2>/dev/null || :

# Make sure that the vms CRD is deleted, we use virtualmachines now
cluster/kubectl.sh --core delete customresourcedefinitions vms.kubevirt.io || :
$KUBECTL delete customresourcedefinitions vms.kubevirt.io || :

# Remove all external facing services
externalServiceManifests | cluster/kubectl.sh --core delete -f - || :
Expand Down

0 comments on commit a8381a2

Please sign in to comment.