Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace golang.org/x/exp/inotify with standalone library #71011

Merged
merged 1 commit into from
Nov 23, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 0 additions & 4 deletions Godeps/Godeps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 0 additions & 35 deletions Godeps/LICENSES

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/kubelet/app/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ go_library(
"//vendor/k8s.io/utils/exec:go_default_library",
] + select({
"@io_bazel_rules_go//go/platform:linux": [
"//vendor/golang.org/x/exp/inotify:go_default_library",
"//vendor/github.com/sigma/go-inotify:go_default_library",
],
"@io_bazel_rules_go//go/platform:windows": [
"//pkg/windows/service:go_default_library",
Expand Down
2 changes: 1 addition & 1 deletion cmd/kubelet/app/server_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package app

import (
"golang.org/x/exp/inotify"
"github.com/sigma/go-inotify"
"k8s.io/klog"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/config/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ go_library(
] + select({
"@io_bazel_rules_go//go/platform:linux": [
"//staging/src/k8s.io/client-go/util/flowcontrol:go_default_library",
"//vendor/golang.org/x/exp/inotify:go_default_library",
"//vendor/github.com/sigma/go-inotify:go_default_library",
],
"//conditions:default": [],
}),
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/config/file.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ type sourceFile struct {
}

func NewSourceFile(path string, nodeName types.NodeName, period time.Duration, updates chan<- interface{}) {
// "golang.org/x/exp/inotify" requires a path without trailing "/"
// "github.com/sigma/go-inotify" requires a path without trailing "/"
path = strings.TrimRight(path, string(os.PathSeparator))

config := newSourceFile(path, nodeName, period, updates)
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/config/file_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"strings"
"time"

"golang.org/x/exp/inotify"
"github.com/sigma/go-inotify"
"k8s.io/klog"

"k8s.io/api/core/v1"
Expand Down
1 change: 0 additions & 1 deletion vendor/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,6 @@ filegroup(
"//vendor/golang.org/x/crypto/poly1305:all-srcs",
"//vendor/golang.org/x/crypto/salsa20/salsa:all-srcs",
"//vendor/golang.org/x/crypto/ssh:all-srcs",
"//vendor/golang.org/x/exp/inotify:all-srcs",
"//vendor/golang.org/x/net/context:all-srcs",
"//vendor/golang.org/x/net/html:all-srcs",
"//vendor/golang.org/x/net/http2:all-srcs",
Expand Down
3 changes: 0 additions & 3 deletions vendor/golang.org/x/exp/AUTHORS

This file was deleted.

3 changes: 0 additions & 3 deletions vendor/golang.org/x/exp/CONTRIBUTORS

This file was deleted.

27 changes: 0 additions & 27 deletions vendor/golang.org/x/exp/LICENSE

This file was deleted.

22 changes: 0 additions & 22 deletions vendor/golang.org/x/exp/PATENTS

This file was deleted.

23 changes: 0 additions & 23 deletions vendor/golang.org/x/exp/inotify/BUILD

This file was deleted.