Skip to content
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

Jump to bottom

USHIFT-3770: Add service to cleanup stale kubelet files on boot #3657

Merged
merged 1 commit into from
Jul 24, 2024
Merged

USHIFT-3770: Add service to cleanup stale kubelet files on boot #3657

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
7 changes: 7 additions & 0 deletions packaging/rpm/microshift.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,9 @@ cat assets/optional/multus/kustomization.x86_64.yaml >> %{buildroot}/%{_prefix}/
mkdir -p -m755 %{buildroot}%{_datadir}/microshift/release
install -p -m644 assets/optional/multus/release-multus-{x86_64,aarch64}.json %{buildroot}%{_datadir}/microshift/release/

# cleanup kubelet
install -p -m644 packaging/tuned/microshift-cleanup-kubelet.service %{buildroot}%{_unitdir}/microshift-cleanup-kubelet.service

%pre networking

getent group hugetlbfs >/dev/null || groupadd -r hugetlbfs
Expand Down Expand Up @@ -409,6 +412,7 @@ fi
%{_bindir}/microshift-cleanup-data
%{_bindir}/microshift-sos-report
%{_unitdir}/microshift.service
%{_unitdir}/microshift-cleanup-kubelet.service
%{_sysconfdir}/crio/crio.conf.d/00-crio-crun.conf
%{_sysconfdir}/crio/crio.conf.d/10-microshift.conf
%{_datadir}/microshift/spec/config-openapi-spec.json
Expand Down Expand Up @@ -478,6 +482,9 @@ fi
# Use Git command to generate the log and replace the VERSION string
# LANG=C git log --date="format:%a %b %d %Y" --pretty="tformat:* %cd %an <%ae> VERSION%n- %s%n" packaging/rpm/microshift.spec
%changelog
* Thu Jul 18 2024 Patryk Matuszak <pmatusza@redhat.com> 4.17.0
- Add service to cleanup stale kubelet files on boot

* Mon Jul 08 2024 Pablo Acevedo Montserrat <pacevedo@redhat.com> 4.17.0
- Add NM configuration file

Expand Down
15 changes: 15 additions & 0 deletions packaging/tuned/microshift-cleanup-kubelet.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# There are systems with multiple NUMA node that can change reported memory after rebooting
# causing kubelet's Memory Manager to block startup.
# To work around this, this unit will delete stale files on boot.
# Borrowed from: https://github.com/openshift/machine-config-operator/pull/4124
[Unit]
Description=Delete Kubelet CPU and Memory managers state on boot
Before=microshift.service

[Service]
Type=oneshot
ExecStart=/bin/rm -f /var/lib/kubelet/cpu_manager_state
ExecStart=/bin/rm -f /var/lib/kubelet/memory_manager_state

[Install]
WantedBy=multi-user.target
2 changes: 2 additions & 0 deletions scripts/microshift-cleanup-data.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ function clean_data() {
if ${FULL_CLEAN} ; then
echo Removing MicroShift configuration
rm -rf /var/lib/microshift
# Best effort - it contains Pod volumes which sometimes cannot be removed (Device or resource busy)
rm -rf /var/lib/kubelet 2>/dev/null || true
elif ${CERT_CLEAN} ; then
echo Removing MicroShift certificates
rm -rf /var/lib/microshift/certs
Expand Down