From ba81a5409affb6b861d5994c1e2f7c74a05826e5 Mon Sep 17 00:00:00 2001 From: Marek Counts Date: Thu, 17 Jan 2019 09:06:12 -0500 Subject: [PATCH 1/3] move logs into component-base all the code changes to move move /apiserver/pkg/util/logs into /component-base/logs --- cmd/cloud-controller-manager/controller-manager.go | 3 ++- cmd/hyperkube/main.go | 2 +- cmd/kube-apiserver/apiserver.go | 2 +- cmd/kube-controller-manager/controller-manager.go | 2 +- cmd/kube-proxy/proxy.go | 2 +- cmd/kube-scheduler/scheduler.go | 2 +- cmd/kubelet/app/options/globalflags.go | 2 +- cmd/kubelet/kubelet.go | 2 +- cmd/kubemark/hollow-node.go | 4 ++-- pkg/kubelet/server/server.go | 6 +++--- staging/src/k8s.io/apiextensions-apiserver/main.go | 2 +- staging/src/k8s.io/apiserver/pkg/server/config.go | 2 +- .../src/k8s.io/apiserver/pkg/util/globalflag/globalflags.go | 2 +- .../{apiserver/pkg/util => component-base}/logs/logs.go | 0 staging/src/k8s.io/kube-aggregator/main.go | 2 +- staging/src/k8s.io/sample-apiserver/main.go | 2 +- test/e2e/e2e.go | 2 +- test/images/no-snat-test-proxy/main.go | 2 +- test/images/no-snat-test/main.go | 2 +- 19 files changed, 22 insertions(+), 21 deletions(-) rename staging/src/k8s.io/{apiserver/pkg/util => component-base}/logs/logs.go (100%) 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 From 3b8f6381f2ba1353f7ec279be468535538ff68f5 Mon Sep 17 00:00:00 2001 From: Marek Counts Date: Thu, 17 Jan 2019 09:07:36 -0500 Subject: [PATCH 2/3] policy file updates updated import-restrictions to allow the new component-base/logs if they previously used it before the move. --- hack/import-restrictions.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hack/import-restrictions.yaml b/hack/import-restrictions.yaml index 456c0fe620..76354c8c6e 100644 --- a/hack/import-restrictions.yaml +++ b/hack/import-restrictions.yaml @@ -91,6 +91,7 @@ - k8s.io/apimachinery - k8s.io/apiserver - k8s.io/client-go + - k8s.io/component-base - k8s.io/kube-openapi - k8s.io/utils - k8s.io/klog @@ -109,6 +110,7 @@ - k8s.io/apimachinery - k8s.io/apiserver - k8s.io/client-go + - k8s.io/component-base - k8s.io/kube-aggregator - k8s.io/kube-openapi - k8s.io/klog @@ -119,6 +121,7 @@ - k8s.io/apimachinery - k8s.io/apiserver - k8s.io/client-go + - k8s.io/component-base - k8s.io/sample-apiserver - k8s.io/klog @@ -129,6 +132,7 @@ - k8s.io/apimachinery - k8s.io/apiserver - k8s.io/client-go + - k8s.io/component-base - k8s.io/klog - baseImportPath: "./vendor/k8s.io/kube-openapi/" From 1739e343a8ff64d13650b4073d1aed8de1dc3e0d Mon Sep 17 00:00:00 2001 From: Marek Counts Date: Thu, 17 Jan 2019 09:08:39 -0500 Subject: [PATCH 3/3] autogen files all the autogen files that got updated due to the changes to move logs. --- cmd/cloud-controller-manager/BUILD | 2 +- cmd/hyperkube/BUILD | 2 +- cmd/kube-apiserver/BUILD | 2 +- cmd/kube-controller-manager/BUILD | 2 +- cmd/kube-proxy/BUILD | 2 +- cmd/kube-scheduler/BUILD | 2 +- cmd/kubelet/BUILD | 2 +- cmd/kubelet/app/options/BUILD | 2 +- cmd/kubemark/BUILD | 2 +- pkg/kubelet/server/BUILD | 2 +- staging/src/BUILD | 2 +- staging/src/k8s.io/apiextensions-apiserver/BUILD | 2 +- .../apiextensions-apiserver/Godeps/Godeps.json | 16 ++++++++-------- staging/src/k8s.io/apiserver/Godeps/Godeps.json | 4 ++++ staging/src/k8s.io/apiserver/pkg/server/BUILD | 2 +- .../k8s.io/apiserver/pkg/util/globalflag/BUILD | 2 +- .../src/k8s.io/component-base/Godeps/Godeps.json | 8 ++++++++ .../pkg/util => component-base}/logs/BUILD | 4 ++-- staging/src/k8s.io/kube-aggregator/BUILD | 2 +- .../k8s.io/kube-aggregator/Godeps/Godeps.json | 8 ++++---- staging/src/k8s.io/sample-apiserver/BUILD | 2 +- .../k8s.io/sample-apiserver/Godeps/Godeps.json | 8 ++++---- test/e2e/BUILD | 2 +- test/images/no-snat-test-proxy/BUILD | 2 +- test/images/no-snat-test/BUILD | 2 +- 25 files changed, 49 insertions(+), 37 deletions(-) rename staging/src/k8s.io/{apiserver/pkg/util => component-base}/logs/BUILD (83%) diff --git a/cmd/cloud-controller-manager/BUILD b/cmd/cloud-controller-manager/BUILD index 76dd4b9b99..29a29722b1 100644 --- a/cmd/cloud-controller-manager/BUILD +++ b/cmd/cloud-controller-manager/BUILD @@ -23,7 +23,7 @@ go_library( "//pkg/cloudprovider/providers:go_default_library", "//pkg/util/prometheusclientgo:go_default_library", "//pkg/version/prometheus:go_default_library", - "//staging/src/k8s.io/apiserver/pkg/util/logs:go_default_library", + "//staging/src/k8s.io/component-base/logs:go_default_library", ], ) diff --git a/cmd/hyperkube/BUILD b/cmd/hyperkube/BUILD index f77c689e81..077dfa0801 100644 --- a/cmd/hyperkube/BUILD +++ b/cmd/hyperkube/BUILD @@ -29,7 +29,7 @@ go_library( "//pkg/version/prometheus:go_default_library", "//staging/src/k8s.io/apiserver/pkg/server:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/flag:go_default_library", - "//staging/src/k8s.io/apiserver/pkg/util/logs:go_default_library", + "//staging/src/k8s.io/component-base/logs:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", ], diff --git a/cmd/kube-apiserver/BUILD b/cmd/kube-apiserver/BUILD index d36ddcf4b3..32a8f62994 100644 --- a/cmd/kube-apiserver/BUILD +++ b/cmd/kube-apiserver/BUILD @@ -23,7 +23,7 @@ go_library( "//pkg/util/prometheusclientgo:go_default_library", "//pkg/version/prometheus:go_default_library", "//staging/src/k8s.io/apiserver/pkg/server:go_default_library", - "//staging/src/k8s.io/apiserver/pkg/util/logs:go_default_library", + "//staging/src/k8s.io/component-base/logs:go_default_library", ], ) diff --git a/cmd/kube-controller-manager/BUILD b/cmd/kube-controller-manager/BUILD index 450c52d237..6e9b0b6828 100644 --- a/cmd/kube-controller-manager/BUILD +++ b/cmd/kube-controller-manager/BUILD @@ -22,7 +22,7 @@ go_library( "//cmd/kube-controller-manager/app:go_default_library", "//pkg/util/prometheusclientgo:go_default_library", "//pkg/version/prometheus:go_default_library", - "//staging/src/k8s.io/apiserver/pkg/util/logs:go_default_library", + "//staging/src/k8s.io/component-base/logs:go_default_library", ], ) diff --git a/cmd/kube-proxy/BUILD b/cmd/kube-proxy/BUILD index 7fadabd294..3bc47886c6 100644 --- a/cmd/kube-proxy/BUILD +++ b/cmd/kube-proxy/BUILD @@ -23,7 +23,7 @@ go_library( "//pkg/client/metrics/prometheus:go_default_library", "//pkg/version/prometheus:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/flag:go_default_library", - "//staging/src/k8s.io/apiserver/pkg/util/logs:go_default_library", + "//staging/src/k8s.io/component-base/logs:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", ], ) diff --git a/cmd/kube-scheduler/BUILD b/cmd/kube-scheduler/BUILD index 1f541fecb8..601dce330f 100644 --- a/cmd/kube-scheduler/BUILD +++ b/cmd/kube-scheduler/BUILD @@ -23,7 +23,7 @@ go_library( "//pkg/util/prometheusclientgo:go_default_library", "//pkg/version/prometheus:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/flag:go_default_library", - "//staging/src/k8s.io/apiserver/pkg/util/logs:go_default_library", + "//staging/src/k8s.io/component-base/logs:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", ], ) diff --git a/cmd/kubelet/BUILD b/cmd/kubelet/BUILD index 82fcb0c721..e2900d3cf3 100644 --- a/cmd/kubelet/BUILD +++ b/cmd/kubelet/BUILD @@ -22,7 +22,7 @@ go_library( "//pkg/client/metrics/prometheus:go_default_library", "//pkg/version/prometheus:go_default_library", "//staging/src/k8s.io/apiserver/pkg/server:go_default_library", - "//staging/src/k8s.io/apiserver/pkg/util/logs:go_default_library", + "//staging/src/k8s.io/component-base/logs:go_default_library", ], ) diff --git a/cmd/kubelet/app/options/BUILD b/cmd/kubelet/app/options/BUILD index d6e0d70f4a..e4de58aac3 100644 --- a/cmd/kubelet/app/options/BUILD +++ b/cmd/kubelet/app/options/BUILD @@ -37,7 +37,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/flag:go_default_library", - "//staging/src/k8s.io/apiserver/pkg/util/logs:go_default_library", + "//staging/src/k8s.io/component-base/logs:go_default_library", "//staging/src/k8s.io/kubelet/config/v1beta1:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", "//vendor/k8s.io/klog:go_default_library", diff --git a/cmd/kubemark/BUILD b/cmd/kubemark/BUILD index 489d3d6961..287798b05f 100644 --- a/cmd/kubemark/BUILD +++ b/cmd/kubemark/BUILD @@ -30,11 +30,11 @@ go_library( "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/flag:go_default_library", - "//staging/src/k8s.io/apiserver/pkg/util/logs:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library", "//staging/src/k8s.io/client-go/tools/record:go_default_library", + "//staging/src/k8s.io/component-base/logs:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", "//vendor/k8s.io/klog:go_default_library", diff --git a/pkg/kubelet/server/BUILD b/pkg/kubelet/server/BUILD index 595bca6af3..55353c425a 100644 --- a/pkg/kubelet/server/BUILD +++ b/pkg/kubelet/server/BUILD @@ -43,7 +43,7 @@ go_library( "//staging/src/k8s.io/apiserver/pkg/server/httplog:go_default_library", "//staging/src/k8s.io/apiserver/pkg/server/routes:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/flushwriter:go_default_library", - "//staging/src/k8s.io/apiserver/pkg/util/logs:go_default_library", + "//staging/src/k8s.io/component-base/logs:go_default_library", "//vendor/github.com/emicklei/go-restful:go_default_library", "//vendor/github.com/google/cadvisor/container:go_default_library", "//vendor/github.com/google/cadvisor/info/v1:go_default_library", diff --git a/staging/src/BUILD b/staging/src/BUILD index 8c3609edb5..36142dfc7e 100644 --- a/staging/src/BUILD +++ b/staging/src/BUILD @@ -102,7 +102,6 @@ filegroup( "//staging/src/k8s.io/apiserver/pkg/util/flag:all-srcs", "//staging/src/k8s.io/apiserver/pkg/util/flushwriter:all-srcs", "//staging/src/k8s.io/apiserver/pkg/util/globalflag:all-srcs", - "//staging/src/k8s.io/apiserver/pkg/util/logs:all-srcs", "//staging/src/k8s.io/apiserver/pkg/util/openapi:all-srcs", "//staging/src/k8s.io/apiserver/pkg/util/proxy:all-srcs", "//staging/src/k8s.io/apiserver/pkg/util/trace:all-srcs", @@ -208,6 +207,7 @@ filegroup( "//staging/src/k8s.io/code-generator/pkg/util:all-srcs", "//staging/src/k8s.io/code-generator/third_party/forked/golang/reflect:all-srcs", "//staging/src/k8s.io/component-base/config:all-srcs", + "//staging/src/k8s.io/component-base/logs:all-srcs", "//staging/src/k8s.io/csi-api/pkg/apis/csi/v1alpha1:all-srcs", "//staging/src/k8s.io/csi-api/pkg/client/clientset/versioned:all-srcs", "//staging/src/k8s.io/csi-api/pkg/client/informers/externalversions:all-srcs", diff --git a/staging/src/k8s.io/apiextensions-apiserver/BUILD b/staging/src/k8s.io/apiextensions-apiserver/BUILD index e555fb761c..44528361fe 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/BUILD +++ b/staging/src/k8s.io/apiextensions-apiserver/BUILD @@ -19,7 +19,7 @@ go_library( deps = [ "//staging/src/k8s.io/apiextensions-apiserver/pkg/cmd/server:go_default_library", "//staging/src/k8s.io/apiserver/pkg/server:go_default_library", - "//staging/src/k8s.io/apiserver/pkg/util/logs:go_default_library", + "//staging/src/k8s.io/component-base/logs:go_default_library", "//vendor/k8s.io/klog:go_default_library", ], ) diff --git a/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json b/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json index 1be06bd1f7..c3325366f2 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json +++ b/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json @@ -1626,10 +1626,6 @@ "ImportPath": "k8s.io/apiserver/pkg/util/flushwriter", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, - { - "ImportPath": "k8s.io/apiserver/pkg/util/logs", - "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" - }, { "ImportPath": "k8s.io/apiserver/pkg/util/openapi", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" @@ -2266,6 +2262,10 @@ "ImportPath": "k8s.io/client-go/util/retry", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, + { + "ImportPath": "k8s.io/component-base/logs", + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, { "ImportPath": "k8s.io/klog", "Rev": "8139d8cb77af419532b33dfa7dd09fbc5f1d344f" @@ -2510,10 +2510,6 @@ "ImportPath": "k8s.io/apiserver/pkg/util/feature/testing", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, - { - "ImportPath": "k8s.io/apiserver/pkg/util/logs", - "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" - }, { "ImportPath": "k8s.io/apiserver/pkg/util/proxy", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" @@ -2582,6 +2578,10 @@ "ImportPath": "k8s.io/client-go/util/workqueue", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, + { + "ImportPath": "k8s.io/component-base/logs", + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, { "ImportPath": "sigs.k8s.io/yaml", "Rev": "fd68e9863619f6ec2fdd8625fe1f02e7c877e480" diff --git a/staging/src/k8s.io/apiserver/Godeps/Godeps.json b/staging/src/k8s.io/apiserver/Godeps/Godeps.json index fa37b2f7a5..7621098313 100644 --- a/staging/src/k8s.io/apiserver/Godeps/Godeps.json +++ b/staging/src/k8s.io/apiserver/Godeps/Godeps.json @@ -2070,6 +2070,10 @@ "ImportPath": "k8s.io/client-go/util/flowcontrol", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, + { + "ImportPath": "k8s.io/component-base/logs", + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, { "ImportPath": "k8s.io/utils/pointer", "Rev": "8e7ff06bf0e2d3289061230af203e430a15b6dcc" diff --git a/staging/src/k8s.io/apiserver/pkg/server/BUILD b/staging/src/k8s.io/apiserver/pkg/server/BUILD index 94c5c867a2..e66dd2298a 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/server/BUILD @@ -102,11 +102,11 @@ go_library( "//staging/src/k8s.io/apiserver/pkg/server/routes:go_default_library", "//staging/src/k8s.io/apiserver/pkg/server/storage:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", - "//staging/src/k8s.io/apiserver/pkg/util/logs:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/openapi:go_default_library", "//staging/src/k8s.io/client-go/informers:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/client-go/util/cert:go_default_library", + "//staging/src/k8s.io/component-base/logs:go_default_library", "//vendor/github.com/coreos/go-systemd/daemon:go_default_library", "//vendor/github.com/emicklei/go-restful:go_default_library", "//vendor/github.com/go-openapi/spec:go_default_library", diff --git a/staging/src/k8s.io/apiserver/pkg/util/globalflag/BUILD b/staging/src/k8s.io/apiserver/pkg/util/globalflag/BUILD index 9600afb0b4..7b8b694d5e 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/globalflag/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/util/globalflag/BUILD @@ -7,7 +7,7 @@ go_library( importpath = "k8s.io/apiserver/pkg/util/globalflag", visibility = ["//visibility:public"], deps = [ - "//staging/src/k8s.io/apiserver/pkg/util/logs:go_default_library", + "//staging/src/k8s.io/component-base/logs:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", ], ) diff --git a/staging/src/k8s.io/component-base/Godeps/Godeps.json b/staging/src/k8s.io/component-base/Godeps/Godeps.json index ad0610ba59..7bf2c4ed9b 100644 --- a/staging/src/k8s.io/component-base/Godeps/Godeps.json +++ b/staging/src/k8s.io/component-base/Godeps/Godeps.json @@ -18,6 +18,10 @@ "ImportPath": "github.com/google/gofuzz", "Rev": "44d81051d367757e1c7c6a5a86423ece9afcf63c" }, + { + "ImportPath": "github.com/spf13/pflag", + "Rev": "583c0c0531f06d5278b7d917446061adc344b5cd" + }, { "ImportPath": "golang.org/x/net/http2", "Rev": "0ed95abb35c445290478a5348a7b38bb154135fd" @@ -130,6 +134,10 @@ "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, + { + "ImportPath": "k8s.io/apimachinery/pkg/util/wait", + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, { "ImportPath": "k8s.io/apimachinery/pkg/watch", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" diff --git a/staging/src/k8s.io/apiserver/pkg/util/logs/BUILD b/staging/src/k8s.io/component-base/logs/BUILD similarity index 83% rename from staging/src/k8s.io/apiserver/pkg/util/logs/BUILD rename to staging/src/k8s.io/component-base/logs/BUILD index d51cc64392..162763199e 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/logs/BUILD +++ b/staging/src/k8s.io/component-base/logs/BUILD @@ -8,8 +8,8 @@ load( go_library( name = "go_default_library", srcs = ["logs.go"], - importmap = "k8s.io/kubernetes/vendor/k8s.io/apiserver/pkg/util/logs", - importpath = "k8s.io/apiserver/pkg/util/logs", + importmap = "k8s.io/kubernetes/vendor/k8s.io/component-base/logs", + importpath = "k8s.io/component-base/logs", deps = [ "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", diff --git a/staging/src/k8s.io/kube-aggregator/BUILD b/staging/src/k8s.io/kube-aggregator/BUILD index 99bf2540e2..229d53ddd8 100644 --- a/staging/src/k8s.io/kube-aggregator/BUILD +++ b/staging/src/k8s.io/kube-aggregator/BUILD @@ -21,7 +21,7 @@ go_library( importpath = "k8s.io/kube-aggregator", deps = [ "//staging/src/k8s.io/apiserver/pkg/server:go_default_library", - "//staging/src/k8s.io/apiserver/pkg/util/logs:go_default_library", + "//staging/src/k8s.io/component-base/logs:go_default_library", "//staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/install:go_default_library", "//staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/validation:go_default_library", "//staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset:go_default_library", diff --git a/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json b/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json index 555dd09fbf..6e5f363085 100644 --- a/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json +++ b/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json @@ -1214,10 +1214,6 @@ "ImportPath": "k8s.io/apiserver/pkg/util/flushwriter", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, - { - "ImportPath": "k8s.io/apiserver/pkg/util/logs", - "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" - }, { "ImportPath": "k8s.io/apiserver/pkg/util/openapi", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" @@ -1830,6 +1826,10 @@ "ImportPath": "k8s.io/client-go/util/workqueue", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, + { + "ImportPath": "k8s.io/component-base/logs", + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, { "ImportPath": "k8s.io/klog", "Rev": "8139d8cb77af419532b33dfa7dd09fbc5f1d344f" diff --git a/staging/src/k8s.io/sample-apiserver/BUILD b/staging/src/k8s.io/sample-apiserver/BUILD index cf5033eb6c..1a61b65ff3 100644 --- a/staging/src/k8s.io/sample-apiserver/BUILD +++ b/staging/src/k8s.io/sample-apiserver/BUILD @@ -18,7 +18,7 @@ go_library( importpath = "k8s.io/sample-apiserver", deps = [ "//staging/src/k8s.io/apiserver/pkg/server:go_default_library", - "//staging/src/k8s.io/apiserver/pkg/util/logs:go_default_library", + "//staging/src/k8s.io/component-base/logs:go_default_library", "//staging/src/k8s.io/sample-apiserver/pkg/cmd/server:go_default_library", "//vendor/k8s.io/klog:go_default_library", ], diff --git a/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json b/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json index 30a0785e15..1efdc940e1 100644 --- a/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json +++ b/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json @@ -1178,10 +1178,6 @@ "ImportPath": "k8s.io/apiserver/pkg/util/flushwriter", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, - { - "ImportPath": "k8s.io/apiserver/pkg/util/logs", - "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" - }, { "ImportPath": "k8s.io/apiserver/pkg/util/openapi", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" @@ -1786,6 +1782,10 @@ "ImportPath": "k8s.io/client-go/util/retry", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, + { + "ImportPath": "k8s.io/component-base/logs", + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, { "ImportPath": "k8s.io/klog", "Rev": "8139d8cb77af419532b33dfa7dd09fbc5f1d344f" diff --git a/test/e2e/BUILD b/test/e2e/BUILD index 39df2a3a2f..2939f54c7a 100644 --- a/test/e2e/BUILD +++ b/test/e2e/BUILD @@ -55,9 +55,9 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/util/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library", "//staging/src/k8s.io/apiserver/pkg/authentication/serviceaccount:go_default_library", - "//staging/src/k8s.io/apiserver/pkg/util/logs:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//staging/src/k8s.io/client-go/plugin/pkg/client/auth:go_default_library", + "//staging/src/k8s.io/component-base/logs:go_default_library", "//test/e2e/common:go_default_library", "//test/e2e/framework:go_default_library", "//test/e2e/framework/ginkgowrapper:go_default_library", diff --git a/test/images/no-snat-test-proxy/BUILD b/test/images/no-snat-test-proxy/BUILD index 6be4abefe0..d44716ab4f 100644 --- a/test/images/no-snat-test-proxy/BUILD +++ b/test/images/no-snat-test-proxy/BUILD @@ -17,7 +17,7 @@ go_library( importpath = "k8s.io/kubernetes/test/images/no-snat-test-proxy", deps = [ "//staging/src/k8s.io/apiserver/pkg/util/flag:go_default_library", - "//staging/src/k8s.io/apiserver/pkg/util/logs:go_default_library", + "//staging/src/k8s.io/component-base/logs:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", ], ) diff --git a/test/images/no-snat-test/BUILD b/test/images/no-snat-test/BUILD index b5ff6b4a45..a0a013a3ec 100644 --- a/test/images/no-snat-test/BUILD +++ b/test/images/no-snat-test/BUILD @@ -17,7 +17,7 @@ go_library( importpath = "k8s.io/kubernetes/test/images/no-snat-test", deps = [ "//staging/src/k8s.io/apiserver/pkg/util/flag:go_default_library", - "//staging/src/k8s.io/apiserver/pkg/util/logs:go_default_library", + "//staging/src/k8s.io/component-base/logs:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", ], )