Skip to content

Improve and pack the cleanup script in the rpms #420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oglok merged 1 commit into from
Nov 4, 2021
Merged

Improve and pack the cleanup script in the rpms #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions hack/cleanup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,26 @@
#!/bin/sh

set -eu

echo "DATA LOSS WARNING: Do you wish to stop and cleanup ALL MicroShift data AND cri-o container workloads?"
select yn in "Yes" "No"; do
case "${yn}" in
Yes ) break ;;
* ) echo "aborting cleanup; " ; exit;;
esac
done

# crictl redirect STDOUT. When no objects (pod, image, container) are present, crictl dump the help menu instead. This may be confusing to users.
sudo bash -c '
echo "Stopping microshift"
set +e
systemctl stop --now microshift 2>/dev/null
systemctl disable microshift 2>/dev/null
systemctl stop --now microshift-containerized 2>/dev/null
systemctl disable microshift-containerized 2>/dev/null
podman stop microshift 2>/dev/null
podman stop microshift-aio 2>/dev/null
set -e

echo "Removing crio pods"
until crictl rmp --all --force 1>/dev/null; do sleep 1; done

Expand All @@ -13,10 +30,12 @@ sudo bash -c '
echo "Removing crio images"
crictl rmi --all --prune 1>/dev/null

echo "Killing conmoni, pause processes"
echo "Killing conmon, pause processes"
pkill -9 conmon
pkill -9 pause



echo "Removing /var/lib/microshift"
rm -rf /var/lib/microshift

Expand Down
6 changes: 6 additions & 0 deletions packaging/rpm/microshift.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,8 @@ make

install -d %{buildroot}%{_bindir}
install -p -m755 ./_output/microshift %{buildroot}%{_bindir}/microshift
install -p -m755 hack/cleanup.sh %{buildroot}%{_bindir}/cleanup-all-microshift-data

restorecon -v %{buildroot}%{_bindir}/microshift

install -d -m755 %{buildroot}/%{_unitdir}
Expand Down Expand Up @@ -174,6 +176,7 @@ fi

%license LICENSE
%{_bindir}/microshift
%{_bindir}/cleanup-all-microshift-data
%{_unitdir}/microshift.service

%files selinux
Expand All @@ -182,6 +185,9 @@ fi
%ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/microshift

%changelog
* Thu Nov 4 2021 Miguel Angel Ajo <majopela@redhat.com> . 4.8.0-nightly-13-g886705e5
- Include the cleanup-all-microshift-data script for convenience

* Thu Sep 23 2021 Miguel Angel Ajo <majopela@redhat.com> . 4.7.0-021_08_31_224727_40_g5c23735f
- Support commit based builds
- workaround rpmbuild with no build in place support
Expand Down