diff --git a/cmd/kube-proxy/app/server.go b/cmd/kube-proxy/app/server.go index 0b8b0399383..004977c5880 100644 --- a/cmd/kube-proxy/app/server.go +++ b/cmd/kube-proxy/app/server.go @@ -22,13 +22,16 @@ import ( "errors" "fmt" "io/ioutil" - "k8s.io/component-base/metrics/legacyregistry" "net/http" "os" goruntime "runtime" "strings" "time" + "github.com/fsnotify/fsnotify" + "github.com/spf13/cobra" + "github.com/spf13/pflag" + v1 "k8s.io/api/core/v1" v1meta "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -47,6 +50,8 @@ import ( "k8s.io/client-go/tools/record" cliflag "k8s.io/component-base/cli/flag" componentbaseconfig "k8s.io/component-base/config" + "k8s.io/component-base/metrics/legacyregistry" + "k8s.io/klog" "k8s.io/kube-proxy/config/v1alpha1" api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/kubelet/qos" @@ -73,11 +78,6 @@ import ( "k8s.io/kubernetes/pkg/version/verflag" "k8s.io/utils/exec" utilpointer "k8s.io/utils/pointer" - - "github.com/fsnotify/fsnotify" - "github.com/spf13/cobra" - "github.com/spf13/pflag" - "k8s.io/klog" ) const ( diff --git a/pkg/kubelet/dockershim/network/metrics/metrics.go b/pkg/kubelet/dockershim/network/metrics/metrics.go index 494a4673cbb..8ecd02132c3 100644 --- a/pkg/kubelet/dockershim/network/metrics/metrics.go +++ b/pkg/kubelet/dockershim/network/metrics/metrics.go @@ -17,12 +17,13 @@ limitations under the License. package metrics import ( - "k8s.io/component-base/metrics" - "k8s.io/component-base/metrics/legacyregistry" "sync" "time" "github.com/prometheus/client_golang/prometheus" + + "k8s.io/component-base/metrics" + "k8s.io/component-base/metrics/legacyregistry" ) const ( diff --git a/pkg/proxy/metrics/metrics.go b/pkg/proxy/metrics/metrics.go index 11d8aea2294..4a0cc02d905 100644 --- a/pkg/proxy/metrics/metrics.go +++ b/pkg/proxy/metrics/metrics.go @@ -17,12 +17,13 @@ limitations under the License. package metrics import ( - "k8s.io/component-base/metrics" - "k8s.io/component-base/metrics/legacyregistry" "sync" "time" "github.com/prometheus/client_golang/prometheus" + + "k8s.io/component-base/metrics" + "k8s.io/component-base/metrics/legacyregistry" ) const kubeProxySubsystem = "kubeproxy" diff --git a/pkg/proxy/winkernel/metrics.go b/pkg/proxy/winkernel/metrics.go index 811e6e8aa06..8f34daeffdd 100644 --- a/pkg/proxy/winkernel/metrics.go +++ b/pkg/proxy/winkernel/metrics.go @@ -17,12 +17,13 @@ limitations under the License. package winkernel import ( - "k8s.io/component-base/metrics" - "k8s.io/component-base/metrics/legacyregistry" "sync" "time" "github.com/prometheus/client_golang/prometheus" + + "k8s.io/component-base/metrics" + "k8s.io/component-base/metrics/legacyregistry" ) const kubeProxySubsystem = "kubeproxy" diff --git a/vendor/modules.txt b/vendor/modules.txt index 639be714ded..a46fcd6c464 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1663,7 +1663,6 @@ k8s.io/component-base/metrics/prometheus/clientgo k8s.io/component-base/metrics/prometheus/clientgo/leaderelection k8s.io/component-base/metrics/prometheus/restclient k8s.io/component-base/metrics/prometheus/workqueue -k8s.io/component-base/metrics/prometheus/restclient k8s.io/component-base/version # k8s.io/cri-api v0.0.0 => ./staging/src/k8s.io/cri-api k8s.io/cri-api/pkg/apis