github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

move logs into component-base 

all the code changes to move move /apiserver/pkg/util/logs into /component-base/logs
pull/564/head
Marek Counts 2019-01-17 09:06:12 -05:00
parent af31a202ea
commit ba81a5409a
19 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/cloud-controller-manager/controller-manager.go
View File

@ -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"

2
cmd/hyperkube/main.go
View File

@ -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"

2
cmd/kube-apiserver/apiserver.go
View File

@ -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

2
cmd/kube-controller-manager/controller-manager.go
View File

@ -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

2
cmd/kube-proxy/proxy.go
View File

@ -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

2
cmd/kube-scheduler/scheduler.go
View File

@ -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

2
cmd/kubelet/app/options/globalflags.go
View File

@ -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

2
cmd/kubelet/kubelet.go
View File

@ -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

4
cmd/kubemark/hollow-node.go
View File

@ -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"

6
pkg/kubelet/server/server.go
View File

@ -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"

2
staging/src/k8s.io/apiextensions-apiserver/main.go
View File

@ -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() {

2
staging/src/k8s.io/apiserver/pkg/server/config.go
View File

@ -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

2
staging/src/k8s.io/apiserver/pkg/util/globalflag/globalflags.go
View File

@ -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

0
staging/src/k8s.io/apiserver/pkg/util/logs/logs.go → staging/src/k8s.io/component-base/logs/logs.go
View File

2
staging/src/k8s.io/kube-aggregator/main.go
View File

@ -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

2
staging/src/k8s.io/sample-apiserver/main.go
View File

@ -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"
)

2
test/e2e/e2e.go
View File

@ -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"

2
test/images/no-snat-test-proxy/main.go
View File

@ -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}

2
test/images/no-snat-test/main.go
View File

@ -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