mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 04:06:03 +00:00
Merge pull request #64013 from hzxuzhonghu/rm-duplicate
Automatic merge from submit-queue (batch tested with PRs 64013, 63896, 64139, 57527, 62102). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. kubectl uses its own pkg/kubectl/util/logs kubectl uses its own logs instead of `staging/src/k8s.io/apiserver/pkg/util/logs` **Release note**: ```release-note NONE ```
This commit is contained in:
commit
195914d02a
@ -20,9 +20,9 @@ go_library(
|
|||||||
visibility = ["//visibility:private"],
|
visibility = ["//visibility:private"],
|
||||||
deps = [
|
deps = [
|
||||||
"//pkg/kubectl/cmd:go_default_library",
|
"//pkg/kubectl/cmd:go_default_library",
|
||||||
|
"//pkg/kubectl/util/logs:go_default_library",
|
||||||
"//vendor/github.com/spf13/pflag:go_default_library",
|
"//vendor/github.com/spf13/pflag:go_default_library",
|
||||||
"//vendor/k8s.io/apiserver/pkg/util/flag:go_default_library",
|
"//vendor/k8s.io/apiserver/pkg/util/flag:go_default_library",
|
||||||
"//vendor/k8s.io/apiserver/pkg/util/logs:go_default_library",
|
|
||||||
"//vendor/k8s.io/client-go/plugin/pkg/client/auth:go_default_library",
|
"//vendor/k8s.io/client-go/plugin/pkg/client/auth:go_default_library",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
@ -26,8 +26,8 @@ import (
|
|||||||
"github.com/spf13/pflag"
|
"github.com/spf13/pflag"
|
||||||
|
|
||||||
utilflag "k8s.io/apiserver/pkg/util/flag"
|
utilflag "k8s.io/apiserver/pkg/util/flag"
|
||||||
"k8s.io/apiserver/pkg/util/logs"
|
|
||||||
"k8s.io/kubernetes/pkg/kubectl/cmd"
|
"k8s.io/kubernetes/pkg/kubectl/cmd"
|
||||||
|
"k8s.io/kubernetes/pkg/kubectl/util/logs"
|
||||||
|
|
||||||
// Import to initialize client auth plugins.
|
// Import to initialize client auth plugins.
|
||||||
_ "k8s.io/client-go/plugin/pkg/client/auth"
|
_ "k8s.io/client-go/plugin/pkg/client/auth"
|
||||||
|
@ -46,7 +46,7 @@ func (writer GlogWriter) Write(data []byte) (n int, err error) {
|
|||||||
func InitLogs() {
|
func InitLogs() {
|
||||||
log.SetOutput(GlogWriter{})
|
log.SetOutput(GlogWriter{})
|
||||||
log.SetFlags(0)
|
log.SetFlags(0)
|
||||||
// The default glog flush interval is 30 seconds, which is frighteningly long.
|
// The default glog flush interval is 5 seconds.
|
||||||
go wait.Until(glog.Flush, *logFlushFreq, wait.NeverStop)
|
go wait.Until(glog.Flush, *logFlushFreq, wait.NeverStop)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user