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

run gofmt on everything we touched

pull/6/head
Mike Danese 2015-08-05 15:05:17 -07:00
parent 62a4d5623c
commit 17defc7383
188 changed files with 280 additions and 280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/addons/dns/kube2sky/kube2sky.go
View File

@ -31,6 +31,9 @@ import (
"sync"
"time"
etcd "github.com/coreos/go-etcd/etcd"
"github.com/golang/glog"
skymsg "github.com/skynetservices/skydns/msg"
kapi "k8s.io/kubernetes/pkg/api"
kclient "k8s.io/kubernetes/pkg/client"
kcache "k8s.io/kubernetes/pkg/client/cache"
@ -40,9 +43,6 @@ import (
etcdstorage "k8s.io/kubernetes/pkg/storage/etcd"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/wait"
etcd "github.com/coreos/go-etcd/etcd"
"github.com/golang/glog"
skymsg "github.com/skynetservices/skydns/msg"
)
var (

4
cluster/addons/dns/kube2sky/kube2sky_test.go
View File

@ -25,11 +25,11 @@ import (
"testing"
"time"
kapi "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client/cache"
"github.com/coreos/go-etcd/etcd"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
kapi "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client/cache"
)
type fakeEtcdClient struct {

2
cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go
View File

@ -22,9 +22,9 @@ import (
"strings"
"time"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client"
"github.com/golang/glog"
)
func flattenSubsets(subsets []api.EndpointSubset) []string {

2
cluster/addons/kube-ui/image/kube-ui.go
View File

@ -23,8 +23,8 @@ import (
"mime"
"net/http"
"k8s.io/kubernetes/pkg/ui/data/dashboard"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/ui/data/dashboard"
assetfs "github.com/elazarl/go-bindata-assetfs"
)

2
cmd/gendocs/gen_kubectl_docs.go
View File

@ -21,10 +21,10 @@ import (
"io/ioutil"
"os"
"github.com/spf13/cobra"
"k8s.io/kubernetes/cmd/genutils"
"k8s.io/kubernetes/pkg/kubectl/cmd"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"github.com/spf13/cobra"
)
func main() {

6
cmd/genman/gen_kubectl_man.go
View File

@ -23,12 +23,12 @@ import (
"os"
"strings"
"k8s.io/kubernetes/cmd/genutils"
"k8s.io/kubernetes/pkg/kubectl/cmd"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
mangen "github.com/cpuguy83/go-md2man/md2man"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"k8s.io/kubernetes/cmd/genutils"
"k8s.io/kubernetes/pkg/kubectl/cmd"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
)
func main() {

2
cmd/integration/integration.go
View File

@ -33,6 +33,7 @@ import (
"sync"
"time"
docker "github.com/fsouza/go-dockerclient"
kubeletapp "k8s.io/kubernetes/cmd/kubelet/app"
"k8s.io/kubernetes/pkg/api"
apierrors "k8s.io/kubernetes/pkg/api/errors"
@ -61,7 +62,6 @@ import (
_ "k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider"
"k8s.io/kubernetes/plugin/pkg/scheduler/factory"
"k8s.io/kubernetes/test/e2e"
docker "github.com/fsouza/go-dockerclient"
"github.com/coreos/go-etcd/etcd"
"github.com/golang/glog"

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

@ -30,6 +30,7 @@ import (
"strings"
"time"
systemd "github.com/coreos/go-systemd/daemon"
"k8s.io/kubernetes/pkg/admission"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/latest"
@ -45,7 +46,6 @@ import (
"k8s.io/kubernetes/pkg/tools"
"k8s.io/kubernetes/pkg/util"
forked "k8s.io/kubernetes/third_party/forked/coreos/go-etcd/etcd"
systemd "github.com/coreos/go-systemd/daemon"
"github.com/coreos/go-etcd/etcd"
"github.com/golang/glog"

2
cmd/kubelet/app/server.go
View File

@ -54,9 +54,9 @@ import (
nodeutil "k8s.io/kubernetes/pkg/util/node"
"k8s.io/kubernetes/pkg/volume"
"k8s.io/kubernetes/pkg/cloudprovider"
"github.com/golang/glog"
"github.com/spf13/pflag"
"k8s.io/kubernetes/pkg/cloudprovider"
)
const defaultRootDir = "/var/lib/kubelet"

2
contrib/mesos/cmd/k8sm-executor/main.go
View File

@ -21,11 +21,11 @@ import (
"os"
"runtime"
"github.com/spf13/pflag"
"k8s.io/kubernetes/contrib/mesos/pkg/executor/service"
"k8s.io/kubernetes/contrib/mesos/pkg/hyperkube"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/version/verflag"
"github.com/spf13/pflag"
)
func main() {

2
contrib/mesos/cmd/k8sm-scheduler/main.go
View File

@ -21,11 +21,11 @@ import (
"os"
"runtime"
"github.com/spf13/pflag"
"k8s.io/kubernetes/contrib/mesos/pkg/hyperkube"
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/service"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/version/verflag"
"github.com/spf13/pflag"
)
func main() {

4
contrib/mesos/pkg/election/etcd_master.go
View File

@ -20,12 +20,12 @@ import (
"fmt"
"time"
"github.com/coreos/go-etcd/etcd"
"github.com/golang/glog"
etcdstorage "k8s.io/kubernetes/pkg/storage/etcd"
"k8s.io/kubernetes/pkg/tools"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/watch"
"github.com/coreos/go-etcd/etcd"
"github.com/golang/glog"
)
// Master is used to announce the current elected master.

2
contrib/mesos/pkg/election/etcd_master_test.go
View File

@ -19,9 +19,9 @@ package election
import (
"testing"
"github.com/coreos/go-etcd/etcd"
"k8s.io/kubernetes/pkg/tools"
"k8s.io/kubernetes/pkg/watch"
"github.com/coreos/go-etcd/etcd"
)
func TestEtcdMasterOther(t *testing.T) {

12
contrib/mesos/pkg/executor/executor.go
View File

@ -25,6 +25,12 @@ import (
"sync/atomic"
"time"
"github.com/fsouza/go-dockerclient"
"github.com/gogo/protobuf/proto"
log "github.com/golang/glog"
bindings "github.com/mesos/mesos-go/executor"
mesos "github.com/mesos/mesos-go/mesosproto"
mutil "github.com/mesos/mesos-go/mesosutil"
"k8s.io/kubernetes/contrib/mesos/pkg/archive"
"k8s.io/kubernetes/contrib/mesos/pkg/executor/messages"
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/meta"
@ -35,12 +41,6 @@ import (
"k8s.io/kubernetes/pkg/kubelet/dockertools"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/watch"
"github.com/fsouza/go-dockerclient"
"github.com/gogo/protobuf/proto"
log "github.com/golang/glog"
bindings "github.com/mesos/mesos-go/executor"
mesos "github.com/mesos/mesos-go/mesosproto"
mutil "github.com/mesos/mesos-go/mesosutil"
)
const (

2
contrib/mesos/pkg/executor/mock_test.go
View File

@ -19,10 +19,10 @@ package executor
import (
"testing"
"k8s.io/kubernetes/pkg/kubelet/dockertools"
"github.com/mesos/mesos-go/mesosproto"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"k8s.io/kubernetes/pkg/kubelet/dockertools"
)
type MockExecutorDriver struct {

4
contrib/mesos/pkg/executor/service/service.go
View File

@ -30,6 +30,8 @@ import (
"sync"
"time"
log "github.com/golang/glog"
bindings "github.com/mesos/mesos-go/executor"
"k8s.io/kubernetes/cmd/kubelet/app"
"k8s.io/kubernetes/contrib/mesos/pkg/executor"
"k8s.io/kubernetes/contrib/mesos/pkg/executor/config"
@ -45,8 +47,6 @@ import (
"k8s.io/kubernetes/pkg/kubelet/dockertools"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/mount"
log "github.com/golang/glog"
bindings "github.com/mesos/mesos-go/executor"
"github.com/spf13/pflag"
)

4
contrib/mesos/pkg/offers/offers.go
View File

@ -23,14 +23,14 @@ import (
"sync/atomic"
"time"
log "github.com/golang/glog"
mesos "github.com/mesos/mesos-go/mesosproto"
"k8s.io/kubernetes/contrib/mesos/pkg/offers/metrics"
"k8s.io/kubernetes/contrib/mesos/pkg/proc"
"k8s.io/kubernetes/contrib/mesos/pkg/queue"
"k8s.io/kubernetes/contrib/mesos/pkg/runtime"
"k8s.io/kubernetes/pkg/client/cache"
"k8s.io/kubernetes/pkg/util"
log "github.com/golang/glog"
mesos "github.com/mesos/mesos-go/mesosproto"
)
const (

2
contrib/mesos/pkg/offers/offers_test.go
View File

@ -22,9 +22,9 @@ import (
"testing"
"time"
"k8s.io/kubernetes/contrib/mesos/pkg/proc"
mesos "github.com/mesos/mesos-go/mesosproto"
util "github.com/mesos/mesos-go/mesosutil"
"k8s.io/kubernetes/contrib/mesos/pkg/proc"
)
func TestExpiredOffer(t *testing.T) {

2
contrib/mesos/pkg/proc/proc.go
View File

@ -22,8 +22,8 @@ import (
"sync/atomic"
"time"
"k8s.io/kubernetes/contrib/mesos/pkg/runtime"
log "github.com/golang/glog"
"k8s.io/kubernetes/contrib/mesos/pkg/runtime"
)
const (

2
contrib/mesos/pkg/proc/proc_test.go
View File

@ -22,8 +22,8 @@ import (
"testing"
"time"
"k8s.io/kubernetes/contrib/mesos/pkg/runtime"
log "github.com/golang/glog"
"k8s.io/kubernetes/contrib/mesos/pkg/runtime"
)
// logs a testing.Fatalf if the elapsed time d passes before signal chan done is closed

2
contrib/mesos/pkg/runtime/metrics.go
View File

@ -19,8 +19,8 @@ package runtime
import (
"sync"
"k8s.io/kubernetes/pkg/util"
"github.com/prometheus/client_golang/prometheus"
"k8s.io/kubernetes/pkg/util"
)
const (

2
contrib/mesos/pkg/scheduler/ha/election.go
View File

@ -17,8 +17,8 @@ limitations under the License.
package ha
import (
"k8s.io/kubernetes/contrib/mesos/pkg/election"
log "github.com/golang/glog"
"k8s.io/kubernetes/contrib/mesos/pkg/election"
)
type roleType int

4
contrib/mesos/pkg/scheduler/ha/ha.go
View File

@ -20,11 +20,11 @@ import (
"fmt"
"sync/atomic"
"k8s.io/kubernetes/contrib/mesos/pkg/proc"
"k8s.io/kubernetes/contrib/mesos/pkg/runtime"
log "github.com/golang/glog"
mesos "github.com/mesos/mesos-go/mesosproto"
bindings "github.com/mesos/mesos-go/scheduler"
"k8s.io/kubernetes/contrib/mesos/pkg/proc"
"k8s.io/kubernetes/contrib/mesos/pkg/runtime"
)
type DriverFactory func() (bindings.SchedulerDriver, error)

4
contrib/mesos/pkg/scheduler/mock_test.go
View File

@ -20,11 +20,11 @@ import (
"sync"
"testing"
mesos "github.com/mesos/mesos-go/mesosproto"
"github.com/stretchr/testify/mock"
"k8s.io/kubernetes/contrib/mesos/pkg/offers"
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask"
"k8s.io/kubernetes/pkg/api"
mesos "github.com/mesos/mesos-go/mesosproto"
"github.com/stretchr/testify/mock"
)
// implements SchedulerInterface

6
contrib/mesos/pkg/scheduler/plugin.go
View File

@ -24,6 +24,9 @@ import (
"sync"
"time"
log "github.com/golang/glog"
mesos "github.com/mesos/mesos-go/mesosproto"
mutil "github.com/mesos/mesos-go/mesosutil"
"k8s.io/kubernetes/contrib/mesos/pkg/backoff"
"k8s.io/kubernetes/contrib/mesos/pkg/offers"
"k8s.io/kubernetes/contrib/mesos/pkg/queue"
@ -40,9 +43,6 @@ import (
"k8s.io/kubernetes/pkg/util"
plugin "k8s.io/kubernetes/plugin/pkg/scheduler"
"k8s.io/kubernetes/plugin/pkg/scheduler/algorithm"
log "github.com/golang/glog"
mesos "github.com/mesos/mesos-go/mesosproto"
mutil "github.com/mesos/mesos-go/mesosutil"
)
const (

12
contrib/mesos/pkg/scheduler/plugin_test.go
View File

@ -32,6 +32,12 @@ import (
kutil "k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/watch"
log "github.com/golang/glog"
mesos "github.com/mesos/mesos-go/mesosproto"
util "github.com/mesos/mesos-go/mesosutil"
bindings "github.com/mesos/mesos-go/scheduler"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
assertext "k8s.io/kubernetes/contrib/mesos/pkg/assert"
"k8s.io/kubernetes/contrib/mesos/pkg/executor/messages"
"k8s.io/kubernetes/contrib/mesos/pkg/queue"
@ -40,12 +46,6 @@ import (
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/meta"
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask"
mresource "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/resource"
log "github.com/golang/glog"
mesos "github.com/mesos/mesos-go/mesosproto"
util "github.com/mesos/mesos-go/mesosutil"
bindings "github.com/mesos/mesos-go/scheduler"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
// A apiserver mock which partially mocks the pods API

4
contrib/mesos/pkg/scheduler/podtask/pod_task.go
View File

@ -21,13 +21,13 @@ import (
"strings"
"time"
"github.com/gogo/protobuf/proto"
"github.com/pborman/uuid"
"k8s.io/kubernetes/contrib/mesos/pkg/offers"
annotation "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/meta"
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/metrics"
mresource "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/resource"
"k8s.io/kubernetes/pkg/api"
"github.com/gogo/protobuf/proto"
"github.com/pborman/uuid"
log "github.com/golang/glog"
mesos "github.com/mesos/mesos-go/mesosproto"

4
contrib/mesos/pkg/scheduler/podtask/pod_task_test.go
View File

@ -19,11 +19,11 @@ package podtask
import (
"testing"
mesos "github.com/mesos/mesos-go/mesosproto"
mutil "github.com/mesos/mesos-go/mesosutil"
mresource "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/resource"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/resource"
mesos "github.com/mesos/mesos-go/mesosproto"
mutil "github.com/mesos/mesos-go/mesosutil"
"github.com/stretchr/testify/assert"
)

4
contrib/mesos/pkg/scheduler/podtask/port_mapping.go
View File

@ -19,10 +19,10 @@ package podtask
import (
"fmt"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/labels"
log "github.com/golang/glog"
mesos "github.com/mesos/mesos-go/mesosproto"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/labels"
)
type HostPortMappingType string

2
contrib/mesos/pkg/scheduler/podtask/port_mapping_test.go
View File

@ -19,8 +19,8 @@ package podtask
import (
"testing"
"k8s.io/kubernetes/pkg/api"
mesos "github.com/mesos/mesos-go/mesosproto"
"k8s.io/kubernetes/pkg/api"
)
func TestDefaultHostPortMatching(t *testing.T) {

4
contrib/mesos/pkg/scheduler/podtask/registry.go
View File

@ -23,10 +23,10 @@ import (
"sync"
"time"
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/metrics"
"k8s.io/kubernetes/pkg/api"
log "github.com/golang/glog"
mesos "github.com/mesos/mesos-go/mesosproto"
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/metrics"
"k8s.io/kubernetes/pkg/api"
)
const (

4
contrib/mesos/pkg/scheduler/podtask/registry_test.go
View File

@ -20,11 +20,11 @@ import (
"testing"
"time"
"k8s.io/kubernetes/contrib/mesos/pkg/offers"
"k8s.io/kubernetes/contrib/mesos/pkg/proc"
mesos "github.com/mesos/mesos-go/mesosproto"
"github.com/mesos/mesos-go/mesosutil"
"github.com/stretchr/testify/assert"
"k8s.io/kubernetes/contrib/mesos/pkg/offers"
"k8s.io/kubernetes/contrib/mesos/pkg/proc"
)
func TestInMemoryRegistry_RegisterGetUnregister(t *testing.T) {

8
contrib/mesos/pkg/scheduler/scheduler.go
View File

@ -25,6 +25,10 @@ import (
"sync"
"time"
log "github.com/golang/glog"
mesos "github.com/mesos/mesos-go/mesosproto"
mutil "github.com/mesos/mesos-go/mesosutil"
bindings "github.com/mesos/mesos-go/scheduler"
execcfg "k8s.io/kubernetes/contrib/mesos/pkg/executor/config"
"k8s.io/kubernetes/contrib/mesos/pkg/executor/messages"
"k8s.io/kubernetes/contrib/mesos/pkg/offers"
@ -45,10 +49,6 @@ import (
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/tools"
"k8s.io/kubernetes/pkg/util"
log "github.com/golang/glog"
mesos "github.com/mesos/mesos-go/mesosproto"
mutil "github.com/mesos/mesos-go/mesosutil"
bindings "github.com/mesos/mesos-go/scheduler"
)
type Slave struct {

6
contrib/mesos/pkg/scheduler/scheduler_test.go
View File

@ -19,13 +19,13 @@ package scheduler
import (
"testing"
mesos "github.com/mesos/mesos-go/mesosproto"
util "github.com/mesos/mesos-go/mesosutil"
"github.com/stretchr/testify/assert"
"k8s.io/kubernetes/contrib/mesos/pkg/offers"
"k8s.io/kubernetes/contrib/mesos/pkg/proc"
schedcfg "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/config"
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask"
mesos "github.com/mesos/mesos-go/mesosproto"
util "github.com/mesos/mesos-go/mesosutil"
"github.com/stretchr/testify/assert"
)
// Check that same slave is only added once.

26
contrib/mesos/pkg/scheduler/service/service.go
View File

@ -32,6 +32,19 @@ import (
"sync"
"time"
"github.com/coreos/go-etcd/etcd"
"github.com/gogo/protobuf/proto"
log "github.com/golang/glog"
"github.com/kardianos/osext"
"github.com/mesos/mesos-go/auth"
"github.com/mesos/mesos-go/auth/sasl"
"github.com/mesos/mesos-go/auth/sasl/mech"
mesos "github.com/mesos/mesos-go/mesosproto"
mutil "github.com/mesos/mesos-go/mesosutil"
bindings "github.com/mesos/mesos-go/scheduler"
"github.com/prometheus/client_golang/prometheus"
"github.com/spf13/pflag"
"golang.org/x/net/context"
"k8s.io/kubernetes/contrib/mesos/pkg/archive"
"k8s.io/kubernetes/contrib/mesos/pkg/election"
execcfg "k8s.io/kubernetes/contrib/mesos/pkg/executor/config"
@ -54,19 +67,6 @@ import (
etcdstorage "k8s.io/kubernetes/pkg/storage/etcd"
"k8s.io/kubernetes/pkg/tools"
"k8s.io/kubernetes/pkg/util"
"github.com/coreos/go-etcd/etcd"
"github.com/gogo/protobuf/proto"
log "github.com/golang/glog"
"github.com/kardianos/osext"
"github.com/mesos/mesos-go/auth"
"github.com/mesos/mesos-go/auth/sasl"
"github.com/mesos/mesos-go/auth/sasl/mech"
mesos "github.com/mesos/mesos-go/mesosproto"
mutil "github.com/mesos/mesos-go/mesosutil"
bindings "github.com/mesos/mesos-go/scheduler"
"github.com/prometheus/client_golang/prometheus"
"github.com/spf13/pflag"
"golang.org/x/net/context"
)
const (

4
contrib/service-loadbalancer/service_loadbalancer.go
View File

@ -30,6 +30,8 @@ import (
"text/template"
"time"
"github.com/golang/glog"
flag "github.com/spf13/pflag"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client"
"k8s.io/kubernetes/pkg/client/cache"
@ -38,8 +40,6 @@ import (
kubectl_util "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/workqueue"
"github.com/golang/glog"
flag "github.com/spf13/pflag"
)
const (

2
examples/elasticsearch/elasticsearch_discovery.go
View File

@ -23,11 +23,11 @@ import (
"strings"
"time"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client"
"k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/labels"
"github.com/golang/glog"
)
var (

2
examples/examples_test.go
View File

@ -25,6 +25,7 @@ import (
"strings"
"testing"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/latest"
"k8s.io/kubernetes/pkg/api/validation"
@ -33,7 +34,6 @@ import (
"k8s.io/kubernetes/pkg/util/yaml"
schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api"
schedulerapilatest "k8s.io/kubernetes/plugin/pkg/scheduler/api/latest"
"github.com/golang/glog"
)
func validateObject(obj runtime.Object) (errors []error) {

2
examples/https-nginx/make_secret.go
View File

@ -23,10 +23,10 @@ package main
import (
"flag"
"fmt"
"io/ioutil"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/latest"
"k8s.io/kubernetes/pkg/runtime"
"io/ioutil"
"log"
)

2
pkg/admission/plugins.go
View File

@ -21,8 +21,8 @@ import (
"os"
"sync"
"k8s.io/kubernetes/pkg/client"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/client"
)
// Factory is a function that returns an Interface for admission decisions.

2
pkg/api/context.go
View File

@ -19,8 +19,8 @@ package api
import (
stderrs "errors"
"k8s.io/kubernetes/pkg/auth/user"
"golang.org/x/net/context"
"k8s.io/kubernetes/pkg/auth/user"
)
// Context carries values across API boundaries.

2
pkg/api/endpoints/util_test.go
View File

@ -20,8 +20,8 @@ import (
"reflect"
"testing"
"k8s.io/kubernetes/pkg/api"
"github.com/davecgh/go-spew/spew"
"k8s.io/kubernetes/pkg/api"
)
func TestPackSubsets(t *testing.T) {

2
pkg/api/rest/resttest/resttest.go
View File

@ -20,13 +20,13 @@ import (
"strings"
"testing"
"github.com/coreos/go-etcd/etcd"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/rest"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/tools"
"k8s.io/kubernetes/pkg/util"
"github.com/coreos/go-etcd/etcd"
)
type Tester struct {

2
pkg/api/serialization_test.go
View File

@ -23,6 +23,7 @@ import (
"reflect"
"testing"
"github.com/davecgh/go-spew/spew"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/latest"
"k8s.io/kubernetes/pkg/api/meta"
@ -30,7 +31,6 @@ import (
apitesting "k8s.io/kubernetes/pkg/api/testing"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util"
"github.com/davecgh/go-spew/spew"
flag "github.com/spf13/pflag"
)

2
pkg/api/testing/fuzzer.go
View File

@ -22,6 +22,7 @@ import (
"strconv"
"testing"
docker "github.com/fsouza/go-dockerclient"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/registered"
"k8s.io/kubernetes/pkg/api/resource"
@ -30,7 +31,6 @@ import (
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/types"
"k8s.io/kubernetes/pkg/util"
docker "github.com/fsouza/go-dockerclient"
"github.com/google/gofuzz"
"speter.net/go/exp/math/dec/inf"

4
pkg/api/validation/schema.go
View File

@ -22,11 +22,11 @@ import (
"reflect"
"strings"
"github.com/emicklei/go-restful/swagger"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/util/errors"
errs "k8s.io/kubernetes/pkg/util/fielderrors"
"k8s.io/kubernetes/pkg/util/yaml"
"github.com/emicklei/go-restful/swagger"
"github.com/golang/glog"
)
type InvalidTypeError struct {

2
pkg/apiserver/handlers.go
View File

@ -28,13 +28,13 @@ import (
"sync"
"time"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/meta"
"k8s.io/kubernetes/pkg/auth/authorizer"
"k8s.io/kubernetes/pkg/httplog"
"k8s.io/kubernetes/pkg/util"
"github.com/golang/glog"
)
// specialVerbs contains just strings which are used in REST paths for special actions that don't fall under the normal

2
pkg/apiserver/proxy.go
View File

@ -39,8 +39,8 @@ import (
"k8s.io/kubernetes/pkg/util/httpstream"
proxyutil "k8s.io/kubernetes/pkg/util/proxy"
"k8s.io/kubernetes/third_party/golang/netutil"
"github.com/golang/glog"
"k8s.io/kubernetes/third_party/golang/netutil"
)
// ProxyHandler provides a http.Handler which will proxy traffic to locations

2
pkg/apiserver/proxy_test.go
View File

@ -27,8 +27,8 @@ import (
"strings"
"testing"
"k8s.io/kubernetes/pkg/api/rest"
"golang.org/x/net/websocket"
"k8s.io/kubernetes/pkg/api/rest"
)
func TestProxy(t *testing.T) {

2
pkg/apiserver/watch_test.go
View File

@ -26,13 +26,13 @@ import (
"testing"
"time"
"golang.org/x/net/websocket"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/rest"
"k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/watch"
"golang.org/x/net/websocket"
)
// watchJSON defines the expected JSON wire equivalent of watch.Event

2
pkg/auth/handlers/handlers.go
View File

@ -19,9 +19,9 @@ package handlers
import (
"net/http"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/auth/authenticator"
"github.com/golang/glog"
)
// NewRequestAuthenticator creates an http handler that tries to authenticate the given request as a user, and then

2
pkg/client/cache/expiration_cache.go vendored
View File

@ -17,8 +17,8 @@ limitations under the License.
package cache
import (
"k8s.io/kubernetes/pkg/util"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/util"
"time"
)

2
pkg/client/cache/listers.go vendored
View File

@ -19,9 +19,9 @@ package cache
import (
"fmt"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/labels"
"github.com/golang/glog"
)
// TODO: generate these classes and methods for all resources of interest using

2
pkg/client/cache/poller.go vendored
View File

@ -19,8 +19,8 @@ package cache
import (
"time"
"k8s.io/kubernetes/pkg/util"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/util"
)
// Enumerator should be able to return the list of objects to be synced with

2
pkg/client/cache/reflector.go vendored
View File

@ -29,12 +29,12 @@ import (
"syscall"
"time"
"github.com/golang/glog"
apierrs "k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/meta"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/watch"
"github.com/golang/glog"
)
// ListerWatcher is any object that knows how to perform an initial list and start a watch on a resource.

2
pkg/client/helper.go
View File

@ -29,12 +29,12 @@ import (
"strings"
"time"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/latest"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/version"
"github.com/golang/glog"
)
// Config holds the common attributes that can be passed to a Kubernetes client on

2
pkg/client/portforward/portforward.go
View File

@ -26,11 +26,11 @@ import (
"strconv"
"strings"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client"
"k8s.io/kubernetes/pkg/util/httpstream"
"k8s.io/kubernetes/pkg/util/httpstream/spdy"
"github.com/golang/glog"
)
type upgrader interface {

2
pkg/client/record/events_cache.go
View File

@ -19,9 +19,9 @@ package record
import (
"sync"
"github.com/golang/groupcache/lru"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/util"
"github.com/golang/groupcache/lru"
)
type history struct {

2
pkg/client/remotecommand/remotecommand.go
View File

@ -22,13 +22,13 @@ import (
"io/ioutil"
"net/http"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client"
"k8s.io/kubernetes/pkg/conversion/queryparams"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util/httpstream"
"k8s.io/kubernetes/pkg/util/httpstream/spdy"
"github.com/golang/glog"
)
type upgrader interface {

2
pkg/client/request.go
View File

@ -30,6 +30,7 @@ import (
"strings"
"time"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/client/metrics"
@ -40,7 +41,6 @@ import (
"k8s.io/kubernetes/pkg/util/httpstream"
"k8s.io/kubernetes/pkg/watch"
watchjson "k8s.io/kubernetes/pkg/watch/json"
"github.com/golang/glog"
)
// specialParams lists parameters that are handled specially and which users of Request

2
pkg/cloudprovider/aws/aws_routes.go
View File

@ -18,9 +18,9 @@ package aws_cloud
import (
"fmt"
"k8s.io/kubernetes/pkg/cloudprovider"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/ec2"
"k8s.io/kubernetes/pkg/cloudprovider"
)
func (s *AWSCloud) findRouteTable(clusterName string) (*ec2.RouteTable, error) {

4
pkg/cloudprovider/aws/aws_test.go
View File

@ -26,10 +26,10 @@ import (
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/aws/aws-sdk-go/service/elb"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/resource"
"github.com/aws/aws-sdk-go/service/autoscaling"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/resource"
)
const TestClusterId = "clusterid.test"

4
pkg/cloudprovider/mesos/client.go
View File

@ -26,12 +26,12 @@ import (
"sync"
"time"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/resource"
log "github.com/golang/glog"
"github.com/mesos/mesos-go/detector"
mesos "github.com/mesos/mesos-go/mesosproto"
"golang.org/x/net/context"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/resource"
)
const defaultClusterName = "mesos"

4
pkg/cloudprovider/mesos/mesos.go
View File

@ -23,11 +23,11 @@ import (
"net"
"regexp"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/cloudprovider"
log "github.com/golang/glog"
"github.com/mesos/mesos-go/detector"
"golang.org/x/net/context"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/cloudprovider"
)
var (

2
pkg/cloudprovider/openstack/openstack.go
View File

@ -36,10 +36,10 @@ import (
"github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/vips"
"github.com/rackspace/gophercloud/pagination"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/cloudprovider"
"github.com/golang/glog"
)
const ProviderName = "openstack"

2
pkg/cloudprovider/rackspace/rackspace.go
View File

@ -32,10 +32,10 @@ import (
"github.com/rackspace/gophercloud/rackspace/compute/v2/flavors"
"github.com/rackspace/gophercloud/rackspace/compute/v2/servers"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/cloudprovider"
"github.com/golang/glog"
)
const ProviderName = "rackspace"

2
pkg/controller/controller_utils.go
View File

@ -20,6 +20,7 @@ import (
"fmt"
"time"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/latest"
"k8s.io/kubernetes/pkg/api/validation"
@ -29,7 +30,6 @@ import (
"k8s.io/kubernetes/pkg/controller/framework"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/runtime"
"github.com/golang/glog"
"sync/atomic"
)

2
pkg/controller/node/nodecontroller.go
View File

@ -22,6 +22,7 @@ import (
"net"
"time"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client"
"k8s.io/kubernetes/pkg/client/record"
@ -30,7 +31,6 @@ import (
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/types"
"k8s.io/kubernetes/pkg/util"
"github.com/golang/glog"
)
var (

2
pkg/controller/replication/replication_controller.go
View File

@ -22,6 +22,7 @@ import (
"sync"
"time"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client"
"k8s.io/kubernetes/pkg/client/cache"
@ -34,7 +35,6 @@ import (
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/workqueue"
"k8s.io/kubernetes/pkg/watch"
"github.com/golang/glog"
)
const (

2
pkg/controller/replication/replication_controller_utils.go
View File

@ -17,9 +17,9 @@ limitations under the License.
package replicationcontroller
import (
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client"
"github.com/golang/glog"
)
// updateReplicaCount attempts to update the Status.Replicas of the given controller, with a single GET/PUT retry.

2
pkg/controller/resourcequota/resource_quota_controller.go
View File

@ -19,13 +19,13 @@ package resourcequotacontroller
import (
"time"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/client"
"k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/util"
"github.com/golang/glog"
)
// ResourceQuotaController is responsible for tracking quota usage status in the system

2
pkg/controller/route/routecontroller.go
View File

@ -21,13 +21,13 @@ import (
"net"
"time"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client"
"k8s.io/kubernetes/pkg/cloudprovider"
"k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/util"
"github.com/golang/glog"
)
type RouteController struct {

2
pkg/controller/service/servicecontroller.go
View File

@ -23,6 +23,7 @@ import (
"sync"
"time"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/client"
@ -32,7 +33,6 @@ import (
"k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/types"
"k8s.io/kubernetes/pkg/util"
"github.com/golang/glog"
)
const (

2
pkg/controller/serviceaccount/jwt_test.go
View File

@ -23,10 +23,10 @@ import (
"reflect"
"testing"
"github.com/dgrijalva/jwt-go"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client"
"k8s.io/kubernetes/pkg/client/testclient"
"github.com/dgrijalva/jwt-go"
)
const otherPublicKey = `-----BEGIN PUBLIC KEY-----

2
pkg/controller/serviceaccount/serviceaccounts_controller.go
View File

@ -20,6 +20,7 @@ import (
"fmt"
"time"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/meta"
"k8s.io/kubernetes/pkg/client"
@ -30,7 +31,6 @@ import (
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/watch"
"github.com/golang/glog"
)
// nameIndexFunc is an index function that indexes based on an object's name

2
pkg/controller/serviceaccount/tokens_controller.go
View File

@ -21,6 +21,7 @@ import (
"fmt"
"time"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/api"
apierrors "k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/client"
@ -32,7 +33,6 @@ import (
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/watch"
"github.com/golang/glog"
)
// TokensControllerOptions contains options for the TokensController

2
pkg/credentialprovider/gcp/jwt.go
View File

@ -20,11 +20,11 @@ import (
"io/ioutil"
"time"
"k8s.io/kubernetes/pkg/credentialprovider"
"github.com/golang/glog"
"golang.org/x/oauth2"
"golang.org/x/oauth2/google"
"golang.org/x/oauth2/jwt"
"k8s.io/kubernetes/pkg/credentialprovider"
"github.com/spf13/pflag"
)

2
pkg/credentialprovider/gcp/metadata.go
View File

@ -22,8 +22,8 @@ import (
"strings"
"time"
"k8s.io/kubernetes/pkg/credentialprovider"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/credentialprovider"
)
const (

2
pkg/kubectl/bash_comp_utils.go
View File

@ -19,9 +19,9 @@ limitations under the License.
package kubectl
import (
"k8s.io/kubernetes/pkg/util"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"k8s.io/kubernetes/pkg/util"
)
func AddJsonFilenameFlag(cmd *cobra.Command, value *util.StringList, usage string) {

2
pkg/kubectl/cmd/annotation.go
View File

@ -22,11 +22,11 @@ import (
"io"
"strings"
"github.com/spf13/cobra"
"k8s.io/kubernetes/pkg/api"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/resource"
"k8s.io/kubernetes/pkg/runtime"
"github.com/spf13/cobra"
)
// AnnotateOptions have the data required to perform the annotate operation

6
pkg/kubectl/cmd/attach.go
View File

@ -23,13 +23,13 @@ import (
"os/signal"
"syscall"
"github.com/docker/docker/pkg/term"
"github.com/golang/glog"
"github.com/spf13/cobra"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client"
"k8s.io/kubernetes/pkg/client/remotecommand"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"github.com/docker/docker/pkg/term"
"github.com/golang/glog"
"github.com/spf13/cobra"
)
const (

2
pkg/kubectl/cmd/cmd.go
View File

@ -19,10 +19,10 @@ package cmd
import (
"io"
"github.com/golang/glog"
cmdconfig "k8s.io/kubernetes/pkg/kubectl/cmd/config"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/util"
"github.com/golang/glog"
"github.com/spf13/cobra"
)

6
pkg/kubectl/cmd/exec.go
View File

@ -23,13 +23,13 @@ import (
"os/signal"
"syscall"
"github.com/docker/docker/pkg/term"
"github.com/golang/glog"
"github.com/spf13/cobra"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client"
"k8s.io/kubernetes/pkg/client/remotecommand"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"github.com/docker/docker/pkg/term"
"github.com/golang/glog"
"github.com/spf13/cobra"
)
const (

2
pkg/kubectl/cmd/label.go
View File

@ -21,12 +21,12 @@ import (
"io"
"strings"
"github.com/spf13/cobra"
"k8s.io/kubernetes/pkg/api"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/resource"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util"
"github.com/spf13/cobra"
)
const (

2
pkg/kubectl/cmd/log.go
View File

@ -22,10 +22,10 @@ import (
"os"
"strconv"
"github.com/spf13/cobra"
"k8s.io/kubernetes/pkg/api"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
libutil "k8s.io/kubernetes/pkg/util"
"github.com/spf13/cobra"
)
const (

2
pkg/kubectl/cmd/namespace.go
View File

@ -20,8 +20,8 @@ import (
"fmt"
"io"
"k8s.io/kubernetes/pkg/kubectl/cmd/util"
"github.com/spf13/cobra"
"k8s.io/kubernetes/pkg/kubectl/cmd/util"
)
// TODO remove once people have been given enough time to notice

4
pkg/kubectl/cmd/portforward.go
View File

@ -20,12 +20,12 @@ import (
"os"
"os/signal"
"github.com/golang/glog"
"github.com/spf13/cobra"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client"
"k8s.io/kubernetes/pkg/client/portforward"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"github.com/golang/glog"
"github.com/spf13/cobra"
)
const (

4
pkg/kubectl/cmd/proxy.go
View File

@ -21,10 +21,10 @@ import (
"io"
"strings"
"k8s.io/kubernetes/pkg/kubectl"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"github.com/golang/glog"
"github.com/spf13/cobra"
"k8s.io/kubernetes/pkg/kubectl"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
)
const (

2
pkg/kubectl/cmd/replace.go
View File

@ -25,11 +25,11 @@ import (
"github.com/spf13/cobra"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/kubectl"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/resource"
"k8s.io/kubernetes/pkg/util"
"github.com/golang/glog"
)
const (

2
pkg/kubectl/cmd/rollingupdate.go
View File

@ -24,13 +24,13 @@ import (
"github.com/golang/glog"
"github.com/spf13/cobra"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/kubectl"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/resource"
"github.com/spf13/cobra"
)
const (

2
pkg/kubectl/cmd/run.go
View File

@ -21,10 +21,10 @@ import (
"io"
"os"
"github.com/spf13/cobra"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/kubectl"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"github.com/spf13/cobra"
)
const (

2
pkg/kubectl/cmd/stop.go
View File

@ -19,11 +19,11 @@ package cmd
import (
"io"
"github.com/spf13/cobra"
"k8s.io/kubernetes/pkg/kubectl"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/resource"
"k8s.io/kubernetes/pkg/util"
"github.com/spf13/cobra"
)
const (

2
pkg/kubectl/cmd/util/helpers.go
View File

@ -29,6 +29,7 @@ import (
"strings"
"time"
"github.com/evanphx/json-patch"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/latest"
@ -38,7 +39,6 @@ import (
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util"
utilerrors "k8s.io/kubernetes/pkg/util/errors"
"github.com/evanphx/json-patch"
"github.com/golang/glog"
"github.com/spf13/cobra"

2
pkg/kubectl/describe.go
View File

@ -25,6 +25,7 @@ import (
"strings"
"time"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/client"
@ -33,7 +34,6 @@ import (
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/types"
"k8s.io/kubernetes/pkg/util"
"github.com/golang/glog"
)
// Describer generates output for the named resource or an error

2
pkg/kubectl/generate.go
View File

@ -20,8 +20,8 @@ import (
"fmt"
"strings"
"k8s.io/kubernetes/pkg/runtime"
"github.com/spf13/cobra"
"k8s.io/kubernetes/pkg/runtime"
)
// GeneratorParam is a parameter for a generator

2
pkg/kubectl/proxy_server.go
View File

@ -26,8 +26,8 @@ import (
"strings"
"time"
"k8s.io/kubernetes/pkg/client"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/client"
)
const (

4
pkg/kubectl/resource_printer.go
View File

@ -29,13 +29,13 @@ import (
"text/template"
"time"
"github.com/ghodss/yaml"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/conversion"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/volume"
"github.com/ghodss/yaml"
"github.com/golang/glog"
)
// GetPrinter takes a format type, an optional format argument. It will return true

2
pkg/kubelet/cadvisor/cadvisor_linux.go
View File

@ -23,7 +23,6 @@ import (
"net/http"
"time"
"k8s.io/kubernetes/pkg/util"
"github.com/golang/glog"
"github.com/google/cadvisor/cache/memory"
"github.com/google/cadvisor/events"
@ -33,6 +32,7 @@ import (
cadvisorApiV2 "github.com/google/cadvisor/info/v2"
"github.com/google/cadvisor/manager"
"github.com/google/cadvisor/utils/sysfs"
"k8s.io/kubernetes/pkg/util"
)
type cadvisorClient struct {

2
pkg/kubelet/config/config.go
View File

@ -21,6 +21,7 @@ import (
"reflect"
"sync"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/validation"
"k8s.io/kubernetes/pkg/client/record"
@ -32,7 +33,6 @@ import (
"k8s.io/kubernetes/pkg/util/config"
utilerrors "k8s.io/kubernetes/pkg/util/errors"
"k8s.io/kubernetes/pkg/util/fielderrors"
"github.com/golang/glog"
)
// PodConfigNotificationMode describes how changes are sent to the update channel.

2
pkg/kubelet/container_bridge.go
View File

@ -23,8 +23,8 @@ import (
"os/exec"
"regexp"
"k8s.io/kubernetes/pkg/util"
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/util"
)
var cidrRegexp = regexp.MustCompile(`inet ([0-9a-fA-F.:]*/[0-9]*)`)

Some files were not shown because too many files have changed in this diff Show More