Merge pull request #805 from hakman/demove-dep-cadvisor

Remove direct dependency on google/[email protected]

Author: k8s-ci-robot

go.mod

@@ -12,7 +12,6 @@ require (
 	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
 	github.com/euank/go-kmsg-parser v2.0.0+incompatible
 	github.com/golang/glog v1.1.1
-	github.com/google/cadvisor v0.36.0
 	github.com/hpcloud/tail v1.0.0
 	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/gomega v1.27.8

go.sum

@@ -19,9 +19,8 @@ package filelog
 import (
 	"fmt"
 	"io"
+	"k8s.io/node-problem-detector/third_party/forked/cadvisor/tail"
 	"os"
-
-	"github.com/google/cadvisor/utils/tail"
 )
 
 // getLogReader returns log reader for filelog log. Note that getLogReader doesn't look back

pkg/systemlogmonitor/logwatchers/filelog/log_watcher_linux.go

@@ -0,0 +1 @@
+Forked from https://github.com/google/cadvisor/blob/8016f8ba96e74fb2001b121e0145dc2d0fe056e3/utils/tail/tail.go to support simple file tailing.

vendor/github.com/google/cadvisor/AUTHORS renamed to third_party/forked/cadvisor/AUTHORS

@@ -147,9 +147,6 @@ github.com/golang/protobuf/ptypes/any
 github.com/golang/protobuf/ptypes/duration
 github.com/golang/protobuf/ptypes/timestamp
 github.com/golang/protobuf/ptypes/wrappers
-# github.com/google/cadvisor v0.36.0
-## explicit; go 1.13
-github.com/google/cadvisor/utils/tail
 # github.com/google/gnostic-models v0.6.8
 ## explicit; go 1.18
 github.com/google/gnostic-models/compiler