diff --git a/hack/.golint_failures b/hack/.golint_failures index 109e6c790f0..8cf89a0814c 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -101,6 +101,7 @@ pkg/kubelet/apis/config/v1beta1 pkg/kubelet/cm pkg/kubelet/container pkg/kubelet/container/testing +pkg/kubelet/cri/remote pkg/kubelet/dockershim pkg/kubelet/dockershim/libdocker pkg/kubelet/dockershim/network @@ -113,7 +114,6 @@ pkg/kubelet/lifecycle pkg/kubelet/pluginmanager/pluginwatcher pkg/kubelet/pod/testing pkg/kubelet/preemption -pkg/kubelet/remote pkg/kubelet/stats pkg/kubelet/sysctl pkg/kubelet/types diff --git a/pkg/kubelet/cri/.import-restrictions b/pkg/kubelet/cri/.import-restrictions index 26ce0c0c025..10215ff9251 100644 --- a/pkg/kubelet/cri/.import-restrictions +++ b/pkg/kubelet/cri/.import-restrictions @@ -1,5 +1,5 @@ rules: # prevent exposing internal api in streaming packages - selectorRegexp: k8s[.]io/kubernetes - forbiddenPrefixes: - - '' + allowedPrefixes: + - k8s.io/kubernetes/pkg/kubelet/cri diff --git a/pkg/kubelet/cri/remote/BUILD b/pkg/kubelet/cri/remote/BUILD index 44d99d23a36..5ea0f5db56b 100644 --- a/pkg/kubelet/cri/remote/BUILD +++ b/pkg/kubelet/cri/remote/BUILD @@ -16,7 +16,7 @@ go_library( ], importpath = "k8s.io/kubernetes/pkg/kubelet/cri/remote", deps = [ - "//pkg/kubelet/util:go_default_library", + "//pkg/kubelet/cri/remote/util:go_default_library", "//staging/src/k8s.io/component-base/logs/logreduction:go_default_library", "//staging/src/k8s.io/cri-api/pkg/apis:go_default_library", "//staging/src/k8s.io/cri-api/pkg/apis/runtime/v1alpha2:go_default_library", @@ -38,6 +38,7 @@ filegroup( srcs = [ ":package-srcs", "//pkg/kubelet/cri/remote/fake:all-srcs", + "//pkg/kubelet/cri/remote/util:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/kubelet/cri/remote/fake/BUILD b/pkg/kubelet/cri/remote/fake/BUILD index 89b602495a6..8d139ccce4a 100644 --- a/pkg/kubelet/cri/remote/fake/BUILD +++ b/pkg/kubelet/cri/remote/fake/BUILD @@ -18,7 +18,7 @@ go_library( ], importpath = "k8s.io/kubernetes/pkg/kubelet/cri/remote/fake", deps = [ - "//pkg/kubelet/util:go_default_library", + "//pkg/kubelet/cri/remote/util:go_default_library", "//staging/src/k8s.io/cri-api/pkg/apis/runtime/v1alpha2:go_default_library", "//staging/src/k8s.io/cri-api/pkg/apis/testing:go_default_library", "//vendor/google.golang.org/grpc:go_default_library", diff --git a/pkg/kubelet/cri/remote/util/BUILD b/pkg/kubelet/cri/remote/util/BUILD new file mode 100644 index 00000000000..5b91eec3236 --- /dev/null +++ b/pkg/kubelet/cri/remote/util/BUILD @@ -0,0 +1,89 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") + +go_library( + name = "go_default_library", + srcs = [ + "util_unix.go", + "util_unsupported.go", + "util_windows.go", + ], + importpath = "k8s.io/kubernetes/pkg/kubelet/cri/remote/util", + visibility = ["//visibility:public"], + deps = select({ + "@io_bazel_rules_go//go/platform:android": [ + "//vendor/golang.org/x/sys/unix:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", + ], + "@io_bazel_rules_go//go/platform:darwin": [ + "//vendor/golang.org/x/sys/unix:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", + ], + "@io_bazel_rules_go//go/platform:freebsd": [ + "//vendor/golang.org/x/sys/unix:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", + ], + "@io_bazel_rules_go//go/platform:ios": [ + "//vendor/golang.org/x/sys/unix:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", + ], + "@io_bazel_rules_go//go/platform:linux": [ + "//vendor/golang.org/x/sys/unix:go_default_library", + "//vendor/k8s.io/klog/v2:go_default_library", + ], + "@io_bazel_rules_go//go/platform:windows": [ + "//vendor/github.com/Microsoft/go-winio:go_default_library", + ], + "//conditions:default": [], + }), +) + +go_test( + name = "go_default_test", + srcs = [ + "util_unix_test.go", + "util_windows_test.go", + ], + embed = [":go_default_library"], + deps = select({ + "@io_bazel_rules_go//go/platform:android": [ + "//vendor/github.com/stretchr/testify/assert:go_default_library", + "//vendor/github.com/stretchr/testify/require:go_default_library", + ], + "@io_bazel_rules_go//go/platform:darwin": [ + "//vendor/github.com/stretchr/testify/assert:go_default_library", + "//vendor/github.com/stretchr/testify/require:go_default_library", + ], + "@io_bazel_rules_go//go/platform:freebsd": [ + "//vendor/github.com/stretchr/testify/assert:go_default_library", + "//vendor/github.com/stretchr/testify/require:go_default_library", + ], + "@io_bazel_rules_go//go/platform:ios": [ + "//vendor/github.com/stretchr/testify/assert:go_default_library", + "//vendor/github.com/stretchr/testify/require:go_default_library", + ], + "@io_bazel_rules_go//go/platform:linux": [ + "//vendor/github.com/stretchr/testify/assert:go_default_library", + "//vendor/github.com/stretchr/testify/require:go_default_library", + ], + "@io_bazel_rules_go//go/platform:windows": [ + "//vendor/github.com/Microsoft/go-winio:go_default_library", + "//vendor/github.com/stretchr/testify/assert:go_default_library", + "//vendor/github.com/stretchr/testify/require:go_default_library", + ], + "//conditions:default": [], + }), +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], + visibility = ["//visibility:public"], +) diff --git a/pkg/kubelet/cri/remote/util/util_unix.go b/pkg/kubelet/cri/remote/util/util_unix.go index df9a65c5fa0..b8097ff57fd 100644 --- a/pkg/kubelet/cri/remote/util/util_unix.go +++ b/pkg/kubelet/cri/remote/util/util_unix.go @@ -28,7 +28,7 @@ import ( "path/filepath" "golang.org/x/sys/unix" - "k8s.io/klog" + "k8s.io/klog/v2" ) const ( diff --git a/vendor/modules.txt b/vendor/modules.txt index 1770b9c9248..091013dede6 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1668,6 +1668,7 @@ k8s.io/component-base/configz k8s.io/component-base/featuregate k8s.io/component-base/featuregate/testing k8s.io/component-base/logs +k8s.io/component-base/logs/logreduction k8s.io/component-base/metrics k8s.io/component-base/metrics/legacyregistry k8s.io/component-base/metrics/prometheus/clientgo