diff --git a/cmd/webhook/server.go b/cmd/webhook/server.go index 773b73ea2be..6a7cae97e3a 100644 --- a/cmd/webhook/server.go +++ b/cmd/webhook/server.go @@ -9,8 +9,8 @@ import ( appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/klog/klogr" "k8s.io/klog/v2" + "k8s.io/klog/v2/klogr" ctrl "sigs.k8s.io/controller-runtime" ctrlwebhook "sigs.k8s.io/controller-runtime/pkg/webhook" diff --git a/go.mod b/go.mod index c0e2625eb12..16c382b54be 100644 --- a/go.mod +++ b/go.mod @@ -30,8 +30,7 @@ require ( k8s.io/api v0.20.4 k8s.io/apimachinery v0.20.4 k8s.io/client-go v12.0.0+incompatible - k8s.io/klog v1.0.0 - k8s.io/klog/v2 v2.80.1 + k8s.io/klog/v2 v2.4.0 k8s.io/sample-controller v0.0.0-20190326030654-b8f621986e45 kubevirt.io/client-go v0.49.0 sigs.k8s.io/controller-runtime v0.8.3 @@ -55,7 +54,7 @@ require ( github.com/go-ini/ini v1.42.0 // indirect github.com/go-kit/kit v0.9.0 // indirect github.com/go-logfmt/logfmt v0.5.0 // indirect - github.com/go-logr/logr v1.2.0 // indirect + github.com/go-logr/logr v0.3.0 // indirect github.com/go-openapi/jsonpointer v0.19.3 // indirect github.com/go-openapi/jsonreference v0.19.3 // indirect github.com/go-openapi/spec v0.19.5 // indirect diff --git a/go.sum b/go.sum index 6252724f80d..5044f5b8c12 100644 --- a/go.sum +++ b/go.sum @@ -249,9 +249,8 @@ github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= +github.com/go-logr/logr v0.3.0 h1:q4c+kbcR0d5rSurhBR8dIgieOaYpXtsdTYfx22Cu6rs= github.com/go-logr/logr v0.3.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-logr/logr v1.2.0 h1:QK40JKJyMdUDz+h+xvCsru/bJhvG0UxvePV0ufL/AcE= -github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/zapr v0.2.0 h1:v6Ji8yBW77pva6NkJKQdHLAJKrIJKRHz0RXwPqCHSR4= github.com/go-logr/zapr v0.2.0/go.mod h1:qhKdvif7YF5GI9NWEpyxTSSBdGmzkNguibrdCNVPunU= github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= @@ -1358,9 +1357,8 @@ k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= +k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= -k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= -k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20181114233023-0317810137be/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= k8s.io/kube-openapi v0.0.0-20190709113604-33be087ad058/go.mod h1:nfDlWeOsu3pUf4yWGL+ERqohP4YsZcBJXWMK+gkzOA4= k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= diff --git a/pkg/apis/kubeovn/v1/status.go b/pkg/apis/kubeovn/v1/status.go index ea43e604fbb..4b65013498c 100644 --- a/pkg/apis/kubeovn/v1/status.go +++ b/pkg/apis/kubeovn/v1/status.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "k8s.io/klog" + "k8s.io/klog/v2" ) func (ss *SubnetStatus) Bytes() ([]byte, error) { diff --git a/pkg/util/klog.go b/pkg/util/klog.go index c14a2397b09..1602f626a29 100644 --- a/pkg/util/klog.go +++ b/pkg/util/klog.go @@ -2,11 +2,27 @@ package util import ( "fmt" + "os" + "time" "k8s.io/klog/v2" ) +const klogExitFlushTimeout = 10 * time.Second + func LogFatalAndExit(err error, format string, a ...interface{}) { klog.ErrorS(err, fmt.Sprintf(format, a...)) - klog.FlushAndExit(klog.ExitFlushTimeout, 1) + + done := make(chan bool, 1) + go func() { + klog.Flush() // calls logging.lockAndFlushAll() + done <- true + }() + select { + case <-done: + case <-time.After(klogExitFlushTimeout): + fmt.Fprintln(os.Stderr, "klog: Flush took longer than", klogExitFlushTimeout) + } + + os.Exit(1) } diff --git a/pkg/util/net.go b/pkg/util/net.go index 4690dfdd644..79b3fbce307 100644 --- a/pkg/util/net.go +++ b/pkg/util/net.go @@ -11,7 +11,7 @@ import ( "strings" "golang.org/x/sys/unix" - "k8s.io/klog" + "k8s.io/klog/v2" kubeovnv1 "github.com/kubeovn/kube-ovn/pkg/apis/kubeovn/v1" ) diff --git a/pkg/util/network_attachment.go b/pkg/util/network_attachment.go index 50f3ec2a01d..373c61a5338 100644 --- a/pkg/util/network_attachment.go +++ b/pkg/util/network_attachment.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/intel/multus-cni/types" - "k8s.io/klog" + "k8s.io/klog/v2" ) func parsePodNetworkObjectName(podnetwork string) (string, string, string, error) { diff --git a/pkg/util/pod_exec.go b/pkg/util/pod_exec.go index 1fd0f1bb03e..7dca80afa49 100644 --- a/pkg/util/pod_exec.go +++ b/pkg/util/pod_exec.go @@ -11,7 +11,7 @@ import ( "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" "k8s.io/client-go/tools/remotecommand" - "k8s.io/klog" + "k8s.io/klog/v2" ) type ExecOptions struct { diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go index 51e6cdf9885..98b0bf2e480 100644 --- a/test/e2e/framework/framework.go +++ b/test/e2e/framework/framework.go @@ -17,7 +17,7 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/remotecommand" - "k8s.io/klog" + "k8s.io/klog/v2" . "github.com/onsi/ginkgo" diff --git a/test/e2e/subnet/normal.go b/test/e2e/subnet/normal.go index 95283ef9b3f..149a238a2f3 100644 --- a/test/e2e/subnet/normal.go +++ b/test/e2e/subnet/normal.go @@ -10,7 +10,7 @@ import ( corev1 "k8s.io/api/core/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/klog" + "k8s.io/klog/v2" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/underlay/underlay.go b/test/e2e/underlay/underlay.go index 3a54d0c47a2..e4f84fc77e6 100644 --- a/test/e2e/underlay/underlay.go +++ b/test/e2e/underlay/underlay.go @@ -10,7 +10,7 @@ import ( corev1 "k8s.io/api/core/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/klog" + "k8s.io/klog/v2" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega"