Skip to content

Commit 09596a5

Browse files
authored
Merge pull request kubernetes#126295 from sohankunkerkar/denoise-watcher-events
dynamiccertificates: denoise Kubelet logs by skipping removal of non-existent file watchers
2 parents bb2b52e + 17ad4b3 commit 09596a5

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

staging/src/k8s.io/apiserver/pkg/server/dynamiccertificates/dynamic_cafile_content.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"bytes"
2121
"context"
2222
"crypto/x509"
23+
"errors"
2324
"fmt"
2425
"os"
2526
"sync/atomic"
@@ -210,7 +211,7 @@ func (c *DynamicFileCAContent) handleWatchEvent(e fsnotify.Event, w *fsnotify.Wa
210211
if !e.Has(fsnotify.Remove) && !e.Has(fsnotify.Rename) {
211212
return nil
212213
}
213-
if err := w.Remove(c.filename); err != nil {
214+
if err := w.Remove(c.filename); err != nil && !errors.Is(err, fsnotify.ErrNonExistentWatch) {
214215
klog.InfoS("Failed to remove file watch, it may have been deleted", "file", c.filename, "err", err)
215216
}
216217
if err := w.Add(c.filename); err != nil {

0 commit comments

Comments
 (0)