Skip to content

Commit 6d49d69

Browse files
authored
Merge pull request kubernetes#80689 from Pothulapati/inotify
Switch to k8s.io/utils/inotify
2 parents 19e85a9 + e3c21d6 commit 6d49d69

File tree

10 files changed

+416
-4
lines changed

10 files changed

+416
-4
lines changed

cmd/kubelet/app/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ go_library(
145145
"//vendor/k8s.io/utils/exec:go_default_library",
146146
] + select({
147147
"@io_bazel_rules_go//go/platform:linux": [
148-
"//vendor/github.com/sigma/go-inotify:go_default_library",
148+
"//vendor/k8s.io/utils/inotify:go_default_library",
149149
],
150150
"@io_bazel_rules_go//go/platform:windows": [
151151
"//pkg/windows/service:go_default_library",

cmd/kubelet/app/server_linux.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ limitations under the License.
1717
package app
1818

1919
import (
20-
"github.com/sigma/go-inotify"
2120
"k8s.io/klog"
21+
"k8s.io/utils/inotify"
2222
)
2323

2424
func watchForLockfileContention(path string, done chan struct{}) error {
@@ -27,7 +27,7 @@ func watchForLockfileContention(path string, done chan struct{}) error {
2727
klog.Errorf("unable to create watcher for lockfile: %v", err)
2828
return err
2929
}
30-
if err = watcher.AddWatch(path, inotify.IN_OPEN|inotify.IN_DELETE_SELF); err != nil {
30+
if err = watcher.AddWatch(path, inotify.InOpen|inotify.InDeleteSelf); err != nil {
3131
klog.Errorf("unable to watch lockfile: %v", err)
3232
return err
3333
}

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ require (
113113
github.com/robfig/cron v1.1.0
114114
github.com/russross/blackfriday v1.5.2
115115
github.com/seccomp/libseccomp-golang v0.9.1 // indirect
116-
github.com/sigma/go-inotify v0.0.0-20181102212354-c87b6cf5033d
116+
github.com/sigma/go-inotify v0.0.0-20181102212354-c87b6cf5033d // indirect
117117
github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a // indirect
118118
github.com/spf13/afero v1.2.2
119119
github.com/spf13/cobra v0.0.4

vendor/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -470,6 +470,7 @@ filegroup(
470470
"//vendor/k8s.io/utils/buffer:all-srcs",
471471
"//vendor/k8s.io/utils/clock:all-srcs",
472472
"//vendor/k8s.io/utils/exec:all-srcs",
473+
"//vendor/k8s.io/utils/inotify:all-srcs",
473474
"//vendor/k8s.io/utils/integer:all-srcs",
474475
"//vendor/k8s.io/utils/io:all-srcs",
475476
"//vendor/k8s.io/utils/keymutex:all-srcs",

vendor/k8s.io/utils/inotify/BUILD

Lines changed: 23 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/utils/inotify/LICENSE

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/utils/inotify/PATENTS

Lines changed: 22 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/utils/inotify/README.md

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)