Merge pull request #80689 from Pothulapati/inotify

Switch to k8s.io/utils/inotify

cmd/kubelet/app/BUILD

@@ -145,7 +145,7 @@ go_library(
         "//vendor/k8s.io/utils/exec:go_default_library",
     ] + select({
         "@io_bazel_rules_go//go/platform:linux": [
-            "//vendor/github.com/sigma/go-inotify:go_default_library",
+            "//vendor/k8s.io/utils/inotify:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:windows": [
             "//pkg/windows/service:go_default_library",

cmd/kubelet/app/server_linux.go

@@ -17,8 +17,8 @@ limitations under the License.
 package app
 
 import (
-	"github.com/sigma/go-inotify"
 	"k8s.io/klog"
+	"k8s.io/utils/inotify"
 )
 
 func watchForLockfileContention(path string, done chan struct{}) error {
@@ -27,7 +27,7 @@ func watchForLockfileContention(path string, done chan struct{}) error {
 		klog.Errorf("unable to create watcher for lockfile: %v", err)
 		return err
 	}
-	if err = watcher.AddWatch(path, inotify.IN_OPEN|inotify.IN_DELETE_SELF); err != nil {
+	if err = watcher.AddWatch(path, inotify.InOpen|inotify.InDeleteSelf); err != nil {
 		klog.Errorf("unable to watch lockfile: %v", err)
 		return err
 	}

go.mod

@@ -113,7 +113,7 @@ require (
 	github.com/robfig/cron v1.1.0
 	github.com/russross/blackfriday v1.5.2
 	github.com/seccomp/libseccomp-golang v0.9.1 // indirect
-	github.com/sigma/go-inotify v0.0.0-20181102212354-c87b6cf5033d
+	github.com/sigma/go-inotify v0.0.0-20181102212354-c87b6cf5033d // indirect
 	github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a // indirect
 	github.com/spf13/afero v1.2.2
 	github.com/spf13/cobra v0.0.4

vendor/BUILD

@@ -470,6 +470,7 @@ filegroup(
         "//vendor/k8s.io/utils/buffer:all-srcs",
         "//vendor/k8s.io/utils/clock:all-srcs",
         "//vendor/k8s.io/utils/exec:all-srcs",
+        "//vendor/k8s.io/utils/inotify:all-srcs",
         "//vendor/k8s.io/utils/integer:all-srcs",
         "//vendor/k8s.io/utils/io:all-srcs",
         "//vendor/k8s.io/utils/keymutex:all-srcs",