diff --git a/cmd/yurt-controller-manager/app/controllermanager.go b/cmd/yurt-controller-manager/app/controllermanager.go index 6847e84f505..4cce627ba54 100644 --- a/cmd/yurt-controller-manager/app/controllermanager.go +++ b/cmd/yurt-controller-manager/app/controllermanager.go @@ -45,7 +45,7 @@ import ( cliflag "k8s.io/component-base/cli/flag" "k8s.io/component-base/cli/globalflag" "k8s.io/component-base/version" - "k8s.io/klog" + "k8s.io/klog/v2" genericcontrollermanager "k8s.io/kubernetes/cmd/controller-manager/app" "k8s.io/kubernetes/pkg/controller" utilflag "k8s.io/kubernetes/pkg/util/flag" diff --git a/cmd/yurt-controller-manager/app/options/options.go b/cmd/yurt-controller-manager/app/options/options.go index 1120fcb5aab..685c17929ae 100644 --- a/cmd/yurt-controller-manager/app/options/options.go +++ b/cmd/yurt-controller-manager/app/options/options.go @@ -35,7 +35,7 @@ import ( "k8s.io/client-go/tools/record" cliflag "k8s.io/component-base/cli/flag" componentbaseconfig "k8s.io/component-base/config" - "k8s.io/klog" + "k8s.io/klog/v2" kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config" nodelifecycleconfig "k8s.io/kubernetes/pkg/controller/nodelifecycle/config" diff --git a/cmd/yurt-node-servant/convert/convert.go b/cmd/yurt-node-servant/convert/convert.go index 5ec1acff646..78002fc7c88 100644 --- a/cmd/yurt-node-servant/convert/convert.go +++ b/cmd/yurt-node-servant/convert/convert.go @@ -20,7 +20,7 @@ import ( "time" "github.com/spf13/cobra" - "k8s.io/klog" + "k8s.io/klog/v2" nodeconverter "github.com/openyurtio/openyurt/pkg/node-servant/convert" ) diff --git a/cmd/yurt-node-servant/revert/revert.go b/cmd/yurt-node-servant/revert/revert.go index 825441b7dbd..49024731fba 100644 --- a/cmd/yurt-node-servant/revert/revert.go +++ b/cmd/yurt-node-servant/revert/revert.go @@ -18,7 +18,7 @@ package revert import ( "github.com/spf13/cobra" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/pkg/node-servant/revert" ) diff --git a/cmd/yurthub/app/config/config.go b/cmd/yurthub/app/config/config.go index 2ca6d5c9a5b..f86e8574737 100644 --- a/cmd/yurthub/app/config/config.go +++ b/cmd/yurthub/app/config/config.go @@ -37,7 +37,7 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/clientcmd" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/cmd/yurthub/app/options" "github.com/openyurtio/openyurt/pkg/projectinfo" diff --git a/cmd/yurthub/app/start.go b/cmd/yurthub/app/start.go index f3b4d20bce6..05ab84ee4bd 100644 --- a/cmd/yurthub/app/start.go +++ b/cmd/yurthub/app/start.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/cmd/yurthub/app/config" "github.com/openyurtio/openyurt/cmd/yurthub/app/options" diff --git a/go.mod b/go.mod index 795a37b2867..461bac591ba 100644 --- a/go.mod +++ b/go.mod @@ -36,8 +36,7 @@ require ( k8s.io/client-go v0.19.2 k8s.io/cluster-bootstrap v0.0.0 k8s.io/component-base v0.18.8 - k8s.io/klog v1.0.0 - k8s.io/klog/v2 v2.0.0 + k8s.io/klog/v2 v2.4.0 k8s.io/kubectl v0.0.0 k8s.io/kubelet v0.0.0 k8s.io/kubernetes v1.18.8 diff --git a/go.sum b/go.sum index b36cc8d53ad..1993f21dc39 100644 --- a/go.sum +++ b/go.sum @@ -163,8 +163,9 @@ github.com/go-critic/go-critic v0.3.5-0.20190526074819-1df300866540/go.mod h1:+s github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-lintpack/lintpack v0.5.2/go.mod h1:NwZuYi2nUHho8XEIZ6SIxihrnPoqBTDqfpXvXAN0sXM= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= -github.com/go-logr/logr v0.1.0 h1:M1Tv3VzNlEHg6uyACnRdtrploV2P7wZqH8BoQMtz0cg= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= +github.com/go-logr/logr v0.2.0 h1:QvGt2nLcHH0WK9orKa+ppBPAxREcH364nPUedEpK0TY= +github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/zapr v0.1.0/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk= github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= @@ -873,8 +874,9 @@ k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUc k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= 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 h1:Foj74zO6RbjjP4hBEKjnYtjjAhGg4jNynUdYF6fJrok= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= +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/kube-aggregator v0.18.8/go.mod h1:CyLoGZB+io8eEwnn+6RbV7QWJQhj8a3TBH8ZM8sLbhI= k8s.io/kube-controller-manager v0.18.8/go.mod h1:IYZteddXJFD1TVgAw8eRP3c9OOA2WtHdXdE8aH6gXnc= k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6 h1:Oh3Mzx5pJ+yIumsAD0MOECPVeXsVot0UkiaCGVyfGQY= diff --git a/pkg/controller/certificates/csrapprover.go b/pkg/controller/certificates/csrapprover.go index 3aba335d131..5d22708695e 100644 --- a/pkg/controller/certificates/csrapprover.go +++ b/pkg/controller/certificates/csrapprover.go @@ -34,7 +34,7 @@ import ( typev1beta1 "k8s.io/client-go/kubernetes/typed/certificates/v1beta1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/pkg/projectinfo" ) diff --git a/pkg/controller/nodelifecycle/node_lifecycle_controller.go b/pkg/controller/nodelifecycle/node_lifecycle_controller.go index a7ab78e4aa0..ac5c8206c43 100644 --- a/pkg/controller/nodelifecycle/node_lifecycle_controller.go +++ b/pkg/controller/nodelifecycle/node_lifecycle_controller.go @@ -52,7 +52,7 @@ import ( "k8s.io/client-go/util/flowcontrol" "k8s.io/client-go/util/workqueue" "k8s.io/component-base/metrics/prometheus/ratelimiter" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/controller" kubefeatures "k8s.io/kubernetes/pkg/features" kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" @@ -1077,7 +1077,7 @@ func (nc *Controller) tryUpdateNodeHealth(node *v1.Node) (time.Duration, v1.Node } else { transitionTime = nodeHealth.readyTransitionTimestamp } - if klog.V(5) { + if klog.V(5).Enabled() { klog.Infof("Node %s ReadyCondition updated. Updating timestamp: %+v vs %+v.", node.Name, nodeHealth.status, node.Status) } else { klog.V(3).Infof("Node %s ReadyCondition updated. Updating timestamp.", node.Name) diff --git a/pkg/controller/nodelifecycle/scheduler/rate_limited_queue.go b/pkg/controller/nodelifecycle/scheduler/rate_limited_queue.go index 20283652a90..ea9a269fda7 100644 --- a/pkg/controller/nodelifecycle/scheduler/rate_limited_queue.go +++ b/pkg/controller/nodelifecycle/scheduler/rate_limited_queue.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/util/flowcontrol" - "k8s.io/klog" + "k8s.io/klog/v2" ) const ( diff --git a/pkg/controller/nodelifecycle/scheduler/taint_manager.go b/pkg/controller/nodelifecycle/scheduler/taint_manager.go index fbd2fdb5fe6..ed26f8c654e 100644 --- a/pkg/controller/nodelifecycle/scheduler/taint_manager.go +++ b/pkg/controller/nodelifecycle/scheduler/taint_manager.go @@ -36,7 +36,7 @@ import ( v1core "k8s.io/client-go/kubernetes/typed/core/v1" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/apis/core/helper" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" diff --git a/pkg/controller/nodelifecycle/scheduler/timed_workers.go b/pkg/controller/nodelifecycle/scheduler/timed_workers.go index 958ae333ab5..ec0edbcda91 100644 --- a/pkg/controller/nodelifecycle/scheduler/timed_workers.go +++ b/pkg/controller/nodelifecycle/scheduler/timed_workers.go @@ -21,7 +21,7 @@ import ( "time" "k8s.io/apimachinery/pkg/types" - "k8s.io/klog" + "k8s.io/klog/v2" ) // WorkArgs keeps arguments that will be passed to the function executed by the worker. diff --git a/pkg/controller/util/node/controller_utils.go b/pkg/controller/util/node/controller_utils.go index 202a36eaa78..99b9c3c3a42 100644 --- a/pkg/controller/util/node/controller_utils.go +++ b/pkg/controller/util/node/controller_utils.go @@ -32,7 +32,7 @@ import ( appsv1listers "k8s.io/client-go/listers/apps/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" - "k8s.io/klog" + "k8s.io/klog/v2" utilpod "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/kubelet/util/format" diff --git a/pkg/node-servant/components/kubelet.go b/pkg/node-servant/components/kubelet.go index fb296791d42..aaa7ae76c2a 100644 --- a/pkg/node-servant/components/kubelet.go +++ b/pkg/node-servant/components/kubelet.go @@ -25,7 +25,7 @@ import ( "regexp" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" enutil "github.com/openyurtio/openyurt/pkg/yurtctl/util/edgenode" ) diff --git a/pkg/node-servant/components/yurthub.go b/pkg/node-servant/components/yurthub.go index 4fa0341466e..f56f86d8598 100644 --- a/pkg/node-servant/components/yurthub.go +++ b/pkg/node-servant/components/yurthub.go @@ -27,7 +27,7 @@ import ( "time" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/klog" + "k8s.io/klog/v2" enutil "github.com/openyurtio/openyurt/pkg/yurtctl/util/edgenode" "github.com/openyurtio/openyurt/pkg/yurthub/certificate/hubself" diff --git a/pkg/util/iptables/iptables.go b/pkg/util/iptables/iptables.go index 25fc3cad1fb..bfc66ade8f4 100644 --- a/pkg/util/iptables/iptables.go +++ b/pkg/util/iptables/iptables.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" utilversion "k8s.io/apimachinery/pkg/util/version" utilwait "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/klog" + "k8s.io/klog/v2" utilexec "k8s.io/utils/exec" utiltrace "k8s.io/utils/trace" ) diff --git a/pkg/yurtctl/cmd/clusterinfo/clusterinfo.go b/pkg/yurtctl/cmd/clusterinfo/clusterinfo.go index e89859fcf09..57510d6f90a 100644 --- a/pkg/yurtctl/cmd/clusterinfo/clusterinfo.go +++ b/pkg/yurtctl/cmd/clusterinfo/clusterinfo.go @@ -27,7 +27,7 @@ import ( "github.com/spf13/pflag" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/pkg/projectinfo" kubeutil "github.com/openyurtio/openyurt/pkg/yurtctl/util/kubernetes" diff --git a/pkg/yurtctl/cmd/cmd.go b/pkg/yurtctl/cmd/cmd.go index d8cf972389b..d708ee1c56c 100644 --- a/pkg/yurtctl/cmd/cmd.go +++ b/pkg/yurtctl/cmd/cmd.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/cobra" flag "github.com/spf13/pflag" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/pkg/projectinfo" "github.com/openyurtio/openyurt/pkg/yurtctl/cmd/clusterinfo" diff --git a/pkg/yurtctl/cmd/convert/convert.go b/pkg/yurtctl/cmd/convert/convert.go index 045763ae352..f8271c37d33 100644 --- a/pkg/yurtctl/cmd/convert/convert.go +++ b/pkg/yurtctl/cmd/convert/convert.go @@ -32,7 +32,7 @@ import ( "k8s.io/client-go/dynamic" "k8s.io/client-go/kubernetes" bootstrapapi "k8s.io/cluster-bootstrap/token/api" - "k8s.io/klog" + "k8s.io/klog/v2" clusterinfophase "k8s.io/kubernetes/cmd/kubeadm/app/phases/bootstraptoken/clusterinfo" nodeutil "github.com/openyurtio/openyurt/pkg/controller/util/node" diff --git a/pkg/yurtctl/cmd/join/join.go b/pkg/yurtctl/cmd/join/join.go index 9f8e80b7acb..4cd54e60f6d 100644 --- a/pkg/yurtctl/cmd/join/join.go +++ b/pkg/yurtctl/cmd/join/join.go @@ -30,7 +30,7 @@ import ( clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" - "k8s.io/klog" + "k8s.io/klog/v2" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmscheme "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/scheme" kubeadmapiv1beta2 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" diff --git a/pkg/yurtctl/cmd/join/phases/join-cloud-node.go b/pkg/yurtctl/cmd/join/phases/join-cloud-node.go index b34a06c1151..762fe9141fc 100644 --- a/pkg/yurtctl/cmd/join/phases/join-cloud-node.go +++ b/pkg/yurtctl/cmd/join/phases/join-cloud-node.go @@ -31,7 +31,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" certutil "k8s.io/client-go/util/cert" - "k8s.io/klog" + "k8s.io/klog/v2" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow" diff --git a/pkg/yurtctl/cmd/join/phases/join-edge-node.go b/pkg/yurtctl/cmd/join/phases/join-edge-node.go index 78d83e7facb..6cad2dfe9b3 100644 --- a/pkg/yurtctl/cmd/join/phases/join-edge-node.go +++ b/pkg/yurtctl/cmd/join/phases/join-edge-node.go @@ -30,7 +30,7 @@ import ( clientset "k8s.io/client-go/kubernetes" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" certutil "k8s.io/client-go/util/cert" - "k8s.io/klog" + "k8s.io/klog/v2" kubeletconfigv1beta1 "k8s.io/kubelet/config/v1beta1" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow" diff --git a/pkg/yurtctl/cmd/join/phases/postcheck.go b/pkg/yurtctl/cmd/join/phases/postcheck.go index af8ed085832..600c6528931 100644 --- a/pkg/yurtctl/cmd/join/phases/postcheck.go +++ b/pkg/yurtctl/cmd/join/phases/postcheck.go @@ -24,7 +24,7 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" diff --git a/pkg/yurtctl/cmd/markautonomous/markautonomous.go b/pkg/yurtctl/cmd/markautonomous/markautonomous.go index 9d794625077..4acbda72ec6 100644 --- a/pkg/yurtctl/cmd/markautonomous/markautonomous.go +++ b/pkg/yurtctl/cmd/markautonomous/markautonomous.go @@ -26,7 +26,7 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/pkg/projectinfo" "github.com/openyurtio/openyurt/pkg/yurtctl/constants" diff --git a/pkg/yurtctl/cmd/reset/phases/cleanfile.go b/pkg/yurtctl/cmd/reset/phases/cleanfile.go index 52c31110245..e4e0875c505 100644 --- a/pkg/yurtctl/cmd/reset/phases/cleanfile.go +++ b/pkg/yurtctl/cmd/reset/phases/cleanfile.go @@ -20,7 +20,7 @@ import ( "fmt" "os" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow" "github.com/openyurtio/openyurt/pkg/yurtctl/constants" diff --git a/pkg/yurtctl/cmd/reset/reset.go b/pkg/yurtctl/cmd/reset/reset.go index b200199fa7d..616748f1a16 100644 --- a/pkg/yurtctl/cmd/reset/reset.go +++ b/pkg/yurtctl/cmd/reset/reset.go @@ -27,7 +27,7 @@ import ( flag "github.com/spf13/pflag" "k8s.io/apimachinery/pkg/util/sets" clientset "k8s.io/client-go/kubernetes" - "k8s.io/klog" + "k8s.io/klog/v2" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmapiv1beta2 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/validation" diff --git a/pkg/yurtctl/cmd/revert/cloudnode.go b/pkg/yurtctl/cmd/revert/cloudnode.go index 936d63be2b8..47d438d6cd9 100644 --- a/pkg/yurtctl/cmd/revert/cloudnode.go +++ b/pkg/yurtctl/cmd/revert/cloudnode.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/pkg/yurthub/util" ) diff --git a/pkg/yurtctl/cmd/revert/edgenode.go b/pkg/yurtctl/cmd/revert/edgenode.go index 6e474e867c8..81f8643c261 100644 --- a/pkg/yurtctl/cmd/revert/edgenode.go +++ b/pkg/yurtctl/cmd/revert/edgenode.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/pkg/yurthub/util" ) diff --git a/pkg/yurtctl/cmd/revert/node.go b/pkg/yurtctl/cmd/revert/node.go index f1991affe65..e8da00ac06a 100644 --- a/pkg/yurtctl/cmd/revert/node.go +++ b/pkg/yurtctl/cmd/revert/node.go @@ -28,7 +28,7 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" - "k8s.io/klog" + "k8s.io/klog/v2" nodeutil "github.com/openyurtio/openyurt/pkg/controller/util/node" "github.com/openyurtio/openyurt/pkg/projectinfo" diff --git a/pkg/yurtctl/cmd/revert/revert.go b/pkg/yurtctl/cmd/revert/revert.go index b9bbb7452ad..d4f2d6c4a9e 100644 --- a/pkg/yurtctl/cmd/revert/revert.go +++ b/pkg/yurtctl/cmd/revert/revert.go @@ -26,7 +26,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/dynamic" "k8s.io/client-go/kubernetes" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/pkg/projectinfo" "github.com/openyurtio/openyurt/pkg/yurtctl/constants" diff --git a/pkg/yurtctl/lock/lock.go b/pkg/yurtctl/lock/lock.go index 90c281e5c62..0b3ecc2566f 100644 --- a/pkg/yurtctl/lock/lock.go +++ b/pkg/yurtctl/lock/lock.go @@ -26,7 +26,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/pkg/yurtctl/constants" ) diff --git a/pkg/yurtctl/util/edgenode/util.go b/pkg/yurtctl/util/edgenode/util.go index 8a190d216b8..41cbeaae7f1 100644 --- a/pkg/yurtctl/util/edgenode/util.go +++ b/pkg/yurtctl/util/edgenode/util.go @@ -29,7 +29,7 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/util/homedir" - "k8s.io/klog" + "k8s.io/klog/v2" ) const ( diff --git a/pkg/yurtctl/util/kubernetes/util.go b/pkg/yurtctl/util/kubernetes/util.go index adb93195495..fe200965ecb 100644 --- a/pkg/yurtctl/util/kubernetes/util.go +++ b/pkg/yurtctl/util/kubernetes/util.go @@ -56,7 +56,7 @@ import ( "k8s.io/client-go/util/homedir" bootstrapapi "k8s.io/cluster-bootstrap/token/api" bootstraputil "k8s.io/cluster-bootstrap/token/util" - "k8s.io/klog" + "k8s.io/klog/v2" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmcontants "k8s.io/kubernetes/cmd/kubeadm/app/constants" tokenphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/bootstraptoken/node" diff --git a/pkg/yurtctl/util/system/util.go b/pkg/yurtctl/util/system/util.go index 382be9d16aa..63897a9ed7c 100644 --- a/pkg/yurtctl/util/system/util.go +++ b/pkg/yurtctl/util/system/util.go @@ -22,7 +22,7 @@ import ( "os/exec" "github.com/opencontainers/selinux/go-selinux" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/pkg/yurtctl/constants" "github.com/openyurtio/openyurt/pkg/yurtctl/util/edgenode" diff --git a/pkg/yurtctl/util/util.go b/pkg/yurtctl/util/util.go index 4c18d87b511..803a0c624df 100644 --- a/pkg/yurtctl/util/util.go +++ b/pkg/yurtctl/util/util.go @@ -28,7 +28,7 @@ import ( "time" pb "gopkg.in/cheggaaa/pb.v1" - "k8s.io/klog" + "k8s.io/klog/v2" ) // DownloadFile try to download file from URL and save to savePath multiple times. diff --git a/pkg/yurthub/cachemanager/cache_agent.go b/pkg/yurthub/cachemanager/cache_agent.go index dc70b046361..c3117079bf2 100644 --- a/pkg/yurthub/cachemanager/cache_agent.go +++ b/pkg/yurthub/cachemanager/cache_agent.go @@ -22,7 +22,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/tools/cache" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/pkg/yurthub/util" ) diff --git a/pkg/yurthub/cachemanager/cache_manager.go b/pkg/yurthub/cachemanager/cache_manager.go index a176bdfa7d7..c27143d5d7d 100644 --- a/pkg/yurthub/cachemanager/cache_manager.go +++ b/pkg/yurthub/cachemanager/cache_manager.go @@ -40,7 +40,7 @@ import ( apirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes/scheme" - "k8s.io/klog" + "k8s.io/klog/v2" hubmeta "github.com/openyurtio/openyurt/pkg/yurthub/kubernetes/meta" "github.com/openyurtio/openyurt/pkg/yurthub/kubernetes/serializer" diff --git a/pkg/yurthub/cachemanager/storage_wrapper.go b/pkg/yurthub/cachemanager/storage_wrapper.go index 11b5866950e..caa06771897 100644 --- a/pkg/yurthub/cachemanager/storage_wrapper.go +++ b/pkg/yurthub/cachemanager/storage_wrapper.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/serializer/json" "k8s.io/client-go/kubernetes/scheme" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/pkg/yurthub/storage" "github.com/openyurtio/openyurt/pkg/yurthub/util" diff --git a/pkg/yurthub/certificate/certificate.go b/pkg/yurthub/certificate/certificate.go index ace275c07eb..1f4bc544d14 100644 --- a/pkg/yurthub/certificate/certificate.go +++ b/pkg/yurthub/certificate/certificate.go @@ -22,7 +22,7 @@ import ( "time" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/cmd/yurthub/app/config" "github.com/openyurtio/openyurt/pkg/yurthub/certificate/interfaces" diff --git a/pkg/yurthub/certificate/hubself/cert_mgr.go b/pkg/yurthub/certificate/hubself/cert_mgr.go index 3e3a83d80fa..1537d66c45f 100644 --- a/pkg/yurthub/certificate/hubself/cert_mgr.go +++ b/pkg/yurthub/certificate/hubself/cert_mgr.go @@ -38,7 +38,7 @@ import ( clientcmdapi "k8s.io/client-go/tools/clientcmd/api" certutil "k8s.io/client-go/util/cert" "k8s.io/client-go/util/certificate" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/cmd/yurthub/app/config" "github.com/openyurtio/openyurt/pkg/projectinfo" diff --git a/pkg/yurthub/certificate/hubself/fake_cert_mgr.go b/pkg/yurthub/certificate/hubself/fake_cert_mgr.go index 46a3be5dc97..b6bebf464e2 100644 --- a/pkg/yurthub/certificate/hubself/fake_cert_mgr.go +++ b/pkg/yurthub/certificate/hubself/fake_cert_mgr.go @@ -22,7 +22,7 @@ import ( "fmt" "path/filepath" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/cmd/yurthub/app/config" "github.com/openyurtio/openyurt/pkg/projectinfo" diff --git a/pkg/yurthub/certificate/server/certmanager.go b/pkg/yurthub/certificate/server/certmanager.go index 9ae6bb364c8..72aed5d00ce 100644 --- a/pkg/yurthub/certificate/server/certmanager.go +++ b/pkg/yurthub/certificate/server/certmanager.go @@ -27,7 +27,7 @@ import ( "k8s.io/client-go/kubernetes" clicert "k8s.io/client-go/kubernetes/typed/certificates/v1beta1" "k8s.io/client-go/util/certificate" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/pkg/projectinfo" ) diff --git a/pkg/yurthub/filter/discardcloudservice/filter.go b/pkg/yurthub/filter/discardcloudservice/filter.go index bd10a6731fd..3a92482b013 100644 --- a/pkg/yurthub/filter/discardcloudservice/filter.go +++ b/pkg/yurthub/filter/discardcloudservice/filter.go @@ -20,7 +20,7 @@ import ( "io" "net/http" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/pkg/yurthub/filter" filterutil "github.com/openyurtio/openyurt/pkg/yurthub/filter/util" diff --git a/pkg/yurthub/filter/discardcloudservice/handler.go b/pkg/yurthub/filter/discardcloudservice/handler.go index e8c86ac5e2f..a831e878f37 100644 --- a/pkg/yurthub/filter/discardcloudservice/handler.go +++ b/pkg/yurthub/filter/discardcloudservice/handler.go @@ -22,7 +22,7 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/watch" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/pkg/yurthub/filter" "github.com/openyurtio/openyurt/pkg/yurthub/kubernetes/serializer" diff --git a/pkg/yurthub/filter/filter.go b/pkg/yurthub/filter/filter.go index b0dc70c1062..7fcef820aba 100644 --- a/pkg/yurthub/filter/filter.go +++ b/pkg/yurthub/filter/filter.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/watch" apirequest "k8s.io/apiserver/pkg/endpoints/request" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/pkg/yurthub/kubernetes/serializer" ) diff --git a/pkg/yurthub/filter/masterservice/filter.go b/pkg/yurthub/filter/masterservice/filter.go index a2f7cca0c7f..af288f8c401 100644 --- a/pkg/yurthub/filter/masterservice/filter.go +++ b/pkg/yurthub/filter/masterservice/filter.go @@ -22,7 +22,7 @@ import ( "net/http" "strconv" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/pkg/yurthub/filter" filterutil "github.com/openyurtio/openyurt/pkg/yurthub/filter/util" diff --git a/pkg/yurthub/filter/masterservice/handler.go b/pkg/yurthub/filter/masterservice/handler.go index 9c8dce13d5c..a13befde715 100644 --- a/pkg/yurthub/filter/masterservice/handler.go +++ b/pkg/yurthub/filter/masterservice/handler.go @@ -23,7 +23,7 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/watch" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/pkg/yurthub/filter" "github.com/openyurtio/openyurt/pkg/yurthub/kubernetes/serializer" diff --git a/pkg/yurthub/filter/servicetopology/filter.go b/pkg/yurthub/filter/servicetopology/filter.go index 4a21c3788de..cb7c17d295c 100644 --- a/pkg/yurthub/filter/servicetopology/filter.go +++ b/pkg/yurthub/filter/servicetopology/filter.go @@ -27,7 +27,7 @@ import ( "k8s.io/client-go/informers" listers "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/cache" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/pkg/yurthub/cachemanager" "github.com/openyurtio/openyurt/pkg/yurthub/filter" diff --git a/pkg/yurthub/filter/servicetopology/handler.go b/pkg/yurthub/filter/servicetopology/handler.go index 1e7d32432a4..bc78653f53c 100644 --- a/pkg/yurthub/filter/servicetopology/handler.go +++ b/pkg/yurthub/filter/servicetopology/handler.go @@ -25,7 +25,7 @@ import ( discovery "k8s.io/api/discovery/v1beta1" "k8s.io/apimachinery/pkg/watch" listers "k8s.io/client-go/listers/core/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/pkg/yurthub/filter" "github.com/openyurtio/openyurt/pkg/yurthub/kubernetes/serializer" diff --git a/pkg/yurthub/filter/util/utils.go b/pkg/yurthub/filter/util/utils.go index edecc52f670..2919cbc450d 100644 --- a/pkg/yurthub/filter/util/utils.go +++ b/pkg/yurthub/filter/util/utils.go @@ -20,7 +20,7 @@ import ( "net/http" apirequest "k8s.io/apiserver/pkg/endpoints/request" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/pkg/yurthub/kubernetes/serializer" "github.com/openyurtio/openyurt/pkg/yurthub/util" diff --git a/pkg/yurthub/gc/gc.go b/pkg/yurthub/gc/gc.go index 66dbe6ebdde..b123af6dcbf 100644 --- a/pkg/yurthub/gc/gc.go +++ b/pkg/yurthub/gc/gc.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/client-go/kubernetes" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/cmd/yurthub/app/config" "github.com/openyurtio/openyurt/pkg/yurthub/cachemanager" diff --git a/pkg/yurthub/healthchecker/health_checker.go b/pkg/yurthub/healthchecker/health_checker.go index 3ddb7ff508f..efb485708ad 100644 --- a/pkg/yurthub/healthchecker/health_checker.go +++ b/pkg/yurthub/healthchecker/health_checker.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/api/meta" clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/cmd/yurthub/app/config" "github.com/openyurtio/openyurt/pkg/yurthub/cachemanager" diff --git a/pkg/yurthub/healthchecker/health_checker_test.go b/pkg/yurthub/healthchecker/health_checker_test.go index 93c31e92a6b..4f784d0aea8 100644 --- a/pkg/yurthub/healthchecker/health_checker_test.go +++ b/pkg/yurthub/healthchecker/health_checker_test.go @@ -31,7 +31,7 @@ import ( "k8s.io/apimachinery/pkg/types" clientfake "k8s.io/client-go/kubernetes/fake" clienttesting "k8s.io/client-go/testing" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/pkg/yurthub/cachemanager" "github.com/openyurtio/openyurt/pkg/yurthub/storage/disk" diff --git a/pkg/yurthub/healthchecker/node_lease.go b/pkg/yurthub/healthchecker/node_lease.go index 76e2c56c387..1efc0dc5bf6 100644 --- a/pkg/yurthub/healthchecker/node_lease.go +++ b/pkg/yurthub/healthchecker/node_lease.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientset "k8s.io/client-go/kubernetes" coordclientset "k8s.io/client-go/kubernetes/typed/coordination/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/utils/clock" "k8s.io/utils/pointer" ) diff --git a/pkg/yurthub/kubernetes/meta/restmapper.go b/pkg/yurthub/kubernetes/meta/restmapper.go index c0deda9073e..46e74f6c506 100644 --- a/pkg/yurthub/kubernetes/meta/restmapper.go +++ b/pkg/yurthub/kubernetes/meta/restmapper.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/kubernetes/scheme" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/pkg/yurthub/storage" ) diff --git a/pkg/yurthub/kubernetes/rest/config.go b/pkg/yurthub/kubernetes/rest/config.go index 4ee1e3ac39c..75d0247c9ce 100644 --- a/pkg/yurthub/kubernetes/rest/config.go +++ b/pkg/yurthub/kubernetes/rest/config.go @@ -20,7 +20,7 @@ import ( "net/url" "k8s.io/client-go/rest" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/cmd/yurthub/app/config" "github.com/openyurtio/openyurt/pkg/projectinfo" diff --git a/pkg/yurthub/kubernetes/serializer/serializer.go b/pkg/yurthub/kubernetes/serializer/serializer.go index f42e75277fb..c19bb1fc95e 100644 --- a/pkg/yurthub/kubernetes/serializer/serializer.go +++ b/pkg/yurthub/kubernetes/serializer/serializer.go @@ -35,7 +35,7 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/kubernetes/scheme" restclientwatch "k8s.io/client-go/rest/watch" - "k8s.io/klog" + "k8s.io/klog/v2" hubmeta "github.com/openyurtio/openyurt/pkg/yurthub/kubernetes/meta" ) diff --git a/pkg/yurthub/network/dummyif_linux.go b/pkg/yurthub/network/dummyif_linux.go index f4e0754f253..f3306db96d8 100644 --- a/pkg/yurthub/network/dummyif_linux.go +++ b/pkg/yurthub/network/dummyif_linux.go @@ -22,7 +22,7 @@ import ( "strings" "github.com/vishvananda/netlink" - "k8s.io/klog" + "k8s.io/klog/v2" ) type DummyInterfaceController interface { diff --git a/pkg/yurthub/network/iptables.go b/pkg/yurthub/network/iptables.go index 63368bb2762..b5807a1a1fe 100644 --- a/pkg/yurthub/network/iptables.go +++ b/pkg/yurthub/network/iptables.go @@ -19,7 +19,7 @@ package network import ( "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/utils/exec" "github.com/openyurtio/openyurt/pkg/util/iptables" diff --git a/pkg/yurthub/network/network.go b/pkg/yurthub/network/network.go index 5306411be34..22c3f56d67d 100644 --- a/pkg/yurthub/network/network.go +++ b/pkg/yurthub/network/network.go @@ -21,7 +21,7 @@ import ( "net" "time" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/cmd/yurthub/app/config" ) diff --git a/pkg/yurthub/proxy/local/local.go b/pkg/yurthub/proxy/local/local.go index 1607d4a1a40..a7e14736f6b 100644 --- a/pkg/yurthub/proxy/local/local.go +++ b/pkg/yurthub/proxy/local/local.go @@ -30,7 +30,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" apirequest "k8s.io/apiserver/pkg/endpoints/request" - "k8s.io/klog" + "k8s.io/klog/v2" manager "github.com/openyurtio/openyurt/pkg/yurthub/cachemanager" hubmeta "github.com/openyurtio/openyurt/pkg/yurthub/kubernetes/meta" diff --git a/pkg/yurthub/proxy/remote/loadbalancer.go b/pkg/yurthub/proxy/remote/loadbalancer.go index ec19b5ddbc0..4d2e44b7ac5 100644 --- a/pkg/yurthub/proxy/remote/loadbalancer.go +++ b/pkg/yurthub/proxy/remote/loadbalancer.go @@ -22,7 +22,7 @@ import ( "net/url" "sync" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/pkg/yurthub/cachemanager" "github.com/openyurtio/openyurt/pkg/yurthub/certificate/interfaces" diff --git a/pkg/yurthub/proxy/remote/remote.go b/pkg/yurthub/proxy/remote/remote.go index 1a5ede1811b..e6d3aec7d8e 100644 --- a/pkg/yurthub/proxy/remote/remote.go +++ b/pkg/yurthub/proxy/remote/remote.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" apirequest "k8s.io/apiserver/pkg/endpoints/request" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/pkg/yurthub/cachemanager" "github.com/openyurtio/openyurt/pkg/yurthub/filter" diff --git a/pkg/yurthub/proxy/util/util.go b/pkg/yurthub/proxy/util/util.go index bc1988cea57..a74ca5915ee 100644 --- a/pkg/yurthub/proxy/util/util.go +++ b/pkg/yurthub/proxy/util/util.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" apirequest "k8s.io/apiserver/pkg/endpoints/request" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/pkg/yurthub/metrics" "github.com/openyurtio/openyurt/pkg/yurthub/util" diff --git a/pkg/yurthub/server/server.go b/pkg/yurthub/server/server.go index 491359ce659..33d1b67395d 100644 --- a/pkg/yurthub/server/server.go +++ b/pkg/yurthub/server/server.go @@ -27,7 +27,7 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/kubernetes" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/cmd/yurthub/app/config" "github.com/openyurtio/openyurt/pkg/profile" diff --git a/pkg/yurthub/storage/disk/storage.go b/pkg/yurthub/storage/disk/storage.go index 7dddde79a0c..fc9da90181e 100644 --- a/pkg/yurthub/storage/disk/storage.go +++ b/pkg/yurthub/storage/disk/storage.go @@ -25,7 +25,7 @@ import ( "strings" "sync" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/pkg/yurthub/storage" ) diff --git a/pkg/yurthub/transport/transport.go b/pkg/yurthub/transport/transport.go index 413e2f8f0c2..859ae2ca608 100644 --- a/pkg/yurthub/transport/transport.go +++ b/pkg/yurthub/transport/transport.go @@ -26,7 +26,7 @@ import ( utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/pkg/yurthub/certificate/interfaces" "github.com/openyurtio/openyurt/pkg/yurthub/util" diff --git a/pkg/yurthub/util/connrotation.go b/pkg/yurthub/util/connrotation.go index fcfe6cbfaa0..b688713a833 100644 --- a/pkg/yurthub/util/connrotation.go +++ b/pkg/yurthub/util/connrotation.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/pkg/yurthub/metrics" ) diff --git a/pkg/yurthub/util/util.go b/pkg/yurthub/util/util.go index 8f5b2099623..adffed83fa5 100644 --- a/pkg/yurthub/util/util.go +++ b/pkg/yurthub/util/util.go @@ -35,7 +35,7 @@ import ( "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" certutil "k8s.io/client-go/util/cert" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/openyurtio/openyurt/pkg/projectinfo" "github.com/openyurtio/openyurt/pkg/yurthub/kubernetes/serializer" diff --git a/test/e2e/e2e.go b/test/e2e/e2e.go index a57f0bbc274..b977b117763 100644 --- a/test/e2e/e2e.go +++ b/test/e2e/e2e.go @@ -27,7 +27,7 @@ import ( "github.com/onsi/ginkgo/config" "github.com/onsi/ginkgo/reporters" "github.com/onsi/gomega" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework/ginkgowrapper" ) diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index a452be4758b..82f40af85c7 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -33,7 +33,7 @@ import ( "github.com/openyurtio/openyurt/test/e2e/yurttunnel" apiv1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework/config" ) diff --git a/test/e2e/yurt/yurt.go b/test/e2e/yurt/yurt.go index 5694f0f52a8..7b170694a58 100644 --- a/test/e2e/yurt/yurt.go +++ b/test/e2e/yurt/yurt.go @@ -26,7 +26,7 @@ import ( apiv1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientset "k8s.io/client-go/kubernetes" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework/ginkgowrapper" ) diff --git a/test/e2e/yurthub/yurthub.go b/test/e2e/yurthub/yurthub.go index 59aa8c83b77..3950ab0688b 100644 --- a/test/e2e/yurthub/yurthub.go +++ b/test/e2e/yurthub/yurthub.go @@ -34,7 +34,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" clientset "k8s.io/client-go/kubernetes" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kubernetes/test/e2e/framework" ) diff --git a/test/e2e/yurttunnel/yurttunnel.go b/test/e2e/yurttunnel/yurttunnel.go index 130a46a8001..3a9b44f6366 100644 --- a/test/e2e/yurttunnel/yurttunnel.go +++ b/test/e2e/yurttunnel/yurttunnel.go @@ -37,7 +37,7 @@ import ( "k8s.io/client-go/kubernetes/scheme" restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/remotecommand" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework/ginkgowrapper" ) diff --git a/test/integration/yurttunnel_test.go b/test/integration/yurttunnel_test.go index 671d00cc7a5..b8815a5b87e 100644 --- a/test/integration/yurttunnel_test.go +++ b/test/integration/yurttunnel_test.go @@ -30,7 +30,7 @@ import ( "time" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/klog" + "k8s.io/klog/v2" anpserver "sigs.k8s.io/apiserver-network-proxy/pkg/server" ta "github.com/openyurtio/openyurt/pkg/yurttunnel/agent"