starlingx/config-files
Code Issues Proposed changes

Add k8s container cleanup to containerd service

Browse Source 
This adds ExecStop=/usr/local/sbin/k8s-container-cleanup
to containerd.service. This will execute the container
cleanup prior to containerd.service is stopped.

Depends-On: https://review.opendev.org/c/starlingx/integ/+/834973
Closes-Bug: 1964111

Signed-off-by: Jim Gauld <james.gauld@windriver.com>
Change-Id: I4cd585b9fae630a278e830057cf71496fdf41007
This commit is contained in:
Jim Gauld 2022-03-23 18:50:31 -04:00
parent d0c2ef06eb
commit e7b7dbad7c
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
containerd-config/files/containerd-stx-override.conf
View File

@ -1,5 +1,6 @@
[Service] [Service]
ExecStartPost=/bin/bash -c 'echo $MAINPID > /var/run/containerd.pid;' ExecStartPost=/bin/bash -c 'echo $MAINPID > /var/run/containerd.pid;'
ExecStop=-/usr/local/sbin/k8s-container-cleanup
ExecStopPost=/bin/rm -f /var/run/containerd.pid ExecStopPost=/bin/rm -f /var/run/containerd.pid
# pmond monitors containerd service # pmond monitors containerd service

1
containerd-config/source-debian/containerd-stx-override.conf
View File

@ -1,5 +1,6 @@
[Service] [Service]
ExecStartPost=/bin/bash -c 'echo $MAINPID > /var/run/containerd.pid;' ExecStartPost=/bin/bash -c 'echo $MAINPID > /var/run/containerd.pid;'
ExecStop=-/usr/local/sbin/k8s-container-cleanup
ExecStopPost=/bin/rm -f /var/run/containerd.pid ExecStopPost=/bin/rm -f /var/run/containerd.pid
# pmond monitors containerd service # pmond monitors containerd service