github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

run gofmt on everything we touched

Browse Source
This commit is contained in:
Mike Danese
2015-08-05 15:05:17 -07:00
parent 62a4d5623c
commit 17defc7383
188 changed files with 280 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 (