Skip to content

K
k3s
Commit 70b23123 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #15798 from yifan-gu/rkt_gc_service

Auto commit by PR queue bot
parents d94e4d64 22467d9d
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
pkg/kubelet/rkt/rkt.go
View file @ 70b23123
...@@ -1096,7 +1096,7 @@ func (r *Runtime) GarbageCollect(gcPolicy kubecontainer.ContainerGCPolicy) error ...@@ -1096,7 +1096,7 @@ func (r *Runtime) GarbageCollect(gcPolicy kubecontainer.ContainerGCPolicy) error
return err return err
} }
for _, f := range files { for _, f := range files {
if runningKubernetesUnits.Has(f.Name()) && f.ModTime().Before(time.Now().Add(-gcPolicy.MinAge)) { if !runningKubernetesUnits.Has(f.Name()) && f.ModTime().Before(time.Now().Add(-gcPolicy.MinAge)) {
glog.V(4).Infof("rkt: Removing inactive systemd service file: %v", f.Name()) glog.V(4).Infof("rkt: Removing inactive systemd service file: %v", f.Name())
if err := os.Remove(serviceFilePath(f.Name())); err != nil { if err := os.Remove(serviceFilePath(f.Name())); err != nil {
glog.Warningf("rkt: Failed to remove inactive systemd service file %v: %v", f.Name(), err) glog.Warningf("rkt: Failed to remove inactive systemd service file %v: %v", f.Name(), err)
......
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