diff options
199 files changed, 197 insertions, 2037 deletions
diff --git a/cloud/cmd/admission/app/server.go b/cloud/cmd/admission/app/server.go index ab7cd221d..908aafac1 100644 --- a/cloud/cmd/admission/app/server.go +++ b/cloud/cmd/admission/app/server.go @@ -6,7 +6,7 @@ import ( cliflag "k8s.io/component-base/cli/flag" "k8s.io/component-base/cli/globalflag" "k8s.io/component-base/term" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/cloud/cmd/admission/app/options" admissioncontroller "github.com/kubeedge/kubeedge/cloud/pkg/admissioncontroller" diff --git a/cloud/cmd/cloudcore/app/server.go b/cloud/cmd/cloudcore/app/server.go index e90febb65..da92a837b 100644 --- a/cloud/cmd/cloudcore/app/server.go +++ b/cloud/cmd/cloudcore/app/server.go @@ -8,7 +8,7 @@ import ( cliflag "k8s.io/component-base/cli/flag" "k8s.io/component-base/cli/globalflag" "k8s.io/component-base/term" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core" "github.com/kubeedge/kubeedge/cloud/cmd/cloudcore/app/options" diff --git a/cloud/cmd/csidriver/app/server.go b/cloud/cmd/csidriver/app/server.go index 09f475121..7cf845eb7 100644 --- a/cloud/cmd/csidriver/app/server.go +++ b/cloud/cmd/csidriver/app/server.go @@ -23,7 +23,7 @@ import ( cliflag "k8s.io/component-base/cli/flag" "k8s.io/component-base/cli/globalflag" "k8s.io/component-base/term" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/cloud/cmd/csidriver/app/options" "github.com/kubeedge/kubeedge/cloud/pkg/csidriver" diff --git a/cloud/pkg/admissioncontroller/admission.go b/cloud/pkg/admissioncontroller/admission.go index 5c683b126..c5ba5a412 100644 --- a/cloud/pkg/admissioncontroller/admission.go +++ b/cloud/pkg/admissioncontroller/admission.go @@ -19,7 +19,7 @@ import ( admissionregistrationv1beta1client "k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1" restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/cloud/cmd/admission/app/options" "github.com/kubeedge/kubeedge/cloud/pkg/apis/devices/v1alpha2" diff --git a/cloud/pkg/admissioncontroller/admit_devicemodel.go b/cloud/pkg/admissioncontroller/admit_devicemodel.go index dda5dd5be..503d17d25 100644 --- a/cloud/pkg/admissioncontroller/admit_devicemodel.go +++ b/cloud/pkg/admissioncontroller/admit_devicemodel.go @@ -8,7 +8,7 @@ import ( admissionv1beta1 "k8s.io/api/admission/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/klog" + "k8s.io/klog/v2" devicesv1alpha2 "github.com/kubeedge/kubeedge/cloud/pkg/apis/devices/v1alpha2" ) diff --git a/cloud/pkg/cloudhub/channelq/channelq.go b/cloud/pkg/cloudhub/channelq/channelq.go index f55dea7aa..ff1fa3c1f 100644 --- a/cloud/pkg/cloudhub/channelq/channelq.go +++ b/cloud/pkg/cloudhub/channelq/channelq.go @@ -9,7 +9,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" - "k8s.io/klog" + "k8s.io/klog/v2" beehiveContext "github.com/kubeedge/beehive/pkg/core/context" beehiveModel "github.com/kubeedge/beehive/pkg/core/model" diff --git a/cloud/pkg/cloudhub/cloudhub.go b/cloud/pkg/cloudhub/cloudhub.go index fc6169221..d8879bf4b 100644 --- a/cloud/pkg/cloudhub/cloudhub.go +++ b/cloud/pkg/cloudhub/cloudhub.go @@ -6,7 +6,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/kubeedge/beehive/pkg/core" beehiveContext "github.com/kubeedge/beehive/pkg/core/context" diff --git a/cloud/pkg/cloudhub/config/config.go b/cloud/pkg/cloudhub/config/config.go index 5427f027f..d4fb83e42 100644 --- a/cloud/pkg/cloudhub/config/config.go +++ b/cloud/pkg/cloudhub/config/config.go @@ -6,7 +6,7 @@ import ( "sync" "k8s.io/client-go/tools/cache" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/cloud/pkg/client/clientset/versioned" syncinformer "github.com/kubeedge/kubeedge/cloud/pkg/client/informers/externalversions/reliablesyncs/v1alpha1" diff --git a/cloud/pkg/cloudhub/handler/messagehandler.go b/cloud/pkg/cloudhub/handler/messagehandler.go index a2714f39e..f4746458d 100755 --- a/cloud/pkg/cloudhub/handler/messagehandler.go +++ b/cloud/pkg/cloudhub/handler/messagehandler.go @@ -12,7 +12,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/tools/cache" - "k8s.io/klog" + "k8s.io/klog/v2" beehiveContext "github.com/kubeedge/beehive/pkg/core/context" beehiveModel "github.com/kubeedge/beehive/pkg/core/model" diff --git a/cloud/pkg/cloudhub/servers/httpserver/server.go b/cloud/pkg/cloudhub/servers/httpserver/server.go index 12a0a4ffe..12c2234c0 100644 --- a/cloud/pkg/cloudhub/servers/httpserver/server.go +++ b/cloud/pkg/cloudhub/servers/httpserver/server.go @@ -31,7 +31,7 @@ import ( "github.com/dgrijalva/jwt-go" "github.com/gorilla/mux" certutil "k8s.io/client-go/util/cert" - "k8s.io/klog" + "k8s.io/klog/v2" hubconfig "github.com/kubeedge/kubeedge/cloud/pkg/cloudhub/config" "github.com/kubeedge/kubeedge/common/constants" diff --git a/cloud/pkg/cloudhub/servers/httpserver/signcerts.go b/cloud/pkg/cloudhub/servers/httpserver/signcerts.go index 8eea1c7fb..65e752292 100644 --- a/cloud/pkg/cloudhub/servers/httpserver/signcerts.go +++ b/cloud/pkg/cloudhub/servers/httpserver/signcerts.go @@ -27,7 +27,7 @@ import ( "github.com/dgrijalva/jwt-go" certutil "k8s.io/client-go/util/cert" - "k8s.io/klog" + "k8s.io/klog/v2" hubconfig "github.com/kubeedge/kubeedge/cloud/pkg/cloudhub/config" ) diff --git a/cloud/pkg/cloudhub/servers/server.go b/cloud/pkg/cloudhub/servers/server.go index 684aae0e0..59aaa391c 100644 --- a/cloud/pkg/cloudhub/servers/server.go +++ b/cloud/pkg/cloudhub/servers/server.go @@ -6,7 +6,7 @@ import ( "encoding/pem" "fmt" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/cloud/pkg/cloudhub/channelq" hubconfig "github.com/kubeedge/kubeedge/cloud/pkg/cloudhub/config" diff --git a/cloud/pkg/cloudhub/servers/udsserver/server.go b/cloud/pkg/cloudhub/servers/udsserver/server.go index c3b1d2a84..103a6076f 100644 --- a/cloud/pkg/cloudhub/servers/udsserver/server.go +++ b/cloud/pkg/cloudhub/servers/udsserver/server.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - "k8s.io/klog" + "k8s.io/klog/v2" beehiveContext "github.com/kubeedge/beehive/pkg/core/context" "github.com/kubeedge/beehive/pkg/core/model" diff --git a/cloud/pkg/cloudhub/servers/udsserver/uds.go b/cloud/pkg/cloudhub/servers/udsserver/uds.go index 3edc423c9..ce6f0a924 100644 --- a/cloud/pkg/cloudhub/servers/udsserver/uds.go +++ b/cloud/pkg/cloudhub/servers/udsserver/uds.go @@ -6,7 +6,7 @@ import ( "os" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" ) const ( diff --git a/cloud/pkg/cloudstream/config/config.go b/cloud/pkg/cloudstream/config/config.go index 9da19556f..e18eef719 100644 --- a/cloud/pkg/cloudstream/config/config.go +++ b/cloud/pkg/cloudstream/config/config.go @@ -21,7 +21,7 @@ import ( "io/ioutil" "sync" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/pkg/apis/componentconfig/cloudcore/v1alpha1" ) diff --git a/cloud/pkg/cloudstream/containerexec_connection.go b/cloud/pkg/cloudstream/containerexec_connection.go index 4ca93b0b3..bf9de2667 100644 --- a/cloud/pkg/cloudstream/containerexec_connection.go +++ b/cloud/pkg/cloudstream/containerexec_connection.go @@ -10,7 +10,7 @@ import ( "github.com/kubeedge/kubeedge/pkg/stream" "github.com/emicklei/go-restful" - "k8s.io/klog" + "k8s.io/klog/v2" ) // ContainerExecConnection indicates the container exec request initiated by kube-apiserver diff --git a/cloud/pkg/cloudstream/containerlog_connection.go b/cloud/pkg/cloudstream/containerlog_connection.go index a04c2c8fd..e3a293d1d 100644 --- a/cloud/pkg/cloudstream/containerlog_connection.go +++ b/cloud/pkg/cloudstream/containerlog_connection.go @@ -22,7 +22,7 @@ import ( "io" "net" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/emicklei/go-restful" "github.com/kubeedge/kubeedge/common/constants" diff --git a/cloud/pkg/cloudstream/containermetrics_connection.go b/cloud/pkg/cloudstream/containermetrics_connection.go index 9d9edfa49..26cbe0100 100644 --- a/cloud/pkg/cloudstream/containermetrics_connection.go +++ b/cloud/pkg/cloudstream/containermetrics_connection.go @@ -23,7 +23,7 @@ import ( "net" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/emicklei/go-restful" "github.com/kubeedge/kubeedge/pkg/stream" diff --git a/cloud/pkg/cloudstream/session.go b/cloud/pkg/cloudstream/session.go index 4dda571a0..abafc1bd9 100644 --- a/cloud/pkg/cloudstream/session.go +++ b/cloud/pkg/cloudstream/session.go @@ -21,7 +21,7 @@ import ( "sync" "sync/atomic" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/gorilla/websocket" "github.com/kubeedge/kubeedge/pkg/stream" diff --git a/cloud/pkg/cloudstream/streamserver.go b/cloud/pkg/cloudstream/streamserver.go index 1e9dfb7ca..bbb3ca5c4 100644 --- a/cloud/pkg/cloudstream/streamserver.go +++ b/cloud/pkg/cloudstream/streamserver.go @@ -27,7 +27,7 @@ import ( "github.com/emicklei/go-restful" "k8s.io/apimachinery/pkg/util/httpstream" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/cloud/pkg/cloudstream/config" "github.com/kubeedge/kubeedge/pkg/stream/flushwriter" diff --git a/cloud/pkg/cloudstream/tunnelserver.go b/cloud/pkg/cloudstream/tunnelserver.go index 16bdd556d..08f245b32 100644 --- a/cloud/pkg/cloudstream/tunnelserver.go +++ b/cloud/pkg/cloudstream/tunnelserver.go @@ -28,7 +28,7 @@ import ( "github.com/emicklei/go-restful" "github.com/gorilla/websocket" - "k8s.io/klog" + "k8s.io/klog/v2" hubconfig "github.com/kubeedge/kubeedge/cloud/pkg/cloudhub/config" "github.com/kubeedge/kubeedge/cloud/pkg/cloudstream/config" diff --git a/cloud/pkg/csidriver/controllerserver.go b/cloud/pkg/csidriver/controllerserver.go index 6a08785a9..f898592d5 100644 --- a/cloud/pkg/csidriver/controllerserver.go +++ b/cloud/pkg/csidriver/controllerserver.go @@ -27,7 +27,7 @@ import ( "golang.org/x/net/context" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core/model" "github.com/kubeedge/kubeedge/common/constants" diff --git a/cloud/pkg/csidriver/identityserver.go b/cloud/pkg/csidriver/identityserver.go index c35beaa30..9c510b460 100644 --- a/cloud/pkg/csidriver/identityserver.go +++ b/cloud/pkg/csidriver/identityserver.go @@ -21,7 +21,7 @@ import ( "golang.org/x/net/context" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "k8s.io/klog" + "k8s.io/klog/v2" ) type identityServer struct { diff --git a/cloud/pkg/csidriver/server.go b/cloud/pkg/csidriver/server.go index 28440e39b..01f9a698a 100644 --- a/cloud/pkg/csidriver/server.go +++ b/cloud/pkg/csidriver/server.go @@ -19,7 +19,7 @@ package csidriver import ( "fmt" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/cloud/cmd/csidriver/app/options" ) diff --git a/cloud/pkg/csidriver/uds.go b/cloud/pkg/csidriver/uds.go index 0c9c05eb9..b21adc9cd 100644 --- a/cloud/pkg/csidriver/uds.go +++ b/cloud/pkg/csidriver/uds.go @@ -19,7 +19,7 @@ package csidriver import ( "net" - "k8s.io/klog" + "k8s.io/klog/v2" ) const ( diff --git a/cloud/pkg/csidriver/utils.go b/cloud/pkg/csidriver/utils.go index f9c0cb577..8280992ef 100644 --- a/cloud/pkg/csidriver/utils.go +++ b/cloud/pkg/csidriver/utils.go @@ -29,7 +29,7 @@ import ( "github.com/kubernetes-csi/csi-lib-utils/protosanitizer" "golang.org/x/net/context" "google.golang.org/grpc" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core/model" "github.com/kubeedge/kubeedge/common/constants" diff --git a/cloud/pkg/devicecontroller/controller/downstream.go b/cloud/pkg/devicecontroller/controller/downstream.go index a6703caef..c58712ec7 100644 --- a/cloud/pkg/devicecontroller/controller/downstream.go +++ b/cloud/pkg/devicecontroller/controller/downstream.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" - "k8s.io/klog" + "k8s.io/klog/v2" beehiveContext "github.com/kubeedge/beehive/pkg/core/context" "github.com/kubeedge/beehive/pkg/core/model" diff --git a/cloud/pkg/devicecontroller/controller/upstream.go b/cloud/pkg/devicecontroller/controller/upstream.go index f88596587..83b7144fb 100644 --- a/cloud/pkg/devicecontroller/controller/upstream.go +++ b/cloud/pkg/devicecontroller/controller/upstream.go @@ -22,7 +22,7 @@ import ( "strconv" "k8s.io/client-go/rest" - "k8s.io/klog" + "k8s.io/klog/v2" beehiveContext "github.com/kubeedge/beehive/pkg/core/context" "github.com/kubeedge/beehive/pkg/core/model" diff --git a/cloud/pkg/devicecontroller/devicecontroller.go b/cloud/pkg/devicecontroller/devicecontroller.go index c1ad3cab8..ed33fab91 100644 --- a/cloud/pkg/devicecontroller/devicecontroller.go +++ b/cloud/pkg/devicecontroller/devicecontroller.go @@ -3,7 +3,7 @@ package devicecontroller import ( "time" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core" "github.com/kubeedge/kubeedge/cloud/pkg/common/modules" diff --git a/cloud/pkg/devicecontroller/manager/common.go b/cloud/pkg/devicecontroller/manager/common.go index a4370cc8a..95969a30b 100644 --- a/cloud/pkg/devicecontroller/manager/common.go +++ b/cloud/pkg/devicecontroller/manager/common.go @@ -3,7 +3,7 @@ package manager import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" - "k8s.io/klog" + "k8s.io/klog/v2" ) // Manager define the interface of a Manager, configmapManager and podManager implement it diff --git a/cloud/pkg/devicecontroller/utils/crdclient.go b/cloud/pkg/devicecontroller/utils/crdclient.go index 1a8fd9afd..4d9084371 100644 --- a/cloud/pkg/devicecontroller/utils/crdclient.go +++ b/cloud/pkg/devicecontroller/utils/crdclient.go @@ -5,7 +5,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/client-go/rest" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/cloud/pkg/apis/devices/v1alpha2" ) diff --git a/cloud/pkg/devicecontroller/utils/kubeclient.go b/cloud/pkg/devicecontroller/utils/kubeclient.go index d8689029d..66ff475f8 100644 --- a/cloud/pkg/devicecontroller/utils/kubeclient.go +++ b/cloud/pkg/devicecontroller/utils/kubeclient.go @@ -4,7 +4,7 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/cloud/pkg/devicecontroller/config" ) diff --git a/cloud/pkg/edgecontroller/controller/downstream.go b/cloud/pkg/edgecontroller/controller/downstream.go index f9fdc47f7..85d399441 100644 --- a/cloud/pkg/edgecontroller/controller/downstream.go +++ b/cloud/pkg/edgecontroller/controller/downstream.go @@ -11,7 +11,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/kubernetes" - "k8s.io/klog" + "k8s.io/klog/v2" beehiveContext "github.com/kubeedge/beehive/pkg/core/context" "github.com/kubeedge/beehive/pkg/core/model" diff --git a/cloud/pkg/edgecontroller/controller/upstream.go b/cloud/pkg/edgecontroller/controller/upstream.go index 4ce942cc8..4fa239758 100644 --- a/cloud/pkg/edgecontroller/controller/upstream.go +++ b/cloud/pkg/edgecontroller/controller/upstream.go @@ -36,7 +36,7 @@ import ( "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" beehiveContext "github.com/kubeedge/beehive/pkg/core/context" "github.com/kubeedge/beehive/pkg/core/model" diff --git a/cloud/pkg/edgecontroller/edgecontroller.go b/cloud/pkg/edgecontroller/edgecontroller.go index cf89ba90b..a6633ea28 100644 --- a/cloud/pkg/edgecontroller/edgecontroller.go +++ b/cloud/pkg/edgecontroller/edgecontroller.go @@ -3,7 +3,7 @@ package edgecontroller import ( "os" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core" "github.com/kubeedge/kubeedge/cloud/pkg/common/modules" diff --git a/cloud/pkg/edgecontroller/manager/common.go b/cloud/pkg/edgecontroller/manager/common.go index a4370cc8a..95969a30b 100644 --- a/cloud/pkg/edgecontroller/manager/common.go +++ b/cloud/pkg/edgecontroller/manager/common.go @@ -3,7 +3,7 @@ package manager import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" - "k8s.io/klog" + "k8s.io/klog/v2" ) // Manager define the interface of a Manager, configmapManager and podManager implement it diff --git a/cloud/pkg/edgecontroller/manager/pod.go b/cloud/pkg/edgecontroller/manager/pod.go index ef85bb2a2..aa29960aa 100644 --- a/cloud/pkg/edgecontroller/manager/pod.go +++ b/cloud/pkg/edgecontroller/manager/pod.go @@ -10,7 +10,7 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/cache" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/cloud/pkg/edgecontroller/config" ) diff --git a/cloud/pkg/edgecontroller/messagelayer/util.go b/cloud/pkg/edgecontroller/messagelayer/util.go index d9936b03f..ac08fe17f 100644 --- a/cloud/pkg/edgecontroller/messagelayer/util.go +++ b/cloud/pkg/edgecontroller/messagelayer/util.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core/model" "github.com/kubeedge/kubeedge/cloud/pkg/edgecontroller/config" diff --git a/cloud/pkg/edgecontroller/utils/kubeclient.go b/cloud/pkg/edgecontroller/utils/kubeclient.go index 8b7a02b88..980e54afe 100644 --- a/cloud/pkg/edgecontroller/utils/kubeclient.go +++ b/cloud/pkg/edgecontroller/utils/kubeclient.go @@ -2,7 +2,7 @@ package utils import ( "k8s.io/client-go/kubernetes" - "k8s.io/klog" + "k8s.io/klog/v2" ) // KubeClient from config diff --git a/cloud/pkg/leaderelection/leaderelection.go b/cloud/pkg/leaderelection/leaderelection.go index 196f0a318..281f331ad 100755 --- a/cloud/pkg/leaderelection/leaderelection.go +++ b/cloud/pkg/leaderelection/leaderelection.go @@ -21,7 +21,7 @@ import ( "k8s.io/client-go/tools/leaderelection/resourcelock" "k8s.io/client-go/tools/record" componentbaseconfig "k8s.io/component-base/config" - "k8s.io/klog" + "k8s.io/klog/v2" podutil "k8s.io/kubernetes/pkg/api/v1/pod" "github.com/kubeedge/beehive/pkg/core" diff --git a/cloud/pkg/synccontroller/createfailedobject.go b/cloud/pkg/synccontroller/createfailedobject.go index a36cef23a..57f5fb624 100644 --- a/cloud/pkg/synccontroller/createfailedobject.go +++ b/cloud/pkg/synccontroller/createfailedobject.go @@ -3,7 +3,7 @@ package synccontroller import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" - "k8s.io/klog" + "k8s.io/klog/v2" beehiveContext "github.com/kubeedge/beehive/pkg/core/context" "github.com/kubeedge/beehive/pkg/core/model" diff --git a/cloud/pkg/synccontroller/objectsync.go b/cloud/pkg/synccontroller/objectsync.go index bb89054e3..63af8fca6 100644 --- a/cloud/pkg/synccontroller/objectsync.go +++ b/cloud/pkg/synccontroller/objectsync.go @@ -8,7 +8,7 @@ import ( "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "k8s.io/klog" + "k8s.io/klog/v2" beehiveContext "github.com/kubeedge/beehive/pkg/core/context" "github.com/kubeedge/beehive/pkg/core/model" diff --git a/cloud/pkg/synccontroller/synccontroller.go b/cloud/pkg/synccontroller/synccontroller.go index 5c991c07d..5f7d5aacb 100644 --- a/cloud/pkg/synccontroller/synccontroller.go +++ b/cloud/pkg/synccontroller/synccontroller.go @@ -18,7 +18,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/kubeedge/beehive/pkg/core" beehiveContext "github.com/kubeedge/beehive/pkg/core/context" diff --git a/edge/cmd/edgecore/app/server.go b/edge/cmd/edgecore/app/server.go index b84082487..d87727363 100644 --- a/edge/cmd/edgecore/app/server.go +++ b/edge/cmd/edgecore/app/server.go @@ -12,7 +12,7 @@ import ( cliflag "k8s.io/component-base/cli/flag" "k8s.io/component-base/cli/globalflag" "k8s.io/component-base/term" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core" "github.com/kubeedge/kubeedge/edge/cmd/edgecore/app/options" diff --git a/edge/pkg/common/dbm/db.go b/edge/pkg/common/dbm/db.go index 07c931509..9605ae176 100644 --- a/edge/pkg/common/dbm/db.go +++ b/edge/pkg/common/dbm/db.go @@ -7,7 +7,7 @@ import ( //Blank import to run only the init function _ "github.com/mattn/go-sqlite3" - "k8s.io/klog" + "k8s.io/klog/v2" ) // DBAccess is Ormer object interface for all transaction processing and switching database diff --git a/edge/pkg/devicetwin/devicetwin.go b/edge/pkg/devicetwin/devicetwin.go index 1ada631ec..0a89071c6 100644 --- a/edge/pkg/devicetwin/devicetwin.go +++ b/edge/pkg/devicetwin/devicetwin.go @@ -1,7 +1,7 @@ package devicetwin import ( - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core" "github.com/kubeedge/kubeedge/edge/pkg/common/modules" diff --git a/edge/pkg/devicetwin/dtclient/device_db.go b/edge/pkg/devicetwin/dtclient/device_db.go index 7fa6be62d..bc41a7f39 100644 --- a/edge/pkg/devicetwin/dtclient/device_db.go +++ b/edge/pkg/devicetwin/dtclient/device_db.go @@ -1,7 +1,7 @@ package dtclient import ( - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/edge/pkg/common/dbm" ) diff --git a/edge/pkg/devicetwin/dtclient/deviceattr_db.go b/edge/pkg/devicetwin/dtclient/deviceattr_db.go index a63abcbb4..a6748b6d5 100644 --- a/edge/pkg/devicetwin/dtclient/deviceattr_db.go +++ b/edge/pkg/devicetwin/dtclient/deviceattr_db.go @@ -1,7 +1,7 @@ package dtclient import ( - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/edge/pkg/common/dbm" ) diff --git a/edge/pkg/devicetwin/dtclient/devicetwin_db.go b/edge/pkg/devicetwin/dtclient/devicetwin_db.go index 8d2fcb5b3..090d54054 100644 --- a/edge/pkg/devicetwin/dtclient/devicetwin_db.go +++ b/edge/pkg/devicetwin/dtclient/devicetwin_db.go @@ -1,7 +1,7 @@ package dtclient import ( - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/edge/pkg/common/dbm" ) diff --git a/edge/pkg/devicetwin/dtclient/sql.go b/edge/pkg/devicetwin/dtclient/sql.go index f7e250bf1..823b86328 100644 --- a/edge/pkg/devicetwin/dtclient/sql.go +++ b/edge/pkg/devicetwin/dtclient/sql.go @@ -2,7 +2,7 @@ package dtclient import ( "github.com/astaxie/beego/orm" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core" ) diff --git a/edge/pkg/devicetwin/dtcontext/dtcontext.go b/edge/pkg/devicetwin/dtcontext/dtcontext.go index 2e7063e86..19c729348 100644 --- a/edge/pkg/devicetwin/dtcontext/dtcontext.go +++ b/edge/pkg/devicetwin/dtcontext/dtcontext.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core/model" "github.com/kubeedge/kubeedge/edge/pkg/common/modules" diff --git a/edge/pkg/devicetwin/dtmanager/communicate.go b/edge/pkg/devicetwin/dtmanager/communicate.go index 74bd1f771..831d109bc 100644 --- a/edge/pkg/devicetwin/dtmanager/communicate.go +++ b/edge/pkg/devicetwin/dtmanager/communicate.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/google/uuid" beehiveContext "github.com/kubeedge/beehive/pkg/core/context" diff --git a/edge/pkg/devicetwin/dtmanager/device.go b/edge/pkg/devicetwin/dtmanager/device.go index c025a788c..6b16689c1 100644 --- a/edge/pkg/devicetwin/dtmanager/device.go +++ b/edge/pkg/devicetwin/dtmanager/device.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core/model" "github.com/kubeedge/kubeedge/edge/pkg/common/modules" diff --git a/edge/pkg/devicetwin/dtmanager/membership.go b/edge/pkg/devicetwin/dtmanager/membership.go index 4e31d0e57..d7f77e4da 100644 --- a/edge/pkg/devicetwin/dtmanager/membership.go +++ b/edge/pkg/devicetwin/dtmanager/membership.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core/model" "github.com/kubeedge/kubeedge/edge/pkg/common/modules" diff --git a/edge/pkg/devicetwin/dtmanager/twin.go b/edge/pkg/devicetwin/dtmanager/twin.go index aadea7592..1d2323f2f 100644 --- a/edge/pkg/devicetwin/dtmanager/twin.go +++ b/edge/pkg/devicetwin/dtmanager/twin.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core/model" "github.com/kubeedge/kubeedge/edge/pkg/common/modules" diff --git a/edge/pkg/devicetwin/dtmanager/twin_test.go b/edge/pkg/devicetwin/dtmanager/twin_test.go index 5f4a91ea0..48b3b4eab 100644 --- a/edge/pkg/devicetwin/dtmanager/twin_test.go +++ b/edge/pkg/devicetwin/dtmanager/twin_test.go @@ -26,7 +26,7 @@ import ( "github.com/astaxie/beego/orm" "github.com/golang/mock/gomock" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core/model" "github.com/kubeedge/kubeedge/edge/mocks/beego" diff --git a/edge/pkg/devicetwin/dtmodule/dtmodule.go b/edge/pkg/devicetwin/dtmodule/dtmodule.go index e74e774fe..d66a55c88 100644 --- a/edge/pkg/devicetwin/dtmodule/dtmodule.go +++ b/edge/pkg/devicetwin/dtmodule/dtmodule.go @@ -1,7 +1,7 @@ package dtmodule import ( - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/edge/pkg/devicetwin/dtcommon" "github.com/kubeedge/kubeedge/edge/pkg/devicetwin/dtcontext" diff --git a/edge/pkg/devicetwin/process.go b/edge/pkg/devicetwin/process.go index 07b2ac30b..b596b2e0b 100644 --- a/edge/pkg/devicetwin/process.go +++ b/edge/pkg/devicetwin/process.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "k8s.io/klog" + "k8s.io/klog/v2" beehiveContext "github.com/kubeedge/beehive/pkg/core/context" "github.com/kubeedge/beehive/pkg/core/model" diff --git a/edge/pkg/edged/clcm/clcm_policy_none.go b/edge/pkg/edged/clcm/clcm_policy_none.go index 0a6ad0e83..ded215447 100644 --- a/edge/pkg/edged/clcm/clcm_policy_none.go +++ b/edge/pkg/edged/clcm/clcm_policy_none.go @@ -26,7 +26,7 @@ import ( v1 "k8s.io/api/core/v1" internalapi "k8s.io/cri-api/pkg/apis" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/kubelet/cm/containermap" "k8s.io/kubernetes/pkg/kubelet/cm/cpumanager" "k8s.io/kubernetes/pkg/kubelet/cm/cpuset" diff --git a/edge/pkg/edged/edged.go b/edge/pkg/edged/edged.go index e9338a176..b81491584 100644 --- a/edge/pkg/edged/edged.go +++ b/edge/pkg/edged/edged.go @@ -53,7 +53,7 @@ import ( "k8s.io/client-go/util/flowcontrol" "k8s.io/client-go/util/workqueue" internalapi "k8s.io/cri-api/pkg/apis" - "k8s.io/klog" + "k8s.io/klog/v2" pluginwatcherapi "k8s.io/kubelet/pkg/apis/pluginregistration/v1" kubeletinternalconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" "k8s.io/kubernetes/pkg/kubelet/cadvisor" diff --git a/edge/pkg/edged/edged_getters.go b/edge/pkg/edged/edged_getters.go index f10100201..c91f36bea 100644 --- a/edge/pkg/edged/edged_getters.go +++ b/edge/pkg/edged/edged_getters.go @@ -35,7 +35,7 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/kubelet/cm" "k8s.io/kubernetes/pkg/kubelet/config" "k8s.io/kubernetes/pkg/volume" diff --git a/edge/pkg/edged/edged_pods.go b/edge/pkg/edged/edged_pods.go index 3b7d47263..fe5c9428c 100644 --- a/edge/pkg/edged/edged_pods.go +++ b/edge/pkg/edged/edged_pods.go @@ -48,7 +48,7 @@ import ( "k8s.io/apimachinery/pkg/types" utilfeature "k8s.io/apiserver/pkg/util/feature" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - "k8s.io/klog" + "k8s.io/klog/v2" podutil "k8s.io/kubernetes/pkg/api/v1/pod" podshelper "k8s.io/kubernetes/pkg/apis/core/pods" v1qos "k8s.io/kubernetes/pkg/apis/core/v1/helper/qos" diff --git a/edge/pkg/edged/edged_status.go b/edge/pkg/edged/edged_status.go index fb2480e07..da3e14c08 100644 --- a/edge/pkg/edged/edged_status.go +++ b/edge/pkg/edged/edged_status.go @@ -36,7 +36,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/klog" + "k8s.io/klog/v2" beehiveContext "github.com/kubeedge/beehive/pkg/core/context" "github.com/kubeedge/beehive/pkg/core/model" diff --git a/edge/pkg/edged/edged_volumes.go b/edge/pkg/edged/edged_volumes.go index f15e3d773..7c562741c 100644 --- a/edge/pkg/edged/edged_volumes.go +++ b/edge/pkg/edged/edged_volumes.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/types" utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/util/removeall" "k8s.io/kubernetes/pkg/volume" diff --git a/edge/pkg/edged/server/server.go b/edge/pkg/edged/server/server.go index ea8b6ad84..2f3fa1e94 100644 --- a/edge/pkg/edged/server/server.go +++ b/edge/pkg/edged/server/server.go @@ -5,7 +5,7 @@ import ( "net" "net/http" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/kubelet/server" "k8s.io/kubernetes/pkg/kubelet/server/stats" diff --git a/edge/pkg/edged/status/status_manager.go b/edge/pkg/edged/status/status_manager.go index a5ff9154a..93213d936 100644 --- a/edge/pkg/edged/status/status_manager.go +++ b/edge/pkg/edged/status/status_manager.go @@ -8,7 +8,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/client-go/kubernetes" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/kubelet/status" "k8s.io/kubernetes/pkg/kubelet/util/format" diff --git a/edge/pkg/edged/util/record/record.go b/edge/pkg/edged/util/record/record.go index 36bf7b7eb..b1a7d8c02 100644 --- a/edge/pkg/edged/util/record/record.go +++ b/edge/pkg/edged/util/record/record.go @@ -3,7 +3,7 @@ package record import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/klog" + "k8s.io/klog/v2" ) //EventRecorder is object type to record events diff --git a/edge/pkg/edged/volume/csi/csi_attacher.go b/edge/pkg/edged/volume/csi/csi_attacher.go index de98027e0..9782a6a6a 100644 --- a/edge/pkg/edged/volume/csi/csi_attacher.go +++ b/edge/pkg/edged/volume/csi/csi_attacher.go @@ -44,7 +44,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/kubernetes" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/volume" ) diff --git a/edge/pkg/edged/volume/csi/csi_client.go b/edge/pkg/edged/volume/csi/csi_client.go index ad30ff267..1da449a7e 100644 --- a/edge/pkg/edged/volume/csi/csi_client.go +++ b/edge/pkg/edged/volume/csi/csi_client.go @@ -44,7 +44,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" utilversion "k8s.io/apimachinery/pkg/util/version" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/volume" ) diff --git a/edge/pkg/edged/volume/csi/csi_controller.go b/edge/pkg/edged/volume/csi/csi_controller.go index 4f8a2be3f..98bbbd600 100644 --- a/edge/pkg/edged/volume/csi/csi_controller.go +++ b/edge/pkg/edged/volume/csi/csi_controller.go @@ -20,7 +20,7 @@ import ( "context" "github.com/container-storage-interface/spec/lib/go/csi" - "k8s.io/klog" + "k8s.io/klog/v2" ) type Controller struct { diff --git a/edge/pkg/edged/volume/csi/csi_mounter.go b/edge/pkg/edged/volume/csi/csi_mounter.go index 7ed3d304a..b42b47c0f 100644 --- a/edge/pkg/edged/volume/csi/csi_mounter.go +++ b/edge/pkg/edged/volume/csi/csi_mounter.go @@ -36,7 +36,7 @@ import ( "k8s.io/apimachinery/pkg/types" utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/client-go/kubernetes" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/volume" utilstrings "k8s.io/utils/strings" diff --git a/edge/pkg/edged/volume/csi/csi_plugin.go b/edge/pkg/edged/volume/csi/csi_plugin.go index 88c82d285..dc0647acb 100644 --- a/edge/pkg/edged/volume/csi/csi_plugin.go +++ b/edge/pkg/edged/volume/csi/csi_plugin.go @@ -45,7 +45,7 @@ import ( clientset "k8s.io/client-go/kubernetes" storagelisters "k8s.io/client-go/listers/storage/v1" csitranslationplugins "k8s.io/csi-translation-lib/plugins" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/volume" diff --git a/edge/pkg/edged/volume/csi/csi_util.go b/edge/pkg/edged/volume/csi/csi_util.go index 3651d7d1a..e96d77113 100644 --- a/edge/pkg/edged/volume/csi/csi_util.go +++ b/edge/pkg/edged/volume/csi/csi_util.go @@ -31,7 +31,7 @@ import ( meta "k8s.io/apimachinery/pkg/apis/meta/v1" utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/client-go/kubernetes" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/volume" utilstrings "k8s.io/utils/strings" diff --git a/edge/pkg/edged/volume/csi/nodeinfomanager/nodeinfomanager.go b/edge/pkg/edged/volume/csi/nodeinfomanager/nodeinfomanager.go index 339bb177d..8389044d5 100644 --- a/edge/pkg/edged/volume/csi/nodeinfomanager/nodeinfomanager.go +++ b/edge/pkg/edged/volume/csi/nodeinfomanager/nodeinfomanager.go @@ -45,7 +45,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" utilfeature "k8s.io/apiserver/pkg/util/feature" clientset "k8s.io/client-go/kubernetes" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" diff --git a/edge/pkg/edged/volume_host.go b/edge/pkg/edged/volume_host.go index 23807fa95..84c422894 100644 --- a/edge/pkg/edged/volume_host.go +++ b/edge/pkg/edged/volume_host.go @@ -38,7 +38,7 @@ import ( "k8s.io/client-go/tools/cache" recordtools "k8s.io/client-go/tools/record" cloudprovider "k8s.io/cloud-provider" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util/hostutil" "k8s.io/kubernetes/pkg/volume/util/subpath" diff --git a/edge/pkg/edgehub/certificate/certmanager.go b/edge/pkg/edgehub/certificate/certmanager.go index a62445840..96946d509 100644 --- a/edge/pkg/edgehub/certificate/certmanager.go +++ b/edge/pkg/edgehub/certificate/certmanager.go @@ -18,7 +18,7 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/common/constants" "github.com/kubeedge/kubeedge/edge/pkg/edgehub/common/certutil" diff --git a/edge/pkg/edgehub/clients/quicclient/quicclient.go b/edge/pkg/edgehub/clients/quicclient/quicclient.go index 1734aab88..c6ba1d349 100644 --- a/edge/pkg/edgehub/clients/quicclient/quicclient.go +++ b/edge/pkg/edgehub/clients/quicclient/quicclient.go @@ -8,7 +8,7 @@ import ( "net/http" "time" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core/model" "github.com/kubeedge/viaduct/pkg/api" diff --git a/edge/pkg/edgehub/clients/wsclient/websocket.go b/edge/pkg/edgehub/clients/wsclient/websocket.go index 38ce135a6..4f64c9385 100644 --- a/edge/pkg/edgehub/clients/wsclient/websocket.go +++ b/edge/pkg/edgehub/clients/wsclient/websocket.go @@ -9,7 +9,7 @@ import ( "net/http" "time" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core/model" "github.com/kubeedge/kubeedge/edge/pkg/edgehub/config" diff --git a/edge/pkg/edgehub/clients/wsclient/websocket_test.go b/edge/pkg/edgehub/clients/wsclient/websocket_test.go index b04a122dd..4b7e6ad7e 100644 --- a/edge/pkg/edgehub/clients/wsclient/websocket_test.go +++ b/edge/pkg/edgehub/clients/wsclient/websocket_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core/model" "github.com/kubeedge/kubeedge/edge/pkg/common/util" diff --git a/edge/pkg/edgehub/common/http/http.go b/edge/pkg/edgehub/common/http/http.go index 2ce6f919f..5cc32da84 100644 --- a/edge/pkg/edgehub/common/http/http.go +++ b/edge/pkg/edgehub/common/http/http.go @@ -9,7 +9,7 @@ import ( "net/http" "time" - "k8s.io/klog" + "k8s.io/klog/v2" ) const ( diff --git a/edge/pkg/edgehub/edgehub.go b/edge/pkg/edgehub/edgehub.go index c9ff821ad..c664c3535 100644 --- a/edge/pkg/edgehub/edgehub.go +++ b/edge/pkg/edgehub/edgehub.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core" beehiveContext "github.com/kubeedge/beehive/pkg/core/context" diff --git a/edge/pkg/edgehub/process.go b/edge/pkg/edgehub/process.go index 956268f78..03f904c11 100644 --- a/edge/pkg/edgehub/process.go +++ b/edge/pkg/edgehub/process.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "k8s.io/klog" + "k8s.io/klog/v2" beehiveContext "github.com/kubeedge/beehive/pkg/core/context" "github.com/kubeedge/beehive/pkg/core/model" diff --git a/edge/pkg/edgestream/edgestream.go b/edge/pkg/edgestream/edgestream.go index 7149f2a34..3c6557543 100644 --- a/edge/pkg/edgestream/edgestream.go +++ b/edge/pkg/edgestream/edgestream.go @@ -23,7 +23,7 @@ import ( "time" "github.com/gorilla/websocket" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core" beehiveContext "github.com/kubeedge/beehive/pkg/core/context" diff --git a/edge/pkg/edgestream/tunnel.go b/edge/pkg/edgestream/tunnel.go index b3c41f4dd..544d54b45 100644 --- a/edge/pkg/edgestream/tunnel.go +++ b/edge/pkg/edgestream/tunnel.go @@ -24,7 +24,7 @@ import ( "time" "github.com/gorilla/websocket" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/pkg/stream" ) diff --git a/edge/pkg/eventbus/common/util/common.go b/edge/pkg/eventbus/common/util/common.go index 99648ec7d..f916faae6 100644 --- a/edge/pkg/eventbus/common/util/common.go +++ b/edge/pkg/eventbus/common/util/common.go @@ -9,7 +9,7 @@ import ( "time" MQTT "github.com/eclipse/paho.mqtt.golang" - "k8s.io/klog" + "k8s.io/klog/v2" eventconfig "github.com/kubeedge/kubeedge/edge/pkg/eventbus/config" ) diff --git a/edge/pkg/eventbus/common/util/common_test.go b/edge/pkg/eventbus/common/util/common_test.go index e19ae924b..60bd12cef 100644 --- a/edge/pkg/eventbus/common/util/common_test.go +++ b/edge/pkg/eventbus/common/util/common_test.go @@ -26,7 +26,7 @@ import ( MQTT "github.com/eclipse/paho.mqtt.golang" "github.com/stretchr/testify/assert" - "k8s.io/klog" + "k8s.io/klog/v2" eventconfig "github.com/kubeedge/kubeedge/edge/pkg/eventbus/config" "github.com/kubeedge/kubeedge/pkg/apis/componentconfig/edgecore/v1alpha1" diff --git a/edge/pkg/eventbus/eventbus.go b/edge/pkg/eventbus/eventbus.go index 5102f40bf..e8bc25faf 100644 --- a/edge/pkg/eventbus/eventbus.go +++ b/edge/pkg/eventbus/eventbus.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core" beehiveContext "github.com/kubeedge/beehive/pkg/core/context" diff --git a/edge/pkg/eventbus/mqtt/client.go b/edge/pkg/eventbus/mqtt/client.go index f86044f9b..447ded0b0 100644 --- a/edge/pkg/eventbus/mqtt/client.go +++ b/edge/pkg/eventbus/mqtt/client.go @@ -8,7 +8,7 @@ import ( "time" MQTT "github.com/eclipse/paho.mqtt.golang" - "k8s.io/klog" + "k8s.io/klog/v2" beehiveContext "github.com/kubeedge/beehive/pkg/core/context" "github.com/kubeedge/beehive/pkg/core/model" diff --git a/edge/pkg/eventbus/mqtt/server.go b/edge/pkg/eventbus/mqtt/server.go index 8d42b2458..480dd16bf 100644 --- a/edge/pkg/eventbus/mqtt/server.go +++ b/edge/pkg/eventbus/mqtt/server.go @@ -25,7 +25,7 @@ import ( "github.com/256dpi/gomqtt/packet" "github.com/256dpi/gomqtt/topic" "github.com/256dpi/gomqtt/transport" - "k8s.io/klog" + "k8s.io/klog/v2" beehiveContext "github.com/kubeedge/beehive/pkg/core/context" "github.com/kubeedge/beehive/pkg/core/model" diff --git a/edge/pkg/metamanager/client/metaclient.go b/edge/pkg/metamanager/client/metaclient.go index 07c2673d9..a614f3b53 100644 --- a/edge/pkg/metamanager/client/metaclient.go +++ b/edge/pkg/metamanager/client/metaclient.go @@ -4,7 +4,7 @@ import ( "time" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/klog" + "k8s.io/klog/v2" beehiveContext "github.com/kubeedge/beehive/pkg/core/context" "github.com/kubeedge/beehive/pkg/core/model" diff --git a/edge/pkg/metamanager/dao/meta.go b/edge/pkg/metamanager/dao/meta.go index 325f08660..07eb720c7 100644 --- a/edge/pkg/metamanager/dao/meta.go +++ b/edge/pkg/metamanager/dao/meta.go @@ -3,7 +3,7 @@ package dao import ( "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/edge/pkg/common/dbm" ) diff --git a/edge/pkg/metamanager/metamanager.go b/edge/pkg/metamanager/metamanager.go index babef78dc..9c5e321be 100644 --- a/edge/pkg/metamanager/metamanager.go +++ b/edge/pkg/metamanager/metamanager.go @@ -4,7 +4,7 @@ import ( "time" "github.com/astaxie/beego/orm" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core" beehiveContext "github.com/kubeedge/beehive/pkg/core/context" diff --git a/edge/pkg/metamanager/process.go b/edge/pkg/metamanager/process.go index 2d7324193..15ad76d15 100644 --- a/edge/pkg/metamanager/process.go +++ b/edge/pkg/metamanager/process.go @@ -7,7 +7,7 @@ import ( "time" "k8s.io/api/core/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/common/util" beehiveContext "github.com/kubeedge/beehive/pkg/core/context" diff --git a/edge/pkg/servicebus/servicebus.go b/edge/pkg/servicebus/servicebus.go index 19943138d..33372c015 100644 --- a/edge/pkg/servicebus/servicebus.go +++ b/edge/pkg/servicebus/servicebus.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core" beehiveContext "github.com/kubeedge/beehive/pkg/core/context" diff --git a/edge/test/cloudhub/stub.go b/edge/test/cloudhub/stub.go index 85fd5a78d..6f5f79460 100644 --- a/edge/test/cloudhub/stub.go +++ b/edge/test/cloudhub/stub.go @@ -9,7 +9,7 @@ import ( "github.com/gorilla/mux" "github.com/gorilla/websocket" "k8s.io/api/core/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core" beehiveContext "github.com/kubeedge/beehive/pkg/core/context" diff --git a/edge/test/test.go b/edge/test/test.go index b506d5ab7..ac9bf6ce8 100644 --- a/edge/test/test.go +++ b/edge/test/test.go @@ -8,7 +8,7 @@ import ( "time" "k8s.io/api/core/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core" beehiveContext "github.com/kubeedge/beehive/pkg/core/context" diff --git a/edgemesh/cmd/edgemesh.go b/edgemesh/cmd/edgemesh.go index 9b1a3b665..396f131c5 100644 --- a/edgemesh/cmd/edgemesh.go +++ b/edgemesh/cmd/edgemesh.go @@ -3,7 +3,7 @@ package main import ( "flag" "github.com/spf13/pflag" - "k8s.io/klog" + "k8s.io/klog/v2" ) func main() { diff --git a/edgemesh/pkg/config/config.go b/edgemesh/pkg/config/config.go index 79bb37d4b..9a4224e8d 100644 --- a/edgemesh/pkg/config/config.go +++ b/edgemesh/pkg/config/config.go @@ -4,7 +4,7 @@ import ( "net" "sync" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/edgemesh/pkg/common" "github.com/kubeedge/kubeedge/pkg/apis/componentconfig/edgecore/v1alpha1" diff --git a/edgemesh/pkg/dns/dns.go b/edgemesh/pkg/dns/dns.go index 5782e3c09..521b5fff9 100644 --- a/edgemesh/pkg/dns/dns.go +++ b/edgemesh/pkg/dns/dns.go @@ -11,7 +11,7 @@ import ( "time" "unsafe" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/edge/pkg/metamanager/client" "github.com/kubeedge/kubeedge/edgemesh/pkg/common" diff --git a/edgemesh/pkg/listener/listener.go b/edgemesh/pkg/listener/listener.go index e1a90db23..dbb91d822 100644 --- a/edgemesh/pkg/listener/listener.go +++ b/edgemesh/pkg/listener/listener.go @@ -12,7 +12,7 @@ import ( "github.com/kubeedge/beehive/pkg/core/model" v1 "k8s.io/api/core/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/common/constants" "github.com/kubeedge/kubeedge/edge/pkg/metamanager/client" diff --git a/edgemesh/pkg/module.go b/edgemesh/pkg/module.go index ff4e58a08..5c45cedc2 100644 --- a/edgemesh/pkg/module.go +++ b/edgemesh/pkg/module.go @@ -3,7 +3,7 @@ package pkg import ( "github.com/kubeedge/beehive/pkg/core" beehiveContext "github.com/kubeedge/beehive/pkg/core/context" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/edge/pkg/common/modules" meshconfig "github.com/kubeedge/kubeedge/edgemesh/pkg/config" diff --git a/edgemesh/pkg/plugin/plugin.go b/edgemesh/pkg/plugin/plugin.go index 5202836d8..9c6dd8c29 100644 --- a/edgemesh/pkg/plugin/plugin.go +++ b/edgemesh/pkg/plugin/plugin.go @@ -1,7 +1,7 @@ package plugin import ( - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/go-chassis/go-archaius" "github.com/go-chassis/go-chassis/control" diff --git a/edgemesh/pkg/plugin/registry/registry.go b/edgemesh/pkg/plugin/registry/registry.go index 1916a62e6..59676df43 100644 --- a/edgemesh/pkg/plugin/registry/registry.go +++ b/edgemesh/pkg/plugin/registry/registry.go @@ -8,7 +8,7 @@ import ( "github.com/go-chassis/go-chassis/core/registry" "github.com/go-chassis/go-chassis/pkg/util/tags" v1 "k8s.io/api/core/v1" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/edge/pkg/metamanager/client" "github.com/kubeedge/kubeedge/edgemesh/pkg/cache" diff --git a/edgemesh/pkg/protocol/http/http.go b/edgemesh/pkg/protocol/http/http.go index cbec2632b..a3fe33b2f 100644 --- a/edgemesh/pkg/protocol/http/http.go +++ b/edgemesh/pkg/protocol/http/http.go @@ -12,7 +12,7 @@ import ( "github.com/go-chassis/go-chassis/core/common" "github.com/go-chassis/go-chassis/core/handler" "github.com/go-chassis/go-chassis/core/invocation" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/edgemesh/pkg/config" ) diff --git a/edgemesh/pkg/proxy/proxy.go b/edgemesh/pkg/proxy/proxy.go index 0c966381a..a8de8c10b 100644 --- a/edgemesh/pkg/proxy/proxy.go +++ b/edgemesh/pkg/proxy/proxy.go @@ -9,7 +9,7 @@ import ( "time" "github.com/vishvananda/netlink" - "k8s.io/klog" + "k8s.io/klog/v2" utiliptables "k8s.io/kubernetes/pkg/util/iptables" utilexec "k8s.io/utils/exec" diff --git a/edgesite/cmd/edgesite/app/server.go b/edgesite/cmd/edgesite/app/server.go index 0d897d6fd..1631faee9 100644 --- a/edgesite/cmd/edgesite/app/server.go +++ b/edgesite/cmd/edgesite/app/server.go @@ -7,7 +7,7 @@ import ( cliflag "k8s.io/component-base/cli/flag" "k8s.io/component-base/cli/globalflag" "k8s.io/component-base/term" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core" "github.com/kubeedge/kubeedge/cloud/pkg/edgecontroller" @@ -66,7 +66,7 @@ require ( k8s.io/component-base v0.19.3 k8s.io/cri-api v0.19.3 k8s.io/csi-translation-lib v0.19.3 - k8s.io/klog v1.0.0 + k8s.io/klog/v2 v2.2.0 k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6 k8s.io/kube-scheduler v0.19.3 // indirect k8s.io/kubelet v0.19.3 @@ -98,7 +98,7 @@ replace ( k8s.io/csi-translation-lib v0.0.0 => k8s.io/csi-translation-lib v0.0.0-20190718190424-bef8d46b95de k8s.io/gengo v0.0.0 => k8s.io/gengo v0.0.0-20190327210449-e17681d19d3a // indirect k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1 // indirect - k8s.io/klog => k8s.io/klog v0.4.0 // indirect + k8s.io/klog/v2 => k8s.io/klog/v2 v2.2.0 k8s.io/kube-aggregator v0.0.0 => k8s.io/kube-aggregator v0.0.0-20190718184434-a064d4d1ed7a k8s.io/kube-controller-manager v0.0.0 => k8s.io/kube-controller-manager v0.0.0-20190718190030-ea930fedc880 k8s.io/kube-openapi v0.0.0 => k8s.io/kube-openapi v0.0.0-20190718094010-3cf2ea392886 // indirect @@ -283,7 +283,6 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -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-mesh/openlogging v1.0.0 h1:BVNm0pQbR9sOb3l//QrRkwao9/4lkOPh7sz7EOUPJpk= @@ -1203,9 +1202,9 @@ k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8 k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14 h1:t4L10Qfx/p7ASH3gXCdIUtPbbIuegCoUJf3TMSFekjw= k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/heapster v1.2.0-beta.1/go.mod h1:h1uhptVXMwC8xtZBYsPXKVi8fpdlYkTs6k949KozGrM= -k8s.io/klog v0.4.0 h1:lCJCxf/LIowc2IGS9TPjWDyXY4nOmdGdfcwwDQCOURQ= -k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= -k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= +k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= +k8s.io/klog v0.3.1 h1:RVgyDHY/kFKtLqh67NvEWIgkMneNoIrdkN0CxDSQc68= +k8s.io/klog v0.3.1/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/kube-aggregator v0.0.0-20190718184434-a064d4d1ed7a/go.mod h1:JuqH+qrAo7UN+3RYh7XjJeDb+qowXlGqy0fGD/79N8U= diff --git a/keadm/cmd/keadm/app/cmd/debug/get.go b/keadm/cmd/keadm/app/cmd/debug/get.go index e9060f74d..445122b3d 100644 --- a/keadm/cmd/keadm/app/cmd/debug/get.go +++ b/keadm/cmd/keadm/app/cmd/debug/get.go @@ -18,7 +18,7 @@ import ( "encoding/json" "fmt" "io" - "k8s.io/klog" + "k8s.io/klog/v2" "os" "strings" diff --git a/keadm/cmd/keadm/app/cmd/reset.go b/keadm/cmd/keadm/app/cmd/reset.go index 94b177e16..095db87bb 100644 --- a/keadm/cmd/keadm/app/cmd/reset.go +++ b/keadm/cmd/keadm/app/cmd/reset.go @@ -24,7 +24,7 @@ import ( "strings" "github.com/spf13/cobra" - "k8s.io/klog" + "k8s.io/klog/v2" phases "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/reset" utilruntime "k8s.io/kubernetes/cmd/kubeadm/app/util/runtime" utilsexec "k8s.io/utils/exec" diff --git a/keadm/cmd/keadm/app/cmd/util/common.go b/keadm/cmd/keadm/app/cmd/util/common.go index 498b9c15f..fb566bd79 100644 --- a/keadm/cmd/keadm/app/cmd/util/common.go +++ b/keadm/cmd/keadm/app/cmd/util/common.go @@ -36,7 +36,7 @@ import ( "k8s.io/client-go/discovery" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" - "k8s.io/klog" + "k8s.io/klog/v2" types "github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/common" "github.com/kubeedge/kubeedge/pkg/apis/componentconfig/edgecore/v1alpha1" diff --git a/keadm/cmd/keadm/app/cmd/util/kubeclient.go b/keadm/cmd/keadm/app/cmd/util/kubeclient.go index ca6cec542..ecb37e482 100644 --- a/keadm/cmd/keadm/app/cmd/util/kubeclient.go +++ b/keadm/cmd/keadm/app/cmd/util/kubeclient.go @@ -8,7 +8,7 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/common/constants" ) diff --git a/keadm/cmd/keadm/app/cmd/version.go b/keadm/cmd/keadm/app/cmd/version.go index 634dd6b41..0994cb59d 100644 --- a/keadm/cmd/keadm/app/cmd/version.go +++ b/keadm/cmd/keadm/app/cmd/version.go @@ -10,7 +10,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" yaml "gopkg.in/yaml.v2" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/pkg/version" ) diff --git a/keadm/cmd/keadm/keadm.go b/keadm/cmd/keadm/keadm.go index 6fa963952..0048e8193 100644 --- a/keadm/cmd/keadm/keadm.go +++ b/keadm/cmd/keadm/keadm.go @@ -17,7 +17,7 @@ limitations under the License. package main import ( - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/keadm/cmd/keadm/app" ) diff --git a/mappers/bluetooth_mapper/action_manager/action_manager.go b/mappers/bluetooth_mapper/action_manager/action_manager.go index 843481c1e..5513ae21c 100644 --- a/mappers/bluetooth_mapper/action_manager/action_manager.go +++ b/mappers/bluetooth_mapper/action_manager/action_manager.go @@ -22,7 +22,7 @@ import ( "strings" "github.com/paypal/gatt" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/data_converter" ) diff --git a/mappers/bluetooth_mapper/controller/controller.go b/mappers/bluetooth_mapper/controller/controller.go index d3389fe6e..d75a31faf 100644 --- a/mappers/bluetooth_mapper/controller/controller.go +++ b/mappers/bluetooth_mapper/controller/controller.go @@ -23,7 +23,7 @@ import ( MQTT "github.com/eclipse/paho.mqtt.golang" "github.com/paypal/gatt" "github.com/paypal/gatt/examples/option" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/action_manager" "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/configuration" diff --git a/mappers/bluetooth_mapper/helper/helper.go b/mappers/bluetooth_mapper/helper/helper.go index cbcf494c6..8ce782778 100644 --- a/mappers/bluetooth_mapper/helper/helper.go +++ b/mappers/bluetooth_mapper/helper/helper.go @@ -23,7 +23,7 @@ import ( "time" MQTT "github.com/eclipse/paho.mqtt.golang" - "k8s.io/klog" + "k8s.io/klog/v2" ) var ( diff --git a/mappers/bluetooth_mapper/main.go b/mappers/bluetooth_mapper/main.go index 2f7883119..c1e58c2f4 100644 --- a/mappers/bluetooth_mapper/main.go +++ b/mappers/bluetooth_mapper/main.go @@ -21,7 +21,7 @@ import ( "os" "github.com/spf13/pflag" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/configuration" "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/controller" diff --git a/mappers/bluetooth_mapper/scheduler/scheduler.go b/mappers/bluetooth_mapper/scheduler/scheduler.go index 0ec9cf79d..bdfcaf1ee 100644 --- a/mappers/bluetooth_mapper/scheduler/scheduler.go +++ b/mappers/bluetooth_mapper/scheduler/scheduler.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "k8s.io/klog" + "k8s.io/klog/v2" actionmanager "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/action_manager" dataconverter "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/data_converter" diff --git a/mappers/bluetooth_mapper/watcher/watcher.go b/mappers/bluetooth_mapper/watcher/watcher.go index 36f350ee1..668ccf7bd 100644 --- a/mappers/bluetooth_mapper/watcher/watcher.go +++ b/mappers/bluetooth_mapper/watcher/watcher.go @@ -24,7 +24,7 @@ import ( "time" "github.com/paypal/gatt" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/action_manager" "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/data_converter" diff --git a/mappers/modbus-go/config.go b/mappers/modbus-go/config.go index 89474504d..21ec1f0bf 100644 --- a/mappers/modbus-go/config.go +++ b/mappers/modbus-go/config.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/pflag" "gopkg.in/yaml.v2" - "k8s.io/klog" + "k8s.io/klog/v2" ) // Config is the modbus mapper configuration. diff --git a/mappers/modbus-go/configmap/parse.go b/mappers/modbus-go/configmap/parse.go index 41ae84ac0..4a63342f2 100644 --- a/mappers/modbus-go/configmap/parse.go +++ b/mappers/modbus-go/configmap/parse.go @@ -23,7 +23,7 @@ import ( mappercommon "github.com/kubeedge/kubeedge/mappers/common" "github.com/kubeedge/kubeedge/mappers/modbus-go/globals" - "k8s.io/klog" + "k8s.io/klog/v2" ) // Parse parse the configmap. diff --git a/mappers/modbus-go/device/device.go b/mappers/modbus-go/device/device.go index d03097a78..bd812db67 100644 --- a/mappers/modbus-go/device/device.go +++ b/mappers/modbus-go/device/device.go @@ -31,7 +31,7 @@ import ( "github.com/kubeedge/kubeedge/mappers/modbus-go/configmap" "github.com/kubeedge/kubeedge/mappers/modbus-go/driver" "github.com/kubeedge/kubeedge/mappers/modbus-go/globals" - "k8s.io/klog" + "k8s.io/klog/v2" ) var devices map[string]*globals.ModbusDev diff --git a/mappers/modbus-go/device/devstatus.go b/mappers/modbus-go/device/devstatus.go index f4b90dab4..bf762f8ae 100644 --- a/mappers/modbus-go/device/devstatus.go +++ b/mappers/modbus-go/device/devstatus.go @@ -20,7 +20,7 @@ import ( mappercommon "github.com/kubeedge/kubeedge/mappers/common" "github.com/kubeedge/kubeedge/mappers/modbus-go/driver" "github.com/kubeedge/kubeedge/mappers/modbus-go/globals" - "k8s.io/klog" + "k8s.io/klog/v2" ) // GetStatus is the timer structure for getting device status. diff --git a/mappers/modbus-go/device/twindata.go b/mappers/modbus-go/device/twindata.go index 798516d4a..6aedcec46 100644 --- a/mappers/modbus-go/device/twindata.go +++ b/mappers/modbus-go/device/twindata.go @@ -23,7 +23,7 @@ import ( mappercommon "github.com/kubeedge/kubeedge/mappers/common" "github.com/kubeedge/kubeedge/mappers/modbus-go/driver" "github.com/kubeedge/kubeedge/mappers/modbus-go/globals" - "k8s.io/klog" + "k8s.io/klog/v2" ) // TwinData is the timer structure for getting twin/data. diff --git a/mappers/modbus-go/driver/client.go b/mappers/modbus-go/driver/client.go index 49fdfa0c6..07a04a172 100644 --- a/mappers/modbus-go/driver/client.go +++ b/mappers/modbus-go/driver/client.go @@ -22,7 +22,7 @@ import ( "time" "github.com/sailorvii/modbus" - "k8s.io/klog" + "k8s.io/klog/v2" ) // ModbusTCP is the configurations of modbus TCP. diff --git a/mappers/modbus-go/main.go b/mappers/modbus-go/main.go index e6cef42e8..74bafd840 100644 --- a/mappers/modbus-go/main.go +++ b/mappers/modbus-go/main.go @@ -22,7 +22,7 @@ import ( mappercommon "github.com/kubeedge/kubeedge/mappers/common" "github.com/kubeedge/kubeedge/mappers/modbus-go/device" "github.com/kubeedge/kubeedge/mappers/modbus-go/globals" - "k8s.io/klog" + "k8s.io/klog/v2" ) func main() { diff --git a/pkg/apis/componentconfig/cloudcore/v1alpha1/helper.go b/pkg/apis/componentconfig/cloudcore/v1alpha1/helper.go index 0579e9eeb..ea51e5b0b 100644 --- a/pkg/apis/componentconfig/cloudcore/v1alpha1/helper.go +++ b/pkg/apis/componentconfig/cloudcore/v1alpha1/helper.go @@ -19,7 +19,7 @@ package v1alpha1 import ( "io/ioutil" - "k8s.io/klog" + "k8s.io/klog/v2" "sigs.k8s.io/yaml" ) diff --git a/pkg/apis/componentconfig/cloudcore/v1alpha1/validation/validation.go b/pkg/apis/componentconfig/cloudcore/v1alpha1/validation/validation.go index 79b29b637..65b6e437a 100644 --- a/pkg/apis/componentconfig/cloudcore/v1alpha1/validation/validation.go +++ b/pkg/apis/componentconfig/cloudcore/v1alpha1/validation/validation.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" componentbaseconfig "k8s.io/component-base/config" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/common/constants" "github.com/kubeedge/kubeedge/pkg/apis/componentconfig/cloudcore/v1alpha1" diff --git a/pkg/apis/componentconfig/edgecore/v1alpha1/helper.go b/pkg/apis/componentconfig/edgecore/v1alpha1/helper.go index b1860e1c9..814758014 100644 --- a/pkg/apis/componentconfig/edgecore/v1alpha1/helper.go +++ b/pkg/apis/componentconfig/edgecore/v1alpha1/helper.go @@ -19,7 +19,7 @@ package v1alpha1 import ( "io/ioutil" - "k8s.io/klog" + "k8s.io/klog/v2" "sigs.k8s.io/yaml" ) diff --git a/pkg/apis/componentconfig/edgecore/v1alpha1/validation/validation.go b/pkg/apis/componentconfig/edgecore/v1alpha1/validation/validation.go index 1a08f6cf1..1ae8e0669 100644 --- a/pkg/apis/componentconfig/edgecore/v1alpha1/validation/validation.go +++ b/pkg/apis/componentconfig/edgecore/v1alpha1/validation/validation.go @@ -22,7 +22,7 @@ import ( "path" "k8s.io/apimachinery/pkg/util/validation/field" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/pkg/apis/componentconfig/edgecore/v1alpha1" utilvalidation "github.com/kubeedge/kubeedge/pkg/util/validation" diff --git a/pkg/apis/componentconfig/edgesite/v1alpha1/helper.go b/pkg/apis/componentconfig/edgesite/v1alpha1/helper.go index 14bcdf6f1..3aa945ddd 100644 --- a/pkg/apis/componentconfig/edgesite/v1alpha1/helper.go +++ b/pkg/apis/componentconfig/edgesite/v1alpha1/helper.go @@ -19,7 +19,7 @@ package v1alpha1 import ( "io/ioutil" - "k8s.io/klog" + "k8s.io/klog/v2" "sigs.k8s.io/yaml" ) diff --git a/pkg/stream/edgedexecconnection.go b/pkg/stream/edgedexecconnection.go index b0e8770ca..307070b9c 100644 --- a/pkg/stream/edgedexecconnection.go +++ b/pkg/stream/edgedexecconnection.go @@ -5,7 +5,7 @@ import ( "fmt" "io" "k8s.io/apimachinery/pkg/util/httpstream/spdy" - "k8s.io/klog" + "k8s.io/klog/v2" "net/http" "net/url" ) diff --git a/pkg/stream/edgedlogconnection.go b/pkg/stream/edgedlogconnection.go index 976356b74..312285f13 100644 --- a/pkg/stream/edgedlogconnection.go +++ b/pkg/stream/edgedlogconnection.go @@ -24,7 +24,7 @@ import ( "net/http" "net/url" - "k8s.io/klog" + "k8s.io/klog/v2" ) type EdgedLogsConnection struct { diff --git a/pkg/stream/edgedmetricsconnection.go b/pkg/stream/edgedmetricsconnection.go index 4222775ea..3662ee916 100644 --- a/pkg/stream/edgedmetricsconnection.go +++ b/pkg/stream/edgedmetricsconnection.go @@ -23,7 +23,7 @@ import ( "net/http" "net/url" - "k8s.io/klog" + "k8s.io/klog/v2" ) type EdgedMetricsConnection struct { diff --git a/pkg/stream/message.go b/pkg/stream/message.go index 949865cd8..0135af207 100644 --- a/pkg/stream/message.go +++ b/pkg/stream/message.go @@ -23,7 +23,7 @@ import ( "io" "io/ioutil" - "k8s.io/klog" + "k8s.io/klog/v2" ) type MessageType uint64 diff --git a/pkg/util/flag/flags.go b/pkg/util/flag/flags.go index 251fbf2c3..53e0c62da 100644 --- a/pkg/util/flag/flags.go +++ b/pkg/util/flag/flags.go @@ -22,7 +22,7 @@ import ( "strconv" "github.com/spf13/pflag" - "k8s.io/klog" + "k8s.io/klog/v2" "sigs.k8s.io/yaml" ) diff --git a/pkg/util/util.go b/pkg/util/util.go index 8fd61ec5a..b838c5b68 100644 --- a/pkg/util/util.go +++ b/pkg/util/util.go @@ -26,7 +26,7 @@ import ( "strings" utilnet "k8s.io/apimachinery/pkg/util/net" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/common/constants" ) diff --git a/staging/src/github.com/kubeedge/beehive/go.mod b/staging/src/github.com/kubeedge/beehive/go.mod index b5a7efb7e..e159f665e 100644 --- a/staging/src/github.com/kubeedge/beehive/go.mod +++ b/staging/src/github.com/kubeedge/beehive/go.mod @@ -5,7 +5,7 @@ go 1.14 require ( github.com/satori/go.uuid v1.2.0 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 // indirect - k8s.io/klog v1.0.0 + k8s.io/klog/v2 v2.2.0 ) replace ( diff --git a/staging/src/github.com/kubeedge/beehive/go.sum b/staging/src/github.com/kubeedge/beehive/go.sum index 6244c68a1..8a244b639 100644 --- a/staging/src/github.com/kubeedge/beehive/go.sum +++ b/staging/src/github.com/kubeedge/beehive/go.sum @@ -1,7 +1,8 @@ -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/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -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.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A= +k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= diff --git a/staging/src/github.com/kubeedge/beehive/pkg/core/context/context_channel.go b/staging/src/github.com/kubeedge/beehive/pkg/core/context/context_channel.go index ca72d9e3e..dd6a660c8 100644 --- a/staging/src/github.com/kubeedge/beehive/pkg/core/context/context_channel.go +++ b/staging/src/github.com/kubeedge/beehive/pkg/core/context/context_channel.go @@ -7,7 +7,7 @@ import ( "sync/atomic" "time" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core/model" ) diff --git a/staging/src/github.com/kubeedge/beehive/pkg/core/context/context_factory.go b/staging/src/github.com/kubeedge/beehive/pkg/core/context/context_factory.go index f13d07cd7..2cf48b9f3 100644 --- a/staging/src/github.com/kubeedge/beehive/pkg/core/context/context_factory.go +++ b/staging/src/github.com/kubeedge/beehive/pkg/core/context/context_factory.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core/model" ) diff --git a/staging/src/github.com/kubeedge/beehive/pkg/core/core.go b/staging/src/github.com/kubeedge/beehive/pkg/core/core.go index e567520cd..47b6abd22 100644 --- a/staging/src/github.com/kubeedge/beehive/pkg/core/core.go +++ b/staging/src/github.com/kubeedge/beehive/pkg/core/core.go @@ -5,7 +5,7 @@ import ( "os/signal" "syscall" - "k8s.io/klog" + "k8s.io/klog/v2" beehiveContext "github.com/kubeedge/beehive/pkg/core/context" ) diff --git a/staging/src/github.com/kubeedge/beehive/pkg/core/module.go b/staging/src/github.com/kubeedge/beehive/pkg/core/module.go index f3f9ab6b1..53e4cf8a1 100644 --- a/staging/src/github.com/kubeedge/beehive/pkg/core/module.go +++ b/staging/src/github.com/kubeedge/beehive/pkg/core/module.go @@ -1,7 +1,7 @@ package core import ( - "k8s.io/klog" + "k8s.io/klog/v2" ) const ( diff --git a/staging/src/github.com/kubeedge/viaduct/examples/chat/client.go b/staging/src/github.com/kubeedge/viaduct/examples/chat/client.go index 7f470527d..b03f62798 100644 --- a/staging/src/github.com/kubeedge/viaduct/examples/chat/client.go +++ b/staging/src/github.com/kubeedge/viaduct/examples/chat/client.go @@ -7,7 +7,7 @@ import ( "net/http" "os" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core/model" "github.com/kubeedge/viaduct/examples/chat/config" diff --git a/staging/src/github.com/kubeedge/viaduct/examples/chat/common.go b/staging/src/github.com/kubeedge/viaduct/examples/chat/common.go index 101ec7062..dc49b862a 100644 --- a/staging/src/github.com/kubeedge/viaduct/examples/chat/common.go +++ b/staging/src/github.com/kubeedge/viaduct/examples/chat/common.go @@ -6,7 +6,7 @@ import ( "fmt" "io/ioutil" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/viaduct/examples/chat/config" ) diff --git a/staging/src/github.com/kubeedge/viaduct/examples/chat/main.go b/staging/src/github.com/kubeedge/viaduct/examples/chat/main.go index 8992bd81a..a1829107c 100644 --- a/staging/src/github.com/kubeedge/viaduct/examples/chat/main.go +++ b/staging/src/github.com/kubeedge/viaduct/examples/chat/main.go @@ -3,7 +3,7 @@ package main import ( "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/viaduct/examples/chat/config" ) diff --git a/staging/src/github.com/kubeedge/viaduct/examples/chat/server.go b/staging/src/github.com/kubeedge/viaduct/examples/chat/server.go index 047558182..13ad9891b 100644 --- a/staging/src/github.com/kubeedge/viaduct/examples/chat/server.go +++ b/staging/src/github.com/kubeedge/viaduct/examples/chat/server.go @@ -11,7 +11,7 @@ import ( "math/big" "os" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core/model" "github.com/kubeedge/viaduct/examples/chat/config" diff --git a/staging/src/github.com/kubeedge/viaduct/examples/mirror/client.go b/staging/src/github.com/kubeedge/viaduct/examples/mirror/client.go index ef4fceba8..c5cc71b11 100644 --- a/staging/src/github.com/kubeedge/viaduct/examples/mirror/client.go +++ b/staging/src/github.com/kubeedge/viaduct/examples/mirror/client.go @@ -6,7 +6,7 @@ import ( "net/http" "os" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/viaduct/examples/chat/config" "github.com/kubeedge/viaduct/pkg/api" diff --git a/staging/src/github.com/kubeedge/viaduct/examples/mirror/main.go b/staging/src/github.com/kubeedge/viaduct/examples/mirror/main.go index 75d37cb44..c12385567 100644 --- a/staging/src/github.com/kubeedge/viaduct/examples/mirror/main.go +++ b/staging/src/github.com/kubeedge/viaduct/examples/mirror/main.go @@ -3,7 +3,7 @@ package main import ( "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/viaduct/examples/chat/config" ) diff --git a/staging/src/github.com/kubeedge/viaduct/examples/mirror/server.go b/staging/src/github.com/kubeedge/viaduct/examples/mirror/server.go index 4c6307b77..230f65fd3 100644 --- a/staging/src/github.com/kubeedge/viaduct/examples/mirror/server.go +++ b/staging/src/github.com/kubeedge/viaduct/examples/mirror/server.go @@ -10,7 +10,7 @@ import ( "io" "math/big" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/viaduct/examples/chat/config" "github.com/kubeedge/viaduct/pkg/api" diff --git a/staging/src/github.com/kubeedge/viaduct/go.mod b/staging/src/github.com/kubeedge/viaduct/go.mod index 14a41de8a..d14fe8fbf 100644 --- a/staging/src/github.com/kubeedge/viaduct/go.mod +++ b/staging/src/github.com/kubeedge/viaduct/go.mod @@ -18,7 +18,7 @@ require ( github.com/onsi/gomega v1.8.1 // indirect golang.org/x/sys v0.0.0-20190322080309-f49334f85ddc // indirect gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect - k8s.io/klog v1.0.0 + k8s.io/klog/v2 v2.2.0 ) replace ( diff --git a/staging/src/github.com/kubeedge/viaduct/go.sum b/staging/src/github.com/kubeedge/viaduct/go.sum index f40b74ab8..b67c5f069 100644 --- a/staging/src/github.com/kubeedge/viaduct/go.sum +++ b/staging/src/github.com/kubeedge/viaduct/go.sum @@ -4,7 +4,8 @@ github.com/cheekybits/genny v0.0.0-20170328200008-9127e812e1e9 h1:a1zrFsLFac2xoM github.com/cheekybits/genny v0.0.0-20170328200008-9127e812e1e9/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -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/golang/mock v0.0.0-20190508161146-9fa652df1129 h1:eDp2NN315lG5ILa4Oq1UgXZftynfJTZgxZNiejJdJLM= github.com/golang/mock v0.0.0-20190508161146-9fa652df1129/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -59,5 +60,5 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkep gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -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.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A= +k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= diff --git a/staging/src/github.com/kubeedge/viaduct/pkg/client/client.go b/staging/src/github.com/kubeedge/viaduct/pkg/client/client.go index 1f18e397d..d15047313 100644 --- a/staging/src/github.com/kubeedge/viaduct/pkg/client/client.go +++ b/staging/src/github.com/kubeedge/viaduct/pkg/client/client.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/viaduct/pkg/api" "github.com/kubeedge/viaduct/pkg/conn" diff --git a/staging/src/github.com/kubeedge/viaduct/pkg/client/quic.go b/staging/src/github.com/kubeedge/viaduct/pkg/client/quic.go index 5a8960d1b..dc44c2681 100644 --- a/staging/src/github.com/kubeedge/viaduct/pkg/client/quic.go +++ b/staging/src/github.com/kubeedge/viaduct/pkg/client/quic.go @@ -4,7 +4,7 @@ import ( "fmt" "sync" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core/model" "github.com/kubeedge/viaduct/pkg/api" diff --git a/staging/src/github.com/kubeedge/viaduct/pkg/client/ws.go b/staging/src/github.com/kubeedge/viaduct/pkg/client/ws.go index dd4d67554..3d1ce9b80 100644 --- a/staging/src/github.com/kubeedge/viaduct/pkg/client/ws.go +++ b/staging/src/github.com/kubeedge/viaduct/pkg/client/ws.go @@ -4,7 +4,7 @@ import ( "fmt" "io/ioutil" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/gorilla/websocket" "github.com/kubeedge/viaduct/pkg/api" diff --git a/staging/src/github.com/kubeedge/viaduct/pkg/conn/comm.go b/staging/src/github.com/kubeedge/viaduct/pkg/conn/comm.go index 0d0e48a03..8330df45d 100644 --- a/staging/src/github.com/kubeedge/viaduct/pkg/conn/comm.go +++ b/staging/src/github.com/kubeedge/viaduct/pkg/conn/comm.go @@ -1,7 +1,7 @@ package conn import ( - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core/model" "github.com/kubeedge/viaduct/pkg/lane" diff --git a/staging/src/github.com/kubeedge/viaduct/pkg/conn/factory.go b/staging/src/github.com/kubeedge/viaduct/pkg/conn/factory.go index dd0a70eca..7f00b58eb 100644 --- a/staging/src/github.com/kubeedge/viaduct/pkg/conn/factory.go +++ b/staging/src/github.com/kubeedge/viaduct/pkg/conn/factory.go @@ -3,7 +3,7 @@ package conn import ( "io" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/viaduct/pkg/api" "github.com/kubeedge/viaduct/pkg/mux" diff --git a/staging/src/github.com/kubeedge/viaduct/pkg/conn/quic.go b/staging/src/github.com/kubeedge/viaduct/pkg/conn/quic.go index 5ac0e5ad9..6746e8594 100644 --- a/staging/src/github.com/kubeedge/viaduct/pkg/conn/quic.go +++ b/staging/src/github.com/kubeedge/viaduct/pkg/conn/quic.go @@ -8,7 +8,7 @@ import ( "net/http" "time" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core/model" "github.com/kubeedge/viaduct/pkg/api" diff --git a/staging/src/github.com/kubeedge/viaduct/pkg/conn/ws.go b/staging/src/github.com/kubeedge/viaduct/pkg/conn/ws.go index 826333767..eb14bd55c 100644 --- a/staging/src/github.com/kubeedge/viaduct/pkg/conn/ws.go +++ b/staging/src/github.com/kubeedge/viaduct/pkg/conn/ws.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/gorilla/websocket" "github.com/kubeedge/beehive/pkg/core/model" diff --git a/staging/src/github.com/kubeedge/viaduct/pkg/fifo/msgfifo.go b/staging/src/github.com/kubeedge/viaduct/pkg/fifo/msgfifo.go index 03057434d..fe72fa97d 100644 --- a/staging/src/github.com/kubeedge/viaduct/pkg/fifo/msgfifo.go +++ b/staging/src/github.com/kubeedge/viaduct/pkg/fifo/msgfifo.go @@ -4,7 +4,7 @@ import ( "fmt" "sync" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core/model" "github.com/kubeedge/viaduct/pkg/comm" diff --git a/staging/src/github.com/kubeedge/viaduct/pkg/filter/filter.go b/staging/src/github.com/kubeedge/viaduct/pkg/filter/filter.go index 01e1dedce..510ef330e 100644 --- a/staging/src/github.com/kubeedge/viaduct/pkg/filter/filter.go +++ b/staging/src/github.com/kubeedge/viaduct/pkg/filter/filter.go @@ -1,7 +1,7 @@ package filter import ( - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core/model" ) diff --git a/staging/src/github.com/kubeedge/viaduct/pkg/keeper/synckeeper.go b/staging/src/github.com/kubeedge/viaduct/pkg/keeper/synckeeper.go index 29b0b27e1..b17143863 100644 --- a/staging/src/github.com/kubeedge/viaduct/pkg/keeper/synckeeper.go +++ b/staging/src/github.com/kubeedge/viaduct/pkg/keeper/synckeeper.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core/model" ) diff --git a/staging/src/github.com/kubeedge/viaduct/pkg/lane/lane.go b/staging/src/github.com/kubeedge/viaduct/pkg/lane/lane.go index cdeabf2f4..4a5c70dff 100644 --- a/staging/src/github.com/kubeedge/viaduct/pkg/lane/lane.go +++ b/staging/src/github.com/kubeedge/viaduct/pkg/lane/lane.go @@ -3,7 +3,7 @@ package lane import ( "time" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core/model" "github.com/kubeedge/viaduct/pkg/api" diff --git a/staging/src/github.com/kubeedge/viaduct/pkg/lane/quic.go b/staging/src/github.com/kubeedge/viaduct/pkg/lane/quic.go index db86b2bf1..3e3892a40 100644 --- a/staging/src/github.com/kubeedge/viaduct/pkg/lane/quic.go +++ b/staging/src/github.com/kubeedge/viaduct/pkg/lane/quic.go @@ -3,7 +3,7 @@ package lane import ( "time" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core/model" "github.com/kubeedge/viaduct/pkg/packer" diff --git a/staging/src/github.com/kubeedge/viaduct/pkg/lane/ws.go b/staging/src/github.com/kubeedge/viaduct/pkg/lane/ws.go index 72e50726c..9ce9abb73 100644 --- a/staging/src/github.com/kubeedge/viaduct/pkg/lane/ws.go +++ b/staging/src/github.com/kubeedge/viaduct/pkg/lane/ws.go @@ -4,7 +4,7 @@ import ( "io" "time" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/gorilla/websocket" "github.com/kubeedge/beehive/pkg/core/model" diff --git a/staging/src/github.com/kubeedge/viaduct/pkg/lane/wsnopack.go b/staging/src/github.com/kubeedge/viaduct/pkg/lane/wsnopack.go index e5fd49620..c76f69e61 100644 --- a/staging/src/github.com/kubeedge/viaduct/pkg/lane/wsnopack.go +++ b/staging/src/github.com/kubeedge/viaduct/pkg/lane/wsnopack.go @@ -4,7 +4,7 @@ import ( "io" "time" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/gorilla/websocket" "github.com/kubeedge/beehive/pkg/core/model" diff --git a/staging/src/github.com/kubeedge/viaduct/pkg/mux/expr.go b/staging/src/github.com/kubeedge/viaduct/pkg/mux/expr.go index a0f30f47b..3b70bfc93 100644 --- a/staging/src/github.com/kubeedge/viaduct/pkg/mux/expr.go +++ b/staging/src/github.com/kubeedge/viaduct/pkg/mux/expr.go @@ -6,7 +6,7 @@ import ( "regexp" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" ) type MessageExpression struct { diff --git a/staging/src/github.com/kubeedge/viaduct/pkg/mux/pattern.go b/staging/src/github.com/kubeedge/viaduct/pkg/mux/pattern.go index b71575f98..c4bc4f4fb 100644 --- a/staging/src/github.com/kubeedge/viaduct/pkg/mux/pattern.go +++ b/staging/src/github.com/kubeedge/viaduct/pkg/mux/pattern.go @@ -3,7 +3,7 @@ package mux import ( "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core/model" ) diff --git a/staging/src/github.com/kubeedge/viaduct/pkg/packer/reader.go b/staging/src/github.com/kubeedge/viaduct/pkg/packer/reader.go index 0347c8845..ce68d9081 100644 --- a/staging/src/github.com/kubeedge/viaduct/pkg/packer/reader.go +++ b/staging/src/github.com/kubeedge/viaduct/pkg/packer/reader.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "k8s.io/klog" + "k8s.io/klog/v2" ) type Reader struct { diff --git a/staging/src/github.com/kubeedge/viaduct/pkg/packer/writer.go b/staging/src/github.com/kubeedge/viaduct/pkg/packer/writer.go index 467e6f28a..d3fc1b6e5 100644 --- a/staging/src/github.com/kubeedge/viaduct/pkg/packer/writer.go +++ b/staging/src/github.com/kubeedge/viaduct/pkg/packer/writer.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "k8s.io/klog" + "k8s.io/klog/v2" ) type Writer struct { diff --git a/staging/src/github.com/kubeedge/viaduct/pkg/server/quic.go b/staging/src/github.com/kubeedge/viaduct/pkg/server/quic.go index bb9532f48..edd2ab44c 100644 --- a/staging/src/github.com/kubeedge/viaduct/pkg/server/quic.go +++ b/staging/src/github.com/kubeedge/viaduct/pkg/server/quic.go @@ -6,7 +6,7 @@ import ( "net/http" "sync" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core/model" "github.com/kubeedge/viaduct/pkg/api" diff --git a/staging/src/github.com/kubeedge/viaduct/pkg/server/ws.go b/staging/src/github.com/kubeedge/viaduct/pkg/server/ws.go index 1c0811688..f4d8d89b7 100644 --- a/staging/src/github.com/kubeedge/viaduct/pkg/server/ws.go +++ b/staging/src/github.com/kubeedge/viaduct/pkg/server/ws.go @@ -6,7 +6,7 @@ import ( "os" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/gorilla/websocket" "github.com/kubeedge/viaduct/pkg/api" diff --git a/staging/src/github.com/kubeedge/viaduct/pkg/smgr/session.go b/staging/src/github.com/kubeedge/viaduct/pkg/smgr/session.go index f526275e5..efecf4b95 100644 --- a/staging/src/github.com/kubeedge/viaduct/pkg/smgr/session.go +++ b/staging/src/github.com/kubeedge/viaduct/pkg/smgr/session.go @@ -3,7 +3,7 @@ package smgr import ( "io" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/viaduct/pkg/api" "github.com/lucas-clemente/quic-go" diff --git a/staging/src/github.com/kubeedge/viaduct/pkg/smgr/smgr.go b/staging/src/github.com/kubeedge/viaduct/pkg/smgr/smgr.go index dd8da8b48..186f08e9e 100644 --- a/staging/src/github.com/kubeedge/viaduct/pkg/smgr/smgr.go +++ b/staging/src/github.com/kubeedge/viaduct/pkg/smgr/smgr.go @@ -4,7 +4,7 @@ import ( "fmt" "sync" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/viaduct/pkg/api" "github.com/kubeedge/viaduct/pkg/comm" diff --git a/staging/src/github.com/kubeedge/viaduct/pkg/translator/message.go b/staging/src/github.com/kubeedge/viaduct/pkg/translator/message.go index 78b8034b4..10841b548 100644 --- a/staging/src/github.com/kubeedge/viaduct/pkg/translator/message.go +++ b/staging/src/github.com/kubeedge/viaduct/pkg/translator/message.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/golang/protobuf/proto" "github.com/kubeedge/beehive/pkg/core/model" diff --git a/staging/src/github.com/kubeedge/viaduct/pkg/utils/utils.go b/staging/src/github.com/kubeedge/viaduct/pkg/utils/utils.go index 6663bc261..1954a1087 100644 --- a/staging/src/github.com/kubeedge/viaduct/pkg/utils/utils.go +++ b/staging/src/github.com/kubeedge/viaduct/pkg/utils/utils.go @@ -4,7 +4,7 @@ import ( "encoding/json" "net/http" - "k8s.io/klog" + "k8s.io/klog/v2" ) func DeepCopyHeader(header http.Header) http.Header { diff --git a/tests/stubs/cloud/controllerstub/downstream.go b/tests/stubs/cloud/controllerstub/downstream.go index ad620f201..788fce2d3 100644 --- a/tests/stubs/cloud/controllerstub/downstream.go +++ b/tests/stubs/cloud/controllerstub/downstream.go @@ -17,7 +17,7 @@ limitations under the License. package controllerstub import ( - "k8s.io/klog" + "k8s.io/klog/v2" beehiveContext "github.com/kubeedge/beehive/pkg/core/context" "github.com/kubeedge/kubeedge/tests/stubs/common/constants" diff --git a/tests/stubs/cloud/controllerstub/module.go b/tests/stubs/cloud/controllerstub/module.go index 8546db239..1e3c419fe 100644 --- a/tests/stubs/cloud/controllerstub/module.go +++ b/tests/stubs/cloud/controllerstub/module.go @@ -19,7 +19,7 @@ package controllerstub import ( "net/http" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core" "github.com/kubeedge/kubeedge/tests/stubs/common/constants" diff --git a/tests/stubs/cloud/controllerstub/podmanager.go b/tests/stubs/cloud/controllerstub/podmanager.go index 5c21fb515..1d73fa59d 100644 --- a/tests/stubs/cloud/controllerstub/podmanager.go +++ b/tests/stubs/cloud/controllerstub/podmanager.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core/model" "github.com/kubeedge/kubeedge/tests/stubs/common/constants" diff --git a/tests/stubs/cloud/controllerstub/upstream.go b/tests/stubs/cloud/controllerstub/upstream.go index 63559c4d7..6cf418a81 100644 --- a/tests/stubs/cloud/controllerstub/upstream.go +++ b/tests/stubs/cloud/controllerstub/upstream.go @@ -19,7 +19,7 @@ package controllerstub import ( "encoding/json" - "k8s.io/klog" + "k8s.io/klog/v2" beehiveContext "github.com/kubeedge/beehive/pkg/core/context" "github.com/kubeedge/beehive/pkg/core/model" diff --git a/tests/stubs/devices/mockserver.go b/tests/stubs/devices/mockserver.go index d799e5370..b718928df 100644 --- a/tests/stubs/devices/mockserver.go +++ b/tests/stubs/devices/mockserver.go @@ -10,7 +10,7 @@ import ( "github.com/paypal/gatt" "github.com/paypal/gatt/examples/option" "github.com/paypal/gatt/examples/service" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/tests/stubs/devices/services" ) diff --git a/tests/stubs/edge/handlerstub/message.go b/tests/stubs/edge/handlerstub/message.go index 5fcc00438..00550fe89 100644 --- a/tests/stubs/edge/handlerstub/message.go +++ b/tests/stubs/edge/handlerstub/message.go @@ -19,7 +19,7 @@ package handlerstub import ( "encoding/json" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/common/util" beehiveContext "github.com/kubeedge/beehive/pkg/core/context" diff --git a/tests/stubs/edge/handlerstub/module.go b/tests/stubs/edge/handlerstub/module.go index 54724c7a5..728699483 100644 --- a/tests/stubs/edge/handlerstub/module.go +++ b/tests/stubs/edge/handlerstub/module.go @@ -17,7 +17,7 @@ limitations under the License. package handlerstub import ( - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core" "github.com/kubeedge/kubeedge/tests/stubs/common/constants" diff --git a/tests/stubs/edge/handlerstub/upstream.go b/tests/stubs/edge/handlerstub/upstream.go index fb2606b28..8cac60aad 100644 --- a/tests/stubs/edge/handlerstub/upstream.go +++ b/tests/stubs/edge/handlerstub/upstream.go @@ -19,7 +19,7 @@ package handlerstub import ( "time" - "k8s.io/klog" + "k8s.io/klog/v2" beehiveContext "github.com/kubeedge/beehive/pkg/core/context" "github.com/kubeedge/beehive/pkg/core/model" diff --git a/tests/stubs/example/main.go b/tests/stubs/example/main.go index ee16351ee..49e874647 100644 --- a/tests/stubs/example/main.go +++ b/tests/stubs/example/main.go @@ -26,7 +26,7 @@ import ( "time" "github.com/spf13/pflag" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubeedge/kubeedge/tests/stubs/common/constants" "github.com/kubeedge/kubeedge/tests/stubs/common/types" diff --git a/vendor/k8s.io/klog/.travis.yml b/vendor/k8s.io/klog/.travis.yml deleted file mode 100644 index 5677664c2..000000000 --- a/vendor/k8s.io/klog/.travis.yml +++ /dev/null @@ -1,16 +0,0 @@ -language: go -go_import_path: k8s.io/klog -dist: xenial -go: - - 1.9.x - - 1.10.x - - 1.11.x - - 1.12.x -script: - - go get -t -v ./... - - diff -u <(echo -n) <(gofmt -d .) - - diff -u <(echo -n) <(golint $(go list -e ./...)) - - go tool vet . || go vet . - - go test -v -race ./... -install: - - go get golang.org/x/lint/golint diff --git a/vendor/k8s.io/klog/CONTRIBUTING.md b/vendor/k8s.io/klog/CONTRIBUTING.md deleted file mode 100644 index 574a56abb..000000000 --- a/vendor/k8s.io/klog/CONTRIBUTING.md +++ /dev/null @@ -1,22 +0,0 @@ -# Contributing Guidelines - -Welcome to Kubernetes. We are excited about the prospect of you joining our [community](https://github.com/kubernetes/community)! The Kubernetes community abides by the CNCF [code of conduct](code-of-conduct.md). Here is an excerpt: - -_As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities._ - -## Getting Started - -We have full documentation on how to get started contributing here: - -- [Contributor License Agreement](https://git.k8s.io/community/CLA.md) Kubernetes projects require that you sign a Contributor License Agreement (CLA) before we can accept your pull requests -- [Kubernetes Contributor Guide](http://git.k8s.io/community/contributors/guide) - Main contributor documentation, or you can just jump directly to the [contributing section](http://git.k8s.io/community/contributors/guide#contributing) -- [Contributor Cheat Sheet](https://git.k8s.io/community/contributors/guide/contributor-cheatsheet.md) - Common resources for existing developers - -## Mentorship - -- [Mentoring Initiatives](https://git.k8s.io/community/mentoring) - We have a diverse set of mentorship programs available that are always looking for volunteers! - -## Contact Information - -- [Slack](https://kubernetes.slack.com/messages/sig-architecture) -- [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-architecture) diff --git a/vendor/k8s.io/klog/LICENSE b/vendor/k8s.io/klog/LICENSE deleted file mode 100644 index 37ec93a14..000000000 --- a/vendor/k8s.io/klog/LICENSE +++ /dev/null @@ -1,191 +0,0 @@ -Apache License -Version 2.0, January 2004 -http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - -"License" shall mean the terms and conditions for use, reproduction, and -distribution as defined by Sections 1 through 9 of this document. - -"Licensor" shall mean the copyright owner or entity authorized by the copyright -owner that is granting the License. - -"Legal Entity" shall mean the union of the acting entity and all other entities -that control, are controlled by, or are under common control with that entity. -For the purposes of this definition, "control" means (i) the power, direct or -indirect, to cause the direction or management of such entity, whether by -contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the -outstanding shares, or (iii) beneficial ownership of such entity. - -"You" (or "Your") shall mean an individual or Legal Entity exercising -permissions granted by this License. - -"Source" form shall mean the preferred form for making modifications, including -but not limited to software source code, documentation source, and configuration -files. - -"Object" form shall mean any form resulting from mechanical transformation or -translation of a Source form, including but not limited to compiled object code, -generated documentation, and conversions to other media types. - -"Work" shall mean the work of authorship, whether in Source or Object form, made -available under the License, as indicated by a copyright notice that is included -in or attached to the work (an example is provided in the Appendix below). - -"Derivative Works" shall mean any work, whether in Source or Object form, that -is based on (or derived from) the Work and for which the editorial revisions, -annotations, elaborations, or other modifications represent, as a whole, an -original work of authorship. For the purposes of this License, Derivative Works -shall not include works that remain separable from, or merely link (or bind by -name) to the interfaces of, the Work and Derivative Works thereof. - -"Contribution" shall mean any work of authorship, including the original version -of the Work and any modifications or additions to that Work or Derivative Works -thereof, that is intentionally submitted to Licensor for inclusion in the Work -by the copyright owner or by an individual or Legal Entity authorized to submit -on behalf of the copyright owner. For the purposes of this definition, -"submitted" means any form of electronic, verbal, or written communication sent -to the Licensor or its representatives, including but not limited to -communication on electronic mailing lists, source code control systems, and -issue tracking systems that are managed by, or on behalf of, the Licensor for -the purpose of discussing and improving the Work, but excluding communication -that is conspicuously marked or otherwise designated in writing by the copyright -owner as "Not a Contribution." - -"Contributor" shall mean Licensor and any individual or Legal Entity on behalf -of whom a Contribution has been received by Licensor and subsequently -incorporated within the Work. - -2. Grant of Copyright License. - -Subject to the terms and conditions of this License, each Contributor hereby -grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, -irrevocable copyright license to reproduce, prepare Derivative Works of, -publicly display, publicly perform, sublicense, and distribute the Work and such -Derivative Works in Source or Object form. - -3. Grant of Patent License. - -Subject to the terms and conditions of this License, each Contributor hereby -grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, -irrevocable (except as stated in this section) patent license to make, have -made, use, offer to sell, sell, import, and otherwise transfer the Work, where -such license applies only to those patent claims licensable by such Contributor -that are necessarily infringed by their Contribution(s) alone or by combination -of their Contribution(s) with the Work to which such Contribution(s) was -submitted. If You institute patent litigation against any entity (including a -cross-claim or counterclaim in a lawsuit) alleging that the Work or a -Contribution incorporated within the Work constitutes direct or contributory -patent infringement, then any patent licenses granted to You under this License -for that Work shall terminate as of the date such litigation is filed. - -4. Redistribution. - -You may reproduce and distribute copies of the Work or Derivative Works thereof -in any medium, with or without modifications, and in Source or Object form, -provided that You meet the following conditions: - -You must give any other recipients of the Work or Derivative Works a copy of -this License; and -You must cause any modified files to carry prominent notices stating that You -changed the files; and -You must retain, in the Source form of any Derivative Works that You distribute, -all copyright, patent, trademark, and attribution notices from the Source form -of the Work, excluding those notices that do not pertain to any part of the -Derivative Works; and -If the Work includes a "NOTICE" text file as part of its distribution, then any -Derivative Works that You distribute must include a readable copy of the -attribution notices contained within such NOTICE file, excluding those notices -that do not pertain to any part of the Derivative Works, in at least one of the -following places: within a NOTICE text file distributed as part of the -Derivative Works; within the Source form or documentation, if provided along -with the Derivative Works; or, within a display generated by the Derivative -Works, if and wherever such third-party notices normally appear. The contents of -the NOTICE file are for informational purposes only and do not modify the -License. You may add Your own attribution notices within Derivative Works that -You distribute, alongside or as an addendum to the NOTICE text from the Work, -provided that such additional attribution notices cannot be construed as -modifying the License. -You may add Your own copyright statement to Your modifications and may provide -additional or different license terms and conditions for use, reproduction, or -distribution of Your modifications, or for any such Derivative Works as a whole, -provided Your use, reproduction, and distribution of the Work otherwise complies -with the conditions stated in this License. - -5. Submission of Contributions. - -Unless You explicitly state otherwise, any Contribution intentionally submitted -for inclusion in the Work by You to the Licensor shall be under the terms and -conditions of this License, without any additional terms or conditions. -Notwithstanding the above, nothing herein shall supersede or modify the terms of -any separate license agreement you may have executed with Licensor regarding -such Contributions. - -6. Trademarks. - -This License does not grant permission to use the trade names, trademarks, -service marks, or product names of the Licensor, except as required for -reasonable and customary use in describing the origin of the Work and -reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. - -Unless required by applicable law or agreed to in writing, Licensor provides the -Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, -including, without limitation, any warranties or conditions of TITLE, -NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are -solely responsible for determining the appropriateness of using or -redistributing the Work and assume any risks associated with Your exercise of -permissions under this License. - -8. Limitation of Liability. - -In no event and under no legal theory, whether in tort (including negligence), -contract, or otherwise, unless required by applicable law (such as deliberate -and grossly negligent acts) or agreed to in writing, shall any Contributor be -liable to You for damages, including any direct, indirect, special, incidental, -or consequential damages of any character arising as a result of this License or -out of the use or inability to use the Work (including but not limited to -damages for loss of goodwill, work stoppage, computer failure or malfunction, or -any and all other commercial damages or losses), even if such Contributor has -been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. - -While redistributing the Work or Derivative Works thereof, You may choose to -offer, and charge a fee for, acceptance of support, warranty, indemnity, or -other liability obligations and/or rights consistent with this License. However, -in accepting such obligations, You may act only on Your own behalf and on Your -sole responsibility, not on behalf of any other Contributor, and only if You -agree to indemnify, defend, and hold each Contributor harmless for any liability -incurred by, or claims asserted against, such Contributor by reason of your -accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work - -To apply the Apache License to your work, attach the following boilerplate -notice, with the fields enclosed by brackets "[]" replaced with your own -identifying information. (Don't include the brackets!) The text should be -enclosed in the appropriate comment syntax for the file format. We also -recommend that a file or class name and description of purpose be included on -the same "printed page" as the copyright notice for easier identification within -third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/vendor/k8s.io/klog/OWNERS b/vendor/k8s.io/klog/OWNERS deleted file mode 100644 index 380e514f2..000000000 --- a/vendor/k8s.io/klog/OWNERS +++ /dev/null @@ -1,19 +0,0 @@ -# See the OWNERS docs at https://go.k8s.io/owners -reviewers: - - jayunit100 - - hoegaarden - - andyxning - - neolit123 - - pohly - - yagonobre - - vincepri - - detiber -approvers: - - dims - - thockin - - justinsb - - tallclair - - piosz - - brancz - - DirectXMan12 - - lavalamp diff --git a/vendor/k8s.io/klog/README.md b/vendor/k8s.io/klog/README.md deleted file mode 100644 index 841468b4b..000000000 --- a/vendor/k8s.io/klog/README.md +++ /dev/null @@ -1,97 +0,0 @@ -klog -==== - -klog is a permanent fork of https://github.com/golang/glog. - -## Why was klog created? - -The decision to create klog was one that wasn't made lightly, but it was necessary due to some -drawbacks that are present in [glog](https://github.com/golang/glog). Ultimately, the fork was created due to glog not being under active development; this can be seen in the glog README: - -> The code in this repo [...] is not itself under development - -This makes us unable to solve many use cases without a fork. The factors that contributed to needing feature development are listed below: - - * `glog` [presents a lot "gotchas"](https://github.com/kubernetes/kubernetes/issues/61006) and introduces challenges in containerized environments, all of which aren't well documented. - * `glog` doesn't provide an easy way to test logs, which detracts from the stability of software using it - * A long term goal is to implement a logging interface that allows us to add context, change output format, etc. - -Historical context is available here: - - * https://github.com/kubernetes/kubernetes/issues/61006 - * https://github.com/kubernetes/kubernetes/issues/70264 - * https://groups.google.com/forum/#!msg/kubernetes-sig-architecture/wCWiWf3Juzs/hXRVBH90CgAJ - * https://groups.google.com/forum/#!msg/kubernetes-dev/7vnijOMhLS0/1oRiNtigBgAJ - ----- - -How to use klog -=============== -- Replace imports for `github.com/golang/glog` with `k8s.io/klog` -- Use `klog.InitFlags(nil)` explicitly for initializing global flags as we no longer use `init()` method to register the flags -- You can now use `log-file` instead of `log-dir` for logging to a single file (See `examples/log_file/usage_log_file.go`) -- If you want to redirect everything logged using klog somewhere else (say syslog!), you can use `klog.SetOutput()` method and supply a `io.Writer`. (See `examples/set_output/usage_set_output.go`) -- For more logging conventions (See [Logging Conventions](https://github.com/kubernetes/community/blob/master/contributors/devel/sig-instrumentation/logging.md)) - -### Coexisting with glog -This package can be used side by side with glog. [This example](examples/coexist_glog/coexist_glog.go) shows how to initialize and syncronize flags from the global `flag.CommandLine` FlagSet. In addition, the example makes use of stderr as combined output by setting `alsologtostderr` (or `logtostderr`) to `true`. - -## Community, discussion, contribution, and support - -Learn how to engage with the Kubernetes community on the [community page](http://kubernetes.io/community/). - -You can reach the maintainers of this project at: - -- [Slack](https://kubernetes.slack.com/messages/sig-architecture) -- [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-architecture) - -### Code of conduct - -Participation in the Kubernetes community is governed by the [Kubernetes Code of Conduct](code-of-conduct.md). - ----- - -glog -==== - -Leveled execution logs for Go. - -This is an efficient pure Go implementation of leveled logs in the -manner of the open source C++ package - https://github.com/google/glog - -By binding methods to booleans it is possible to use the log package -without paying the expense of evaluating the arguments to the log. -Through the -vmodule flag, the package also provides fine-grained -control over logging at the file level. - -The comment from glog.go introduces the ideas: - - Package glog implements logging analogous to the Google-internal - C++ INFO/ERROR/V setup. It provides functions Info, Warning, - Error, Fatal, plus formatting variants such as Infof. It - also provides V-style logging controlled by the -v and - -vmodule=file=2 flags. - - Basic examples: - - glog.Info("Prepare to repel boarders") - - glog.Fatalf("Initialization failed: %s", err) - - See the documentation for the V function for an explanation - of these examples: - - if glog.V(2) { - glog.Info("Starting transaction...") - } - - glog.V(2).Infoln("Processed", nItems, "elements") - - -The repository contains an open source version of the log package -used inside Google. The master copy of the source lives inside -Google, not here. The code in this repo is for export only and is not itself -under development. Feature requests will be ignored. - -Send bug reports to golang-nuts@googlegroups.com. diff --git a/vendor/k8s.io/klog/RELEASE.md b/vendor/k8s.io/klog/RELEASE.md deleted file mode 100644 index b53eb960c..000000000 --- a/vendor/k8s.io/klog/RELEASE.md +++ /dev/null @@ -1,9 +0,0 @@ -# Release Process - -The `klog` is released on an as-needed basis. The process is as follows: - -1. An issue is proposing a new release with a changelog since the last release -1. All [OWNERS](OWNERS) must LGTM this release -1. An OWNER runs `git tag -s $VERSION` and inserts the changelog and pushes the tag with `git push $VERSION` -1. The release issue is closed -1. An announcement email is sent to `kubernetes-dev@googlegroups.com` with the subject `[ANNOUNCE] kubernetes-template-project $VERSION is released` diff --git a/vendor/k8s.io/klog/SECURITY_CONTACTS b/vendor/k8s.io/klog/SECURITY_CONTACTS deleted file mode 100644 index 6128a5869..000000000 --- a/vendor/k8s.io/klog/SECURITY_CONTACTS +++ /dev/null @@ -1,20 +0,0 @@ -# Defined below are the security contacts for this repo. -# -# They are the contact point for the Product Security Committee to reach out -# to for triaging and handling of incoming issues. -# -# The below names agree to abide by the -# [Embargo Policy](https://git.k8s.io/security/private-distributors-list.md#embargo-policy) -# and will be removed and replaced if they violate that agreement. -# -# DO NOT REPORT SECURITY VULNERABILITIES DIRECTLY TO THESE NAMES, FOLLOW THE -# INSTRUCTIONS AT https://kubernetes.io/security/ - -dims -thockin -justinsb -tallclair -piosz -brancz -DirectXMan12 -lavalamp diff --git a/vendor/k8s.io/klog/code-of-conduct.md b/vendor/k8s.io/klog/code-of-conduct.md deleted file mode 100644 index 0d15c00cf..000000000 --- a/vendor/k8s.io/klog/code-of-conduct.md +++ /dev/null @@ -1,3 +0,0 @@ -# Kubernetes Community Code of Conduct - -Please refer to our [Kubernetes Community Code of Conduct](https://git.k8s.io/community/code-of-conduct.md) diff --git a/vendor/k8s.io/klog/go.mod b/vendor/k8s.io/klog/go.mod deleted file mode 100644 index 3877d8546..000000000 --- a/vendor/k8s.io/klog/go.mod +++ /dev/null @@ -1,5 +0,0 @@ -module k8s.io/klog - -go 1.12 - -require github.com/go-logr/logr v0.1.0 diff --git a/vendor/k8s.io/klog/go.sum b/vendor/k8s.io/klog/go.sum deleted file mode 100644 index fb64d277a..000000000 --- a/vendor/k8s.io/klog/go.sum +++ /dev/null @@ -1,2 +0,0 @@ -github.com/go-logr/logr v0.1.0 h1:M1Tv3VzNlEHg6uyACnRdtrploV2P7wZqH8BoQMtz0cg= -github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= diff --git a/vendor/k8s.io/klog/klog.go b/vendor/k8s.io/klog/klog.go deleted file mode 100644 index 2520ebdaa..000000000 --- a/vendor/k8s.io/klog/klog.go +++ /dev/null @@ -1,1316 +0,0 @@ -// Go support for leveled logs, analogous to https://code.google.com/p/google-glog/ -// -// Copyright 2013 Google Inc. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// Package klog implements logging analogous to the Google-internal C++ INFO/ERROR/V setup. -// It provides functions Info, Warning, Error, Fatal, plus formatting variants such as -// Infof. It also provides V-style logging controlled by the -v and -vmodule=file=2 flags. -// -// Basic examples: -// -// klog.Info("Prepare to repel boarders") -// -// klog.Fatalf("Initialization failed: %s", err) -// -// See the documentation for the V function for an explanation of these examples: -// -// if klog.V(2) { -// klog.Info("Starting transaction...") -// } -// -// klog.V(2).Infoln("Processed", nItems, "elements") -// -// Log output is buffered and written periodically using Flush. Programs -// should call Flush before exiting to guarantee all log output is written. -// -// By default, all log statements write to standard error. -// This package provides several flags that modify this behavior. -// As a result, flag.Parse must be called before any logging is done. -// -// -logtostderr=true -// Logs are written to standard error instead of to files. -// -alsologtostderr=false -// Logs are written to standard error as well as to files. -// -stderrthreshold=ERROR -// Log events at or above this severity are logged to standard -// error as well as to files. -// -log_dir="" -// Log files will be written to this directory instead of the -// default temporary directory. -// -// Other flags provide aids to debugging. -// -// -log_backtrace_at="" -// When set to a file and line number holding a logging statement, -// such as -// -log_backtrace_at=gopherflakes.go:234 -// a stack trace will be written to the Info log whenever execution -// hits that statement. (Unlike with -vmodule, the ".go" must be -// present.) -// -v=0 -// Enable V-leveled logging at the specified level. -// -vmodule="" -// The syntax of the argument is a comma-separated list of pattern=N, -// where pattern is a literal file name (minus the ".go" suffix) or -// "glob" pattern and N is a V level. For instance, -// -vmodule=gopher*=3 -// sets the V level to 3 in all Go files whose names begin "gopher". -// -package klog - -import ( - "bufio" - "bytes" - "errors" - "flag" - "fmt" - "io" - stdLog "log" - "math" - "os" - "path/filepath" - "runtime" - "strconv" - "strings" - "sync" - "sync/atomic" - "time" -) - -// severity identifies the sort of log: info, warning etc. It also implements -// the flag.Value interface. The -stderrthreshold flag is of type severity and -// should be modified only through the flag.Value interface. The values match -// the corresponding constants in C++. -type severity int32 // sync/atomic int32 - -// These constants identify the log levels in order of increasing severity. -// A message written to a high-severity log file is also written to each -// lower-severity log file. -const ( - infoLog severity = iota - warningLog - errorLog - fatalLog - numSeverity = 4 -) - -const severityChar = "IWEF" - -var severityName = []string{ - infoLog: "INFO", - warningLog: "WARNING", - errorLog: "ERROR", - fatalLog: "FATAL", -} - -// get returns the value of the severity. -func (s *severity) get() severity { - return severity(atomic.LoadInt32((*int32)(s))) -} - -// set sets the value of the severity. -func (s *severity) set(val severity) { - atomic.StoreInt32((*int32)(s), int32(val)) -} - -// String is part of the flag.Value interface. -func (s *severity) String() string { - return strconv.FormatInt(int64(*s), 10) -} - -// Get is part of the flag.Value interface. -func (s *severity) Get() interface{} { - return *s -} - -// Set is part of the flag.Value interface. -func (s *severity) Set(value string) error { - var threshold severity - // Is it a known name? - if v, ok := severityByName(value); ok { - threshold = v - } else { - v, err := strconv.Atoi(value) - if err != nil { - return err - } - threshold = severity(v) - } - logging.stderrThreshold.set(threshold) - return nil -} - -func severityByName(s string) (severity, bool) { - s = strings.ToUpper(s) - for i, name := range severityName { - if name == s { - return severity(i), true - } - } - return 0, false -} - -// OutputStats tracks the number of output lines and bytes written. -type OutputStats struct { - lines int64 - bytes int64 -} - -// Lines returns the number of lines written. -func (s *OutputStats) Lines() int64 { - return atomic.LoadInt64(&s.lines) -} - -// Bytes returns the number of bytes written. -func (s *OutputStats) Bytes() int64 { - return atomic.LoadInt64(&s.bytes) -} - -// Stats tracks the number of lines of output and number of bytes -// per severity level. Values must be read with atomic.LoadInt64. -var Stats struct { - Info, Warning, Error OutputStats -} - -var severityStats = [numSeverity]*OutputStats{ - infoLog: &Stats.Info, - warningLog: &Stats.Warning, - errorLog: &Stats.Error, -} - -// Level is exported because it appears in the arguments to V and is -// the type of the v flag, which can be set programmatically. -// It's a distinct type because we want to discriminate it from logType. -// Variables of type level are only changed under logging.mu. -// The -v flag is read only with atomic ops, so the state of the logging -// module is consistent. - -// Level is treated as a sync/atomic int32. - -// Level specifies a level of verbosity for V logs. *Level implements -// flag.Value; the -v flag is of type Level and should be modified -// only through the flag.Value interface. -type Level int32 - -// get returns the value of the Level. -func (l *Level) get() Level { - return Level(atomic.LoadInt32((*int32)(l))) -} - -// set sets the value of the Level. -func (l *Level) set(val Level) { - atomic.StoreInt32((*int32)(l), int32(val)) -} - -// String is part of the flag.Value interface. -func (l *Level) String() string { - return strconv.FormatInt(int64(*l), 10) -} - -// Get is part of the flag.Value interface. -func (l *Level) Get() interface{} { - return *l -} - -// Set is part of the flag.Value interface. -func (l *Level) Set(value string) error { - v, err := strconv.Atoi(value) - if err != nil { - return err - } - logging.mu.Lock() - defer logging.mu.Unlock() - logging.setVState(Level(v), logging.vmodule.filter, false) - return nil -} - -// moduleSpec represents the setting of the -vmodule flag. -type moduleSpec struct { - filter []modulePat -} - -// modulePat contains a filter for the -vmodule flag. -// It holds a verbosity level and a file pattern to match. -type modulePat struct { - pattern string - literal bool // The pattern is a literal string - level Level -} - -// match reports whether the file matches the pattern. It uses a string -// comparison if the pattern contains no metacharacters. -func (m *modulePat) match(file string) bool { - if m.literal { - return file == m.pattern - } - match, _ := filepath.Match(m.pattern, file) - return match -} - -func (m *moduleSpec) String() string { - // Lock because the type is not atomic. TODO: clean this up. - logging.mu.Lock() - defer logging.mu.Unlock() - var b bytes.Buffer - for i, f := range m.filter { - if i > 0 { - b.WriteRune(',') - } - fmt.Fprintf(&b, "%s=%d", f.pattern, f.level) - } - return b.String() -} - -// Get is part of the (Go 1.2) flag.Getter interface. It always returns nil for this flag type since the -// struct is not exported. -func (m *moduleSpec) Get() interface{} { - return nil -} - -var errVmoduleSyntax = errors.New("syntax error: expect comma-separated list of filename=N") - -// Syntax: -vmodule=recordio=2,file=1,gfs*=3 -func (m *moduleSpec) Set(value string) error { - var filter []modulePat - for _, pat := range strings.Split(value, ",") { - if len(pat) == 0 { - // Empty strings such as from a trailing comma can be ignored. - continue - } - patLev := strings.Split(pat, "=") - if len(patLev) != 2 || len(patLev[0]) == 0 || len(patLev[1]) == 0 { - return errVmoduleSyntax - } - pattern := patLev[0] - v, err := strconv.Atoi(patLev[1]) - if err != nil { - return errors.New("syntax error: expect comma-separated list of filename=N") - } - if v < 0 { - return errors.New("negative value for vmodule level") - } - if v == 0 { - continue // Ignore. It's harmless but no point in paying the overhead. - } - // TODO: check syntax of filter? - filter = append(filter, modulePat{pattern, isLiteral(pattern), Level(v)}) - } - logging.mu.Lock() - defer logging.mu.Unlock() - logging.setVState(logging.verbosity, filter, true) - return nil -} - -// isLiteral reports whether the pattern is a literal string, that is, has no metacharacters -// that require filepath.Match to be called to match the pattern. -func isLiteral(pattern string) bool { - return !strings.ContainsAny(pattern, `\*?[]`) -} - -// traceLocation represents the setting of the -log_backtrace_at flag. -type traceLocation struct { - file string - line int -} - -// isSet reports whether the trace location has been specified. -// logging.mu is held. -func (t *traceLocation) isSet() bool { - return t.line > 0 -} - -// match reports whether the specified file and line matches the trace location. -// The argument file name is the full path, not the basename specified in the flag. -// logging.mu is held. -func (t *traceLocation) match(file string, line int) bool { - if t.line != line { - return false - } - if i := strings.LastIndex(file, "/"); i >= 0 { - file = file[i+1:] - } - return t.file == file -} - -func (t *traceLocation) String() string { - // Lock because the type is not atomic. TODO: clean this up. - logging.mu.Lock() - defer logging.mu.Unlock() - return fmt.Sprintf("%s:%d", t.file, t.line) -} - -// Get is part of the (Go 1.2) flag.Getter interface. It always returns nil for this flag type since the -// struct is not exported -func (t *traceLocation) Get() interface{} { - return nil -} - -var errTraceSyntax = errors.New("syntax error: expect file.go:234") - -// Syntax: -log_backtrace_at=gopherflakes.go:234 -// Note that unlike vmodule the file extension is included here. -func (t *traceLocation) Set(value string) error { - if value == "" { - // Unset. - t.line = 0 - t.file = "" - } - fields := strings.Split(value, ":") - if len(fields) != 2 { - return errTraceSyntax - } - file, line := fields[0], fields[1] - if !strings.Contains(file, ".") { - return errTraceSyntax - } - v, err := strconv.Atoi(line) - if err != nil { - return errTraceSyntax - } - if v <= 0 { - return errors.New("negative or zero value for level") - } - logging.mu.Lock() - defer logging.mu.Unlock() - t.line = v - t.file = file - return nil -} - -// flushSyncWriter is the interface satisfied by logging destinations. -type flushSyncWriter interface { - Flush() error - Sync() error - io.Writer -} - -func init() { - // Default stderrThreshold is ERROR. - logging.stderrThreshold = errorLog - - logging.setVState(0, nil, false) - go logging.flushDaemon() -} - -var initDefaultsOnce sync.Once - -// InitFlags is for explicitly initializing the flags. -func InitFlags(flagset *flag.FlagSet) { - - // Initialize defaults. - initDefaultsOnce.Do(func() { - logging.logDir = "" - logging.logFile = "" - logging.logFileMaxSizeMB = 1800 - logging.toStderr = true - logging.alsoToStderr = false - logging.skipHeaders = false - logging.addDirHeader = false - logging.skipLogHeaders = false - }) - - if flagset == nil { - flagset = flag.CommandLine - } - - flagset.StringVar(&logging.logDir, "log_dir", logging.logDir, "If non-empty, write log files in this directory") - flagset.StringVar(&logging.logFile, "log_file", logging.logFile, "If non-empty, use this log file") - flagset.Uint64Var(&logging.logFileMaxSizeMB, "log_file_max_size", logging.logFileMaxSizeMB, - "Defines the maximum size a log file can grow to. Unit is megabytes. "+ - "If the value is 0, the maximum file size is unlimited.") - flagset.BoolVar(&logging.toStderr, "logtostderr", logging.toStderr, "log to standard error instead of files") - flagset.BoolVar(&logging.alsoToStderr, "alsologtostderr", logging.alsoToStderr, "log to standard error as well as files") - flagset.Var(&logging.verbosity, "v", "number for the log level verbosity") - flagset.BoolVar(&logging.skipHeaders, "add_dir_header", logging.addDirHeader, "If true, adds the file directory to the header") - flagset.BoolVar(&logging.skipHeaders, "skip_headers", logging.skipHeaders, "If true, avoid header prefixes in the log messages") - flagset.BoolVar(&logging.skipLogHeaders, "skip_log_headers", logging.skipLogHeaders, "If true, avoid headers when opening log files") - flagset.Var(&logging.stderrThreshold, "stderrthreshold", "logs at or above this threshold go to stderr") - flagset.Var(&logging.vmodule, "vmodule", "comma-separated list of pattern=N settings for file-filtered logging") - flagset.Var(&logging.traceLocation, "log_backtrace_at", "when logging hits line file:N, emit a stack trace") -} - -// Flush flushes all pending log I/O. -func Flush() { - logging.lockAndFlushAll() -} - -// loggingT collects all the global state of the logging setup. -type loggingT struct { - // Boolean flags. Not handled atomically because the flag.Value interface - // does not let us avoid the =true, and that shorthand is necessary for - // compatibility. TODO: does this matter enough to fix? Seems unlikely. - toStderr bool // The -logtostderr flag. - alsoToStderr bool // The -alsologtostderr flag. - - // Level flag. Handled atomically. - stderrThreshold severity // The -stderrthreshold flag. - - // freeList is a list of byte buffers, maintained under freeListMu. - freeList *buffer - // freeListMu maintains the free list. It is separate from the main mutex - // so buffers can be grabbed and printed to without holding the main lock, - // for better parallelization. - freeListMu sync.Mutex - - // mu protects the remaining elements of this structure and is - // used to synchronize logging. - mu sync.Mutex - // file holds writer for each of the log types. - file [numSeverity]flushSyncWriter - // pcs is used in V to avoid an allocation when computing the caller's PC. - pcs [1]uintptr - // vmap is a cache of the V Level for each V() call site, identified by PC. - // It is wiped whenever the vmodule flag changes state. - vmap map[uintptr]Level - // filterLength stores the length of the vmodule filter chain. If greater - // than zero, it means vmodule is enabled. It may be read safely - // using sync.LoadInt32, but is only modified under mu. - filterLength int32 - // traceLocation is the state of the -log_backtrace_at flag. - traceLocation traceLocation - // These flags are modified only under lock, although verbosity may be fetched - // safely using atomic.LoadInt32. - vmodule moduleSpec // The state of the -vmodule flag. - verbosity Level // V logging level, the value of the -v flag/ - - // If non-empty, overrides the choice of directory in which to write logs. - // See createLogDirs for the full list of possible destinations. - logDir string - - // If non-empty, specifies the path of the file to write logs. mutually exclusive - // with the log-dir option. - logFile string - - // When logFile is specified, this limiter makes sure the logFile won't exceeds a certain size. When exceeds, the - // logFile will be cleaned up. If this value is 0, no size limitation will be applied to logFile. - logFileMaxSizeMB uint64 - - // If true, do not add the prefix headers, useful when used with SetOutput - skipHeaders bool - - // If true, do not add the headers to log files - skipLogHeaders bool - - // If true, add the file directory to the header - addDirHeader bool -} - -// buffer holds a byte Buffer for reuse. The zero value is ready for use. -type buffer struct { - bytes.Buffer - tmp [64]byte // temporary byte array for creating headers. - next *buffer -} - -var logging loggingT - -// setVState sets a consistent state for V logging. -// l.mu is held. -func (l *loggingT) setVState(verbosity Level, filter []modulePat, setFilter bool) { - // Turn verbosity off so V will not fire while we are in transition. - logging.verbosity.set(0) - // Ditto for filter length. - atomic.StoreInt32(&logging.filterLength, 0) - - // Set the new filters and wipe the pc->Level map if the filter has changed. - if setFilter { - logging.vmodule.filter = filter - logging.vmap = make(map[uintptr]Level) - } - - // Things are consistent now, so enable filtering and verbosity. - // They are enabled in order opposite to that in V. - atomic.StoreInt32(&logging.filterLength, int32(len(filter))) - logging.verbosity.set(verbosity) -} - -// getBuffer returns a new, ready-to-use buffer. -func (l *loggingT) getBuffer() *buffer { - l.freeListMu.Lock() - b := l.freeList - if b != nil { - l.freeList = b.next - } - l.freeListMu.Unlock() - if b == nil { - b = new(buffer) - } else { - b.next = nil - b.Reset() - } - return b -} - -// putBuffer returns a buffer to the free list. -func (l *loggingT) putBuffer(b *buffer) { - if b.Len() >= 256 { - // Let big buffers die a natural death. - return - } - l.freeListMu.Lock() - b.next = l.freeList - l.freeList = b - l.freeListMu.Unlock() -} - -var timeNow = time.Now // Stubbed out for testing. - -/* -header formats a log header as defined by the C++ implementation. -It returns a buffer containing the formatted header and the user's file and line number. -The depth specifies how many stack frames above lives the source line to be identified in the log message. - -Log lines have this form: - Lmmdd hh:mm:ss.uuuuuu threadid file:line] msg... -where the fields are defined as follows: - L A single character, representing the log level (eg 'I' for INFO) - mm The month (zero padded; ie May is '05') - dd The day (zero padded) - hh:mm:ss.uuuuuu Time in hours, minutes and fractional seconds - threadid The space-padded thread ID as returned by GetTID() - file The file name - line The line number - msg The user-supplied message -*/ -func (l *loggingT) header(s severity, depth int) (*buffer, string, int) { - _, file, line, ok := runtime.Caller(3 + depth) - if !ok { - file = "???" - line = 1 - } else { - if slash := strings.LastIndex(file, "/"); slash >= 0 { - path := file - file = path[slash+1:] - if l.addDirHeader { - if dirsep := strings.LastIndex(path[:slash], "/"); dirsep >= 0 { - file = path[dirsep+1:] - } - } - } - } - return l.formatHeader(s, file, line), file, line -} - -// formatHeader formats a log header using the provided file name and line number. -func (l *loggingT) formatHeader(s severity, file string, line int) *buffer { - now := timeNow() - if line < 0 { - line = 0 // not a real line number, but acceptable to someDigits - } - if s > fatalLog { - s = infoLog // for safety. - } - buf := l.getBuffer() - if l.skipHeaders { - return buf - } - - // Avoid Fprintf, for speed. The format is so simple that we can do it quickly by hand. - // It's worth about 3X. Fprintf is hard. - _, month, day := now.Date() - hour, minute, second := now.Clock() - // Lmmdd hh:mm:ss.uuuuuu threadid file:line] - buf.tmp[0] = severityChar[s] - buf.twoDigits(1, int(month)) - buf.twoDigits(3, day) - buf.tmp[5] = ' ' - buf.twoDigits(6, hour) - buf.tmp[8] = ':' - buf.twoDigits(9, minute) - buf.tmp[11] = ':' - buf.twoDigits(12, second) - buf.tmp[14] = '.' - buf.nDigits(6, 15, now.Nanosecond()/1000, '0') - buf.tmp[21] = ' ' - buf.nDigits(7, 22, pid, ' ') // TODO: should be TID - buf.tmp[29] = ' ' - buf.Write(buf.tmp[:30]) - buf.WriteString(file) - buf.tmp[0] = ':' - n := buf.someDigits(1, line) - buf.tmp[n+1] = ']' - buf.tmp[n+2] = ' ' - buf.Write(buf.tmp[:n+3]) - return buf -} - -// Some custom tiny helper functions to print the log header efficiently. - -const digits = "0123456789" - -// twoDigits formats a zero-prefixed two-digit integer at buf.tmp[i]. -func (buf *buffer) twoDigits(i, d int) { - buf.tmp[i+1] = digits[d%10] - d /= 10 - buf.tmp[i] = digits[d%10] -} - -// nDigits formats an n-digit integer at buf.tmp[i], -// padding with pad on the left. -// It assumes d >= 0. -func (buf *buffer) nDigits(n, i, d int, pad byte) { - j := n - 1 - for ; j >= 0 && d > 0; j-- { - buf.tmp[i+j] = digits[d%10] - d /= 10 - } - for ; j >= 0; j-- { - buf.tmp[i+j] = pad - } -} - -// someDigits formats a zero-prefixed variable-width integer at buf.tmp[i]. -func (buf *buffer) someDigits(i, d int) int { - // Print into the top, then copy down. We know there's space for at least - // a 10-digit number. - j := len(buf.tmp) - for { - j-- - buf.tmp[j] = digits[d%10] - d /= 10 - if d == 0 { - break - } - } - return copy(buf.tmp[i:], buf.tmp[j:]) -} - -func (l *loggingT) println(s severity, args ...interface{}) { - buf, file, line := l.header(s, 0) - fmt.Fprintln(buf, args...) - l.output(s, buf, file, line, false) -} - -func (l *loggingT) print(s severity, args ...interface{}) { - l.printDepth(s, 1, args...) -} - -func (l *loggingT) printDepth(s severity, depth int, args ...interface{}) { - buf, file, line := l.header(s, depth) - fmt.Fprint(buf, args...) - if buf.Bytes()[buf.Len()-1] != '\n' { - buf.WriteByte('\n') - } - l.output(s, buf, file, line, false) -} - -func (l *loggingT) printf(s severity, format string, args ...interface{}) { - buf, file, line := l.header(s, 0) - fmt.Fprintf(buf, format, args...) - if buf.Bytes()[buf.Len()-1] != '\n' { - buf.WriteByte('\n') - } - l.output(s, buf, file, line, false) -} - -// printWithFileLine behaves like print but uses the provided file and line number. If -// alsoLogToStderr is true, the log message always appears on standard error; it -// will also appear in the log file unless --logtostderr is set. -func (l *loggingT) printWithFileLine(s severity, file string, line int, alsoToStderr bool, args ...interface{}) { - buf := l.formatHeader(s, file, line) - fmt.Fprint(buf, args...) - if buf.Bytes()[buf.Len()-1] != '\n' { - buf.WriteByte('\n') - } - l.output(s, buf, file, line, alsoToStderr) -} - -// redirectBuffer is used to set an alternate destination for the logs -type redirectBuffer struct { - w io.Writer -} - -func (rb *redirectBuffer) Sync() error { - return nil -} - -func (rb *redirectBuffer) Flush() error { - return nil -} - -func (rb *redirectBuffer) Write(bytes []byte) (n int, err error) { - return rb.w.Write(bytes) -} - -// SetOutput sets the output destination for all severities -func SetOutput(w io.Writer) { - logging.mu.Lock() - defer logging.mu.Unlock() - for s := fatalLog; s >= infoLog; s-- { - rb := &redirectBuffer{ - w: w, - } - logging.file[s] = rb - } -} - -// SetOutputBySeverity sets the output destination for specific severity -func SetOutputBySeverity(name string, w io.Writer) { - logging.mu.Lock() - defer logging.mu.Unlock() - sev, ok := severityByName(name) - if !ok { - panic(fmt.Sprintf("SetOutputBySeverity(%q): unrecognized severity name", name)) - } - rb := &redirectBuffer{ - w: w, - } - logging.file[sev] = rb -} - -// output writes the data to the log files and releases the buffer. -func (l *loggingT) output(s severity, buf *buffer, file string, line int, alsoToStderr bool) { - l.mu.Lock() - if l.traceLocation.isSet() { - if l.traceLocation.match(file, line) { - buf.Write(stacks(false)) - } - } - data := buf.Bytes() - if l.toStderr { - os.Stderr.Write(data) - } else { - if alsoToStderr || l.alsoToStderr || s >= l.stderrThreshold.get() { - os.Stderr.Write(data) - } - - if logging.logFile != "" { - // Since we are using a single log file, all of the items in l.file array - // will point to the same file, so just use one of them to write data. - if l.file[infoLog] == nil { - if err := l.createFiles(infoLog); err != nil { - os.Stderr.Write(data) // Make sure the message appears somewhere. - l.exit(err) - } - } - l.file[infoLog].Write(data) - } else { - if l.file[s] == nil { - if err := l.createFiles(s); err != nil { - os.Stderr.Write(data) // Make sure the message appears somewhere. - l.exit(err) - } - } - - switch s { - case fatalLog: - l.file[fatalLog].Write(data) - fallthrough - case errorLog: - l.file[errorLog].Write(data) - fallthrough - case warningLog: - l.file[warningLog].Write(data) - fallthrough - case infoLog: - l.file[infoLog].Write(data) - } - } - } - if s == fatalLog { - // If we got here via Exit rather than Fatal, print no stacks. - if atomic.LoadUint32(&fatalNoStacks) > 0 { - l.mu.Unlock() - timeoutFlush(10 * time.Second) - os.Exit(1) - } - // Dump all goroutine stacks before exiting. - // First, make sure we see the trace for the current goroutine on standard error. - // If -logtostderr has been specified, the loop below will do that anyway - // as the first stack in the full dump. - if !l.toStderr { - os.Stderr.Write(stacks(false)) - } - // Write the stack trace for all goroutines to the files. - trace := stacks(true) - logExitFunc = func(error) {} // If we get a write error, we'll still exit below. - for log := fatalLog; log >= infoLog; log-- { - if f := l.file[log]; f != nil { // Can be nil if -logtostderr is set. - f.Write(trace) - } - } - l.mu.Unlock() - timeoutFlush(10 * time.Second) - os.Exit(255) // C++ uses -1, which is silly because it's anded with 255 anyway. - } - l.putBuffer(buf) - l.mu.Unlock() - if stats := severityStats[s]; stats != nil { - atomic.AddInt64(&stats.lines, 1) - atomic.AddInt64(&stats.bytes, int64(len(data))) - } -} - -// timeoutFlush calls Flush and returns when it completes or after timeout -// elapses, whichever happens first. This is needed because the hooks invoked -// by Flush may deadlock when klog.Fatal is called from a hook that holds -// a lock. -func timeoutFlush(timeout time.Duration) { - done := make(chan bool, 1) - go func() { - Flush() // calls logging.lockAndFlushAll() - done <- true - }() - select { - case <-done: - case <-time.After(timeout): - fmt.Fprintln(os.Stderr, "klog: Flush took longer than", timeout) - } -} - -// stacks is a wrapper for runtime.Stack that attempts to recover the data for all goroutines. -func stacks(all bool) []byte { - // We don't know how big the traces are, so grow a few times if they don't fit. Start large, though. - n := 10000 - if all { - n = 100000 - } - var trace []byte - for i := 0; i < 5; i++ { - trace = make([]byte, n) - nbytes := runtime.Stack(trace, all) - if nbytes < len(trace) { - return trace[:nbytes] - } - n *= 2 - } - return trace -} - -// logExitFunc provides a simple mechanism to override the default behavior -// of exiting on error. Used in testing and to guarantee we reach a required exit -// for fatal logs. Instead, exit could be a function rather than a method but that -// would make its use clumsier. -var logExitFunc func(error) - -// exit is called if there is trouble creating or writing log files. -// It flushes the logs and exits the program; there's no point in hanging around. -// l.mu is held. -func (l *loggingT) exit(err error) { - fmt.Fprintf(os.Stderr, "log: exiting because of error: %s\n", err) - // If logExitFunc is set, we do that instead of exiting. - if logExitFunc != nil { - logExitFunc(err) - return - } - l.flushAll() - os.Exit(2) -} - -// syncBuffer joins a bufio.Writer to its underlying file, providing access to the -// file's Sync method and providing a wrapper for the Write method that provides log -// file rotation. There are conflicting methods, so the file cannot be embedded. -// l.mu is held for all its methods. -type syncBuffer struct { - logger *loggingT - *bufio.Writer - file *os.File - sev severity - nbytes uint64 // The number of bytes written to this file - maxbytes uint64 // The max number of bytes this syncBuffer.file can hold before cleaning up. -} - -func (sb *syncBuffer) Sync() error { - return sb.file.Sync() -} - -// CalculateMaxSize returns the real max size in bytes after considering the default max size and the flag options. -func CalculateMaxSize() uint64 { - if logging.logFile != "" { - if logging.logFileMaxSizeMB == 0 { - // If logFileMaxSizeMB is zero, we don't have limitations on the log size. - return math.MaxUint64 - } - // Flag logFileMaxSizeMB is in MB for user convenience. - return logging.logFileMaxSizeMB * 1024 * 1024 - } - // If "log_file" flag is not specified, the target file (sb.file) will be cleaned up when reaches a fixed size. - return MaxSize -} - -func (sb *syncBuffer) Write(p []byte) (n int, err error) { - if sb.nbytes+uint64(len(p)) >= sb.maxbytes { - if err := sb.rotateFile(time.Now(), false); err != nil { - sb.logger.exit(err) - } - } - n, err = sb.Writer.Write(p) - sb.nbytes += uint64(n) - if err != nil { - sb.logger.exit(err) - } - return -} - -// rotateFile closes the syncBuffer's file and starts a new one. -// The startup argument indicates whether this is the initial startup of klog. -// If startup is true, existing files are opened for appending instead of truncated. -func (sb *syncBuffer) rotateFile(now time.Time, startup bool) error { - if sb.file != nil { - sb.Flush() - sb.file.Close() - } - var err error - sb.file, _, err = create(severityName[sb.sev], now, startup) - sb.nbytes = 0 - if err != nil { - return err - } - - sb.Writer = bufio.NewWriterSize(sb.file, bufferSize) - - if sb.logger.skipLogHeaders { - return nil - } - - // Write header. - var buf bytes.Buffer - fmt.Fprintf(&buf, "Log file created at: %s\n", now.Format("2006/01/02 15:04:05")) - fmt.Fprintf(&buf, "Running on machine: %s\n", host) - fmt.Fprintf(&buf, "Binary: Built with %s %s for %s/%s\n", runtime.Compiler, runtime.Version(), runtime.GOOS, runtime.GOARCH) - fmt.Fprintf(&buf, "Log line format: [IWEF]mmdd hh:mm:ss.uuuuuu threadid file:line] msg\n") - n, err := sb.file.Write(buf.Bytes()) - sb.nbytes += uint64(n) - return err -} - -// bufferSize sizes the buffer associated with each log file. It's large -// so that log records can accumulate without the logging thread blocking -// on disk I/O. The flushDaemon will block instead. -const bufferSize = 256 * 1024 - -// createFiles creates all the log files for severity from sev down to infoLog. -// l.mu is held. -func (l *loggingT) createFiles(sev severity) error { - now := time.Now() - // Files are created in decreasing severity order, so as soon as we find one - // has already been created, we can stop. - for s := sev; s >= infoLog && l.file[s] == nil; s-- { - sb := &syncBuffer{ - logger: l, - sev: s, - maxbytes: CalculateMaxSize(), - } - if err := sb.rotateFile(now, true); err != nil { - return err - } - l.file[s] = sb - } - return nil -} - -const flushInterval = 5 * time.Second - -// flushDaemon periodically flushes the log file buffers. -func (l *loggingT) flushDaemon() { - for range time.NewTicker(flushInterval).C { - l.lockAndFlushAll() - } -} - -// lockAndFlushAll is like flushAll but locks l.mu first. -func (l *loggingT) lockAndFlushAll() { - l.mu.Lock() - l.flushAll() - l.mu.Unlock() -} - -// flushAll flushes all the logs and attempts to "sync" their data to disk. -// l.mu is held. -func (l *loggingT) flushAll() { - // Flush from fatal down, in case there's trouble flushing. - for s := fatalLog; s >= infoLog; s-- { - file := l.file[s] - if file != nil { - file.Flush() // ignore error - file.Sync() // ignore error - } - } -} - -// CopyStandardLogTo arranges for messages written to the Go "log" package's -// default logs to also appear in the Google logs for the named and lower -// severities. Subsequent changes to the standard log's default output location -// or format may break this behavior. -// -// Valid names are "INFO", "WARNING", "ERROR", and "FATAL". If the name is not -// recognized, CopyStandardLogTo panics. -func CopyStandardLogTo(name string) { - sev, ok := severityByName(name) - if !ok { - panic(fmt.Sprintf("log.CopyStandardLogTo(%q): unrecognized severity name", name)) - } - // Set a log format that captures the user's file and line: - // d.go:23: message - stdLog.SetFlags(stdLog.Lshortfile) - stdLog.SetOutput(logBridge(sev)) -} - -// logBridge provides the Write method that enables CopyStandardLogTo to connect -// Go's standard logs to the logs provided by this package. -type logBridge severity - -// Write parses the standard logging line and passes its components to the -// logger for severity(lb). -func (lb logBridge) Write(b []byte) (n int, err error) { - var ( - file = "???" - line = 1 - text string - ) - // Split "d.go:23: message" into "d.go", "23", and "message". - if parts := bytes.SplitN(b, []byte{':'}, 3); len(parts) != 3 || len(parts[0]) < 1 || len(parts[2]) < 1 { - text = fmt.Sprintf("bad log format: %s", b) - } else { - file = string(parts[0]) - text = string(parts[2][1:]) // skip leading space - line, err = strconv.Atoi(string(parts[1])) - if err != nil { - text = fmt.Sprintf("bad line number: %s", b) - line = 1 - } - } - // printWithFileLine with alsoToStderr=true, so standard log messages - // always appear on standard error. - logging.printWithFileLine(severity(lb), file, line, true, text) - return len(b), nil -} - -// setV computes and remembers the V level for a given PC -// when vmodule is enabled. -// File pattern matching takes the basename of the file, stripped -// of its .go suffix, and uses filepath.Match, which is a little more -// general than the *? matching used in C++. -// l.mu is held. -func (l *loggingT) setV(pc uintptr) Level { - fn := runtime.FuncForPC(pc) - file, _ := fn.FileLine(pc) - // The file is something like /a/b/c/d.go. We want just the d. - if strings.HasSuffix(file, ".go") { - file = file[:len(file)-3] - } - if slash := strings.LastIndex(file, "/"); slash >= 0 { - file = file[slash+1:] - } - for _, filter := range l.vmodule.filter { - if filter.match(file) { - l.vmap[pc] = filter.level - return filter.level - } - } - l.vmap[pc] = 0 - return 0 -} - -// Verbose is a boolean type that implements Infof (like Printf) etc. -// See the documentation of V for more information. -type Verbose bool - -// V reports whether verbosity at the call site is at least the requested level. -// The returned value is a boolean of type Verbose, which implements Info, Infoln -// and Infof. These methods will write to the Info log if called. -// Thus, one may write either -// if klog.V(2) { klog.Info("log this") } -// or -// klog.V(2).Info("log this") -// The second form is shorter but the first is cheaper if logging is off because it does -// not evaluate its arguments. -// -// Whether an individual call to V generates a log record depends on the setting of -// the -v and --vmodule flags; both are off by default. If the level in the call to -// V is at least the value of -v, or of -vmodule for the source file containing the -// call, the V call will log. -func V(level Level) Verbose { - // This function tries hard to be cheap unless there's work to do. - // The fast path is two atomic loads and compares. - - // Here is a cheap but safe test to see if V logging is enabled globally. - if logging.verbosity.get() >= level { - return Verbose(true) - } - - // It's off globally but it vmodule may still be set. - // Here is another cheap but safe test to see if vmodule is enabled. - if atomic.LoadInt32(&logging.filterLength) > 0 { - // Now we need a proper lock to use the logging structure. The pcs field - // is shared so we must lock before accessing it. This is fairly expensive, - // but if V logging is enabled we're slow anyway. - logging.mu.Lock() - defer logging.mu.Unlock() - if runtime.Callers(2, logging.pcs[:]) == 0 { - return Verbose(false) - } - v, ok := logging.vmap[logging.pcs[0]] - if !ok { - v = logging.setV(logging.pcs[0]) - } - return Verbose(v >= level) - } - return Verbose(false) -} - -// Info is equivalent to the global Info function, guarded by the value of v. -// See the documentation of V for usage. -func (v Verbose) Info(args ...interface{}) { - if v { - logging.print(infoLog, args...) - } -} - -// Infoln is equivalent to the global Infoln function, guarded by the value of v. -// See the documentation of V for usage. -func (v Verbose) Infoln(args ...interface{}) { - if v { - logging.println(infoLog, args...) - } -} - -// Infof is equivalent to the global Infof function, guarded by the value of v. -// See the documentation of V for usage. -func (v Verbose) Infof(format string, args ...interface{}) { - if v { - logging.printf(infoLog, format, args...) - } -} - -// Info logs to the INFO log. -// Arguments are handled in the manner of fmt.Print; a newline is appended if missing. -func Info(args ...interface{}) { - logging.print(infoLog, args...) -} - -// InfoDepth acts as Info but uses depth to determine which call frame to log. -// InfoDepth(0, "msg") is the same as Info("msg"). -func InfoDepth(depth int, args ...interface{}) { - logging.printDepth(infoLog, depth, args...) -} - -// Infoln logs to the INFO log. -// Arguments are handled in the manner of fmt.Println; a newline is always appended. -func Infoln(args ...interface{}) { - logging.println(infoLog, args...) -} - -// Infof logs to the INFO log. -// Arguments are handled in the manner of fmt.Printf; a newline is appended if missing. -func Infof(format string, args ...interface{}) { - logging.printf(infoLog, format, args...) -} - -// Warning logs to the WARNING and INFO logs. -// Arguments are handled in the manner of fmt.Print; a newline is appended if missing. -func Warning(args ...interface{}) { - logging.print(warningLog, args...) -} - -// WarningDepth acts as Warning but uses depth to determine which call frame to log. -// WarningDepth(0, "msg") is the same as Warning("msg"). -func WarningDepth(depth int, args ...interface{}) { - logging.printDepth(warningLog, depth, args...) -} - -// Warningln logs to the WARNING and INFO logs. -// Arguments are handled in the manner of fmt.Println; a newline is always appended. -func Warningln(args ...interface{}) { - logging.println(warningLog, args...) -} - -// Warningf logs to the WARNING and INFO logs. -// Arguments are handled in the manner of fmt.Printf; a newline is appended if missing. -func Warningf(format string, args ...interface{}) { - logging.printf(warningLog, format, args...) -} - -// Error logs to the ERROR, WARNING, and INFO logs. -// Arguments are handled in the manner of fmt.Print; a newline is appended if missing. -func Error(args ...interface{}) { - logging.print(errorLog, args...) -} - -// ErrorDepth acts as Error but uses depth to determine which call frame to log. -// ErrorDepth(0, "msg") is the same as Error("msg"). -func ErrorDepth(depth int, args ...interface{}) { - logging.printDepth(errorLog, depth, args...) -} - -// Errorln logs to the ERROR, WARNING, and INFO logs. -// Arguments are handled in the manner of fmt.Println; a newline is always appended. -func Errorln(args ...interface{}) { - logging.println(errorLog, args...) -} - -// Errorf logs to the ERROR, WARNING, and INFO logs. -// Arguments are handled in the manner of fmt.Printf; a newline is appended if missing. -func Errorf(format string, args ...interface{}) { - logging.printf(errorLog, format, args...) -} - -// Fatal logs to the FATAL, ERROR, WARNING, and INFO logs, -// including a stack trace of all running goroutines, then calls os.Exit(255). -// Arguments are handled in the manner of fmt.Print; a newline is appended if missing. -func Fatal(args ...interface{}) { - logging.print(fatalLog, args...) -} - -// FatalDepth acts as Fatal but uses depth to determine which call frame to log. -// FatalDepth(0, "msg") is the same as Fatal("msg"). -func FatalDepth(depth int, args ...interface{}) { - logging.printDepth(fatalLog, depth, args...) -} - -// Fatalln logs to the FATAL, ERROR, WARNING, and INFO logs, -// including a stack trace of all running goroutines, then calls os.Exit(255). -// Arguments are handled in the manner of fmt.Println; a newline is always appended. -func Fatalln(args ...interface{}) { - logging.println(fatalLog, args...) -} - -// Fatalf logs to the FATAL, ERROR, WARNING, and INFO logs, -// including a stack trace of all running goroutines, then calls os.Exit(255). -// Arguments are handled in the manner of fmt.Printf; a newline is appended if missing. -func Fatalf(format string, args ...interface{}) { - logging.printf(fatalLog, format, args...) -} - -// fatalNoStacks is non-zero if we are to exit without dumping goroutine stacks. -// It allows Exit and relatives to use the Fatal logs. -var fatalNoStacks uint32 - -// Exit logs to the FATAL, ERROR, WARNING, and INFO logs, then calls os.Exit(1). -// Arguments are handled in the manner of fmt.Print; a newline is appended if missing. -func Exit(args ...interface{}) { - atomic.StoreUint32(&fatalNoStacks, 1) - logging.print(fatalLog, args...) -} - -// ExitDepth acts as Exit but uses depth to determine which call frame to log. -// ExitDepth(0, "msg") is the same as Exit("msg"). -func ExitDepth(depth int, args ...interface{}) { - atomic.StoreUint32(&fatalNoStacks, 1) - logging.printDepth(fatalLog, depth, args...) -} - -// Exitln logs to the FATAL, ERROR, WARNING, and INFO logs, then calls os.Exit(1). -func Exitln(args ...interface{}) { - atomic.StoreUint32(&fatalNoStacks, 1) - logging.println(fatalLog, args...) -} - -// Exitf logs to the FATAL, ERROR, WARNING, and INFO logs, then calls os.Exit(1). -// Arguments are handled in the manner of fmt.Printf; a newline is appended if missing. -func Exitf(format string, args ...interface{}) { - atomic.StoreUint32(&fatalNoStacks, 1) - logging.printf(fatalLog, format, args...) -} diff --git a/vendor/k8s.io/klog/klog_file.go b/vendor/k8s.io/klog/klog_file.go deleted file mode 100644 index e4010ad4d..000000000 --- a/vendor/k8s.io/klog/klog_file.go +++ /dev/null @@ -1,139 +0,0 @@ -// Go support for leveled logs, analogous to https://code.google.com/p/google-glog/ -// -// Copyright 2013 Google Inc. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// File I/O for logs. - -package klog - -import ( - "errors" - "fmt" - "os" - "os/user" - "path/filepath" - "strings" - "sync" - "time" -) - -// MaxSize is the maximum size of a log file in bytes. -var MaxSize uint64 = 1024 * 1024 * 1800 - -// logDirs lists the candidate directories for new log files. -var logDirs []string - -func createLogDirs() { - if logging.logDir != "" { - logDirs = append(logDirs, logging.logDir) - } - logDirs = append(logDirs, os.TempDir()) -} - -var ( - pid = os.Getpid() - program = filepath.Base(os.Args[0]) - host = "unknownhost" - userName = "unknownuser" -) - -func init() { - h, err := os.Hostname() - if err == nil { - host = shortHostname(h) - } - - current, err := user.Current() - if err == nil { - userName = current.Username - } - - // Sanitize userName since it may contain filepath separators on Windows. - userName = strings.Replace(userName, `\`, "_", -1) -} - -// shortHostname returns its argument, truncating at the first period. -// For instance, given "www.google.com" it returns "www". -func shortHostname(hostname string) string { - if i := strings.Index(hostname, "."); i >= 0 { - return hostname[:i] - } - return hostname -} - -// logName returns a new log file name containing tag, with start time t, and -// the name for the symlink for tag. -func logName(tag string, t time.Time) (name, link string) { - name = fmt.Sprintf("%s.%s.%s.log.%s.%04d%02d%02d-%02d%02d%02d.%d", - program, - host, - userName, - tag, - t.Year(), - t.Month(), - t.Day(), - t.Hour(), - t.Minute(), - t.Second(), - pid) - return name, program + "." + tag -} - -var onceLogDirs sync.Once - -// create creates a new log file and returns the file and its filename, which -// contains tag ("INFO", "FATAL", etc.) and t. If the file is created -// successfully, create also attempts to update the symlink for that tag, ignoring -// errors. -// The startup argument indicates whether this is the initial startup of klog. -// If startup is true, existing files are opened for appending instead of truncated. -func create(tag string, t time.Time, startup bool) (f *os.File, filename string, err error) { - if logging.logFile != "" { - f, err := openOrCreate(logging.logFile, startup) - if err == nil { - return f, logging.logFile, nil - } - return nil, "", fmt.Errorf("log: unable to create log: %v", err) - } - onceLogDirs.Do(createLogDirs) - if len(logDirs) == 0 { - return nil, "", errors.New("log: no log dirs") - } - name, link := logName(tag, t) - var lastErr error - for _, dir := range logDirs { - fname := filepath.Join(dir, name) - f, err := openOrCreate(fname, startup) - if err == nil { - symlink := filepath.Join(dir, link) - os.Remove(symlink) // ignore err - os.Symlink(name, symlink) // ignore err - return f, fname, nil - } - lastErr = err - } - return nil, "", fmt.Errorf("log: cannot create log: %v", lastErr) -} - -// The startup argument indicates whether this is the initial startup of klog. -// If startup is true, existing files are opened for appending instead of truncated. -func openOrCreate(name string, startup bool) (*os.File, error) { - if startup { - f, err := os.OpenFile(name, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666) - return f, err - } - f, err := os.Create(name) - return f, err -} diff --git a/vendor/modules.txt b/vendor/modules.txt index ab0e92f03..bfd2ef88a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1302,10 +1302,8 @@ k8s.io/gengo/generator k8s.io/gengo/namer k8s.io/gengo/parser k8s.io/gengo/types -# k8s.io/klog v1.0.0 => k8s.io/klog v0.4.0 +# k8s.io/klog/v2 v2.2.0 => k8s.io/klog/v2 v2.2.0 ## explicit -k8s.io/klog -# k8s.io/klog/v2 v2.2.0 k8s.io/klog/v2 # k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6 ## explicit @@ -1670,7 +1668,7 @@ sigs.k8s.io/yaml # k8s.io/csi-translation-lib v0.0.0 => k8s.io/csi-translation-lib v0.0.0-20190718190424-bef8d46b95de # k8s.io/gengo v0.0.0 => k8s.io/gengo v0.0.0-20190327210449-e17681d19d3a # k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1 -# k8s.io/klog => k8s.io/klog v0.4.0 +# k8s.io/klog/v2 => k8s.io/klog/v2 v2.2.0 # k8s.io/kube-aggregator v0.0.0 => k8s.io/kube-aggregator v0.0.0-20190718184434-a064d4d1ed7a # k8s.io/kube-controller-manager v0.0.0 => k8s.io/kube-controller-manager v0.0.0-20190718190030-ea930fedc880 # k8s.io/kube-openapi v0.0.0 => k8s.io/kube-openapi v0.0.0-20190718094010-3cf2ea392886 |