diff --git a/cmd/cloud-controller-manager/controller-manager.go b/cmd/cloud-controller-manager/controller-manager.go index 61418fae34..b00af712b7 100644 --- a/cmd/cloud-controller-manager/controller-manager.go +++ b/cmd/cloud-controller-manager/controller-manager.go @@ -25,8 +25,9 @@ import ( "os" "time" - "k8s.io/apiserver/pkg/util/logs" + "k8s.io/component-base/logs" "k8s.io/kubernetes/cmd/cloud-controller-manager/app" + // NOTE: Importing all in-tree cloud-providers is not required when // implementing an out-of-tree cloud-provider. _ "k8s.io/kubernetes/pkg/cloudprovider/providers" diff --git a/cmd/hyperkube/main.go b/cmd/hyperkube/main.go index 617050a0cd..2294c37dad 100644 --- a/cmd/hyperkube/main.go +++ b/cmd/hyperkube/main.go @@ -34,7 +34,7 @@ import ( "k8s.io/apiserver/pkg/server" utilflag "k8s.io/apiserver/pkg/util/flag" - "k8s.io/apiserver/pkg/util/logs" + "k8s.io/component-base/logs" cloudcontrollermanager "k8s.io/kubernetes/cmd/cloud-controller-manager/app" kubeapiserver "k8s.io/kubernetes/cmd/kube-apiserver/app" kubecontrollermanager "k8s.io/kubernetes/cmd/kube-controller-manager/app" diff --git a/cmd/kube-apiserver/apiserver.go b/cmd/kube-apiserver/apiserver.go index 0591398b90..613dc2bbb9 100644 --- a/cmd/kube-apiserver/apiserver.go +++ b/cmd/kube-apiserver/apiserver.go @@ -25,7 +25,7 @@ import ( "time" "k8s.io/apiserver/pkg/server" - "k8s.io/apiserver/pkg/util/logs" + "k8s.io/component-base/logs" "k8s.io/kubernetes/cmd/kube-apiserver/app" _ "k8s.io/kubernetes/pkg/util/prometheusclientgo" // load all the prometheus client-go plugins _ "k8s.io/kubernetes/pkg/version/prometheus" // for version metric registration diff --git a/cmd/kube-controller-manager/controller-manager.go b/cmd/kube-controller-manager/controller-manager.go index 9923f4b879..b5f94549b5 100644 --- a/cmd/kube-controller-manager/controller-manager.go +++ b/cmd/kube-controller-manager/controller-manager.go @@ -26,7 +26,7 @@ import ( "os" "time" - "k8s.io/apiserver/pkg/util/logs" + "k8s.io/component-base/logs" "k8s.io/kubernetes/cmd/kube-controller-manager/app" _ "k8s.io/kubernetes/pkg/util/prometheusclientgo" // load all the prometheus client-go plugin _ "k8s.io/kubernetes/pkg/version/prometheus" // for version metric registration diff --git a/cmd/kube-proxy/proxy.go b/cmd/kube-proxy/proxy.go index 884f332811..95b2073a73 100644 --- a/cmd/kube-proxy/proxy.go +++ b/cmd/kube-proxy/proxy.go @@ -26,7 +26,7 @@ import ( "github.com/spf13/pflag" utilflag "k8s.io/apiserver/pkg/util/flag" - "k8s.io/apiserver/pkg/util/logs" + "k8s.io/component-base/logs" "k8s.io/kubernetes/cmd/kube-proxy/app" _ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration _ "k8s.io/kubernetes/pkg/version/prometheus" // for version metric registration diff --git a/cmd/kube-scheduler/scheduler.go b/cmd/kube-scheduler/scheduler.go index f7b955a4a3..d35cbd3615 100644 --- a/cmd/kube-scheduler/scheduler.go +++ b/cmd/kube-scheduler/scheduler.go @@ -25,7 +25,7 @@ import ( "github.com/spf13/pflag" utilflag "k8s.io/apiserver/pkg/util/flag" - "k8s.io/apiserver/pkg/util/logs" + "k8s.io/component-base/logs" "k8s.io/kubernetes/cmd/kube-scheduler/app" _ "k8s.io/kubernetes/pkg/util/prometheusclientgo" // load all the prometheus client-go plugins _ "k8s.io/kubernetes/pkg/version/prometheus" // for version metric registration diff --git a/cmd/kubelet/app/options/globalflags.go b/cmd/kubelet/app/options/globalflags.go index 144837731e..2938aec20b 100644 --- a/cmd/kubelet/app/options/globalflags.go +++ b/cmd/kubelet/app/options/globalflags.go @@ -25,7 +25,7 @@ import ( "github.com/spf13/pflag" // libs that provide registration functions - "k8s.io/apiserver/pkg/util/logs" + "k8s.io/component-base/logs" "k8s.io/kubernetes/pkg/version/verflag" // ensure libs have a chance to globally register their flags diff --git a/cmd/kubelet/kubelet.go b/cmd/kubelet/kubelet.go index 074c4dd323..4c27eaf2cd 100644 --- a/cmd/kubelet/kubelet.go +++ b/cmd/kubelet/kubelet.go @@ -27,7 +27,7 @@ import ( "time" "k8s.io/apiserver/pkg/server" - "k8s.io/apiserver/pkg/util/logs" + "k8s.io/component-base/logs" "k8s.io/kubernetes/cmd/kubelet/app" _ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration _ "k8s.io/kubernetes/pkg/version/prometheus" // for version metric registration diff --git a/cmd/kubemark/hollow-node.go b/cmd/kubemark/hollow-node.go index 2653e863a9..bd7888f40c 100644 --- a/cmd/kubemark/hollow-node.go +++ b/cmd/kubemark/hollow-node.go @@ -27,14 +27,14 @@ import ( "github.com/spf13/pflag" "k8s.io/klog" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/sets" utilflag "k8s.io/apiserver/pkg/util/flag" - "k8s.io/apiserver/pkg/util/logs" clientset "k8s.io/client-go/kubernetes" restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/record" + "k8s.io/component-base/logs" "k8s.io/kubernetes/pkg/api/legacyscheme" _ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration cadvisortest "k8s.io/kubernetes/pkg/kubelet/cadvisor/testing" diff --git a/pkg/kubelet/server/server.go b/pkg/kubelet/server/server.go index 66bc7f54d9..50256f6e80 100644 --- a/pkg/kubelet/server/server.go +++ b/pkg/kubelet/server/server.go @@ -31,7 +31,7 @@ import ( "strings" "time" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" cadvisormetrics "github.com/google/cadvisor/container" cadvisorapi "github.com/google/cadvisor/info/v1" "github.com/google/cadvisor/metrics" @@ -40,7 +40,7 @@ import ( "google.golang.org/grpc" "k8s.io/klog" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -53,7 +53,7 @@ import ( "k8s.io/apiserver/pkg/server/httplog" "k8s.io/apiserver/pkg/server/routes" "k8s.io/apiserver/pkg/util/flushwriter" - "k8s.io/apiserver/pkg/util/logs" + "k8s.io/component-base/logs" "k8s.io/kubernetes/pkg/api/legacyscheme" api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/apis/core/v1/validation" diff --git a/staging/src/k8s.io/apiextensions-apiserver/main.go b/staging/src/k8s.io/apiextensions-apiserver/main.go index eeac2e685a..a86af55ccc 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/main.go +++ b/staging/src/k8s.io/apiextensions-apiserver/main.go @@ -24,7 +24,7 @@ import ( "k8s.io/apiextensions-apiserver/pkg/cmd/server" genericapiserver "k8s.io/apiserver/pkg/server" - "k8s.io/apiserver/pkg/util/logs" + "k8s.io/component-base/logs" ) func main() { diff --git a/staging/src/k8s.io/apiserver/pkg/server/config.go b/staging/src/k8s.io/apiserver/pkg/server/config.go index 92da76a096..da5b28a30e 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/config.go +++ b/staging/src/k8s.io/apiserver/pkg/server/config.go @@ -58,10 +58,10 @@ import ( "k8s.io/apiserver/pkg/server/routes" serverstore "k8s.io/apiserver/pkg/server/storage" utilfeature "k8s.io/apiserver/pkg/util/feature" - "k8s.io/apiserver/pkg/util/logs" "k8s.io/client-go/informers" restclient "k8s.io/client-go/rest" certutil "k8s.io/client-go/util/cert" + "k8s.io/component-base/logs" openapicommon "k8s.io/kube-openapi/pkg/common" // install apis diff --git a/staging/src/k8s.io/apiserver/pkg/util/globalflag/globalflags.go b/staging/src/k8s.io/apiserver/pkg/util/globalflag/globalflags.go index b49c8e9dc8..455153f680 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/globalflag/globalflags.go +++ b/staging/src/k8s.io/apiserver/pkg/util/globalflag/globalflags.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/pflag" - "k8s.io/apiserver/pkg/util/logs" + "k8s.io/component-base/logs" ) // AddGlobalFlags explicitly registers flags that libraries (klog, verflag, etc.) register diff --git a/staging/src/k8s.io/apiserver/pkg/util/logs/logs.go b/staging/src/k8s.io/component-base/logs/logs.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/util/logs/logs.go rename to staging/src/k8s.io/component-base/logs/logs.go diff --git a/staging/src/k8s.io/kube-aggregator/main.go b/staging/src/k8s.io/kube-aggregator/main.go index 659cb0753e..9f24f9322e 100644 --- a/staging/src/k8s.io/kube-aggregator/main.go +++ b/staging/src/k8s.io/kube-aggregator/main.go @@ -23,7 +23,7 @@ import ( "k8s.io/klog" genericapiserver "k8s.io/apiserver/pkg/server" - "k8s.io/apiserver/pkg/util/logs" + "k8s.io/component-base/logs" "k8s.io/kube-aggregator/pkg/cmd/server" // force compilation of packages we'll later rely upon diff --git a/staging/src/k8s.io/sample-apiserver/main.go b/staging/src/k8s.io/sample-apiserver/main.go index abede29b09..225adc9b2f 100644 --- a/staging/src/k8s.io/sample-apiserver/main.go +++ b/staging/src/k8s.io/sample-apiserver/main.go @@ -23,7 +23,7 @@ import ( "k8s.io/klog" genericapiserver "k8s.io/apiserver/pkg/server" - "k8s.io/apiserver/pkg/util/logs" + "k8s.io/component-base/logs" "k8s.io/sample-apiserver/pkg/cmd/server" ) diff --git a/test/e2e/e2e.go b/test/e2e/e2e.go index 9b960fe0c8..09d68048a4 100644 --- a/test/e2e/e2e.go +++ b/test/e2e/e2e.go @@ -32,8 +32,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtimeutils "k8s.io/apimachinery/pkg/util/runtime" - "k8s.io/apiserver/pkg/util/logs" clientset "k8s.io/client-go/kubernetes" + "k8s.io/component-base/logs" "k8s.io/kubernetes/pkg/version" commontest "k8s.io/kubernetes/test/e2e/common" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/images/no-snat-test-proxy/main.go b/test/images/no-snat-test-proxy/main.go index b7f9587658..57bf7e62a9 100644 --- a/test/images/no-snat-test-proxy/main.go +++ b/test/images/no-snat-test-proxy/main.go @@ -25,7 +25,7 @@ import ( "github.com/spf13/pflag" "k8s.io/apiserver/pkg/util/flag" - "k8s.io/apiserver/pkg/util/logs" + "k8s.io/component-base/logs" ) // This Pod's /checknosnat takes `target` and `ips` arguments, and queries {target}/checknosnat?ips={ips} diff --git a/test/images/no-snat-test/main.go b/test/images/no-snat-test/main.go index b5279852d4..76e3bb6a65 100644 --- a/test/images/no-snat-test/main.go +++ b/test/images/no-snat-test/main.go @@ -26,7 +26,7 @@ import ( "github.com/spf13/pflag" "k8s.io/apiserver/pkg/util/flag" - "k8s.io/apiserver/pkg/util/logs" + "k8s.io/component-base/logs" ) // ip = target for /whoami query