adding 3764 will back out

kubernetes · Nov 4, 2017 · 8133d21 · 8133d21
1 parent db6178f
commit 8133d21
Show file tree

Hide file tree

Showing 170 changed files with 588 additions and 175 deletions.
diff --git a/channels/cmd/channels/main.go b/channels/cmd/channels/main.go
@@ -18,8 +18,9 @@ package main
 
 import (
 	"fmt"
-	"k8s.io/kops/channels/pkg/cmd"
 	"os"
+
+	"k8s.io/kops/channels/pkg/cmd"
 )
 
 func main() {

diff --git a/channels/pkg/channels/addon.go b/channels/pkg/channels/addon.go
@@ -18,11 +18,12 @@ package channels
 
 import (
 	"fmt"
+	"net/url"
+
 	"github.com/golang/glog"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/kops/channels/pkg/api"
-	"net/url"
 )
 
 // Addon is a wrapper around a single version of an addon

diff --git a/channels/pkg/channels/addons.go b/channels/pkg/channels/addons.go
@@ -18,13 +18,14 @@ package channels
 
 import (
 	"fmt"
+	"net/url"
+	"strings"
+
 	"github.com/blang/semver"
 	"github.com/golang/glog"
 	"k8s.io/kops/channels/pkg/api"
 	"k8s.io/kops/upup/pkg/fi/utils"
 	"k8s.io/kops/util/pkg/vfs"
-	"net/url"
-	"strings"
 )
 
 type Addons struct {

diff --git a/channels/pkg/channels/addons_test.go b/channels/pkg/channels/addons_test.go
@@ -17,9 +17,10 @@ limitations under the License.
 package channels
 
 import (
+	"testing"
+
 	"github.com/blang/semver"
 	"k8s.io/kops/channels/pkg/api"
-	"testing"
 )
 
 func Test_Filtering(t *testing.T) {

diff --git a/channels/pkg/channels/apply.go b/channels/pkg/channels/apply.go
@@ -18,13 +18,14 @@ package channels
 
 import (
 	"fmt"
-	"github.com/golang/glog"
 	"io/ioutil"
-	"k8s.io/kops/util/pkg/vfs"
 	"os"
 	"os/exec"
 	"path"
 	"strings"
+
+	"github.com/golang/glog"
+	"k8s.io/kops/util/pkg/vfs"
 )
 
 // Apply calls kubectl apply to apply the manifest.

diff --git a/channels/pkg/channels/channel_version.go b/channels/pkg/channels/channel_version.go
@@ -19,13 +19,14 @@ package channels
 import (
 	"encoding/json"
 	"fmt"
+	"strings"
+
 	"github.com/blang/semver"
 	"github.com/golang/glog"
 	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes"
-	"strings"
 )
 
 const AnnotationPrefix = "addons.k8s.io/"

diff --git a/channels/pkg/cmd/apply.go b/channels/pkg/cmd/apply.go
@@ -17,8 +17,9 @@ limitations under the License.
 package cmd
 
 import (
-	"github.com/spf13/cobra"
 	"io"
+
+	"github.com/spf13/cobra"
 )
 
 func NewCmdApply(f Factory, out io.Writer) *cobra.Command {

diff --git a/channels/pkg/cmd/apply_channel.go b/channels/pkg/cmd/apply_channel.go
@@ -18,14 +18,15 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/blang/semver"
-	"github.com/spf13/cobra"
 	"io"
-	"k8s.io/kops/channels/pkg/channels"
-	"k8s.io/kops/util/pkg/tables"
 	"net/url"
 	"os"
 	"strings"
+
+	"github.com/blang/semver"
+	"github.com/spf13/cobra"
+	"k8s.io/kops/channels/pkg/channels"
+	"k8s.io/kops/util/pkg/tables"
 )
 
 type ApplyChannelOptions struct {

diff --git a/channels/pkg/cmd/get.go b/channels/pkg/cmd/get.go
@@ -17,8 +17,9 @@ limitations under the License.
 package cmd
 
 import (
-	"github.com/spf13/cobra"
 	"io"
+
+	"github.com/spf13/cobra"
 )
 
 func NewCmdGet(f Factory, out io.Writer) *cobra.Command {

diff --git a/channels/pkg/cmd/get_addons.go b/channels/pkg/cmd/get_addons.go
@@ -34,13 +34,14 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/spf13/cobra"
 	"io"
+	"os"
+
+	"github.com/spf13/cobra"
 	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kops/channels/pkg/channels"
 	"k8s.io/kops/util/pkg/tables"
-	"os"
 )
 
 type GetAddonsOptions struct {

diff --git a/channels/pkg/cmd/root.go b/channels/pkg/cmd/root.go
@@ -20,9 +20,10 @@ import (
 	goflag "flag"
 	"fmt"
 
+	"io"
+
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"io"
 )
 
 type CmdRootOptions struct {

diff --git a/cloudmock/aws/mockec2/address.go b/cloudmock/aws/mockec2/address.go
@@ -19,10 +19,11 @@ package mockec2
 import (
 	"encoding/binary"
 	"fmt"
+	"net"
+
 	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
-	"net"
 )
 
 func (m *MockEC2) AllocateAddressRequest(*ec2.AllocateAddressInput) (*request.Request, *ec2.AllocateAddressOutput) {

diff --git a/cloudmock/aws/mockec2/images.go b/cloudmock/aws/mockec2/images.go
@@ -18,11 +18,12 @@ package mockec2
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
-	"strings"
 )
 
 func (m *MockEC2) DescribeImageAttributeRequest(*ec2.DescribeImageAttributeInput) (*request.Request, *ec2.DescribeImageAttributeOutput) {

diff --git a/cloudmock/aws/mockec2/keypairs.go b/cloudmock/aws/mockec2/keypairs.go
@@ -18,6 +18,7 @@ package mockec2
 
 import (
 	"fmt"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/service/ec2"

diff --git a/cloudmock/aws/mockec2/securitygroups.go b/cloudmock/aws/mockec2/securitygroups.go
@@ -18,10 +18,11 @@ package mockec2
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
-	"strings"
 )
 
 func (m *MockEC2) CreateSecurityGroupRequest(*ec2.CreateSecurityGroupInput) (*request.Request, *ec2.CreateSecurityGroupOutput) {

diff --git a/cloudmock/aws/mockec2/volumes.go b/cloudmock/aws/mockec2/volumes.go
@@ -18,10 +18,11 @@ package mockec2
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
-	"strings"
 )
 
 func (m *MockEC2) DescribeVolumeAttributeRequest(*ec2.DescribeVolumeAttributeInput) (*request.Request, *ec2.DescribeVolumeAttributeOutput) {

diff --git a/cloudmock/aws/mockec2/vpcs.go b/cloudmock/aws/mockec2/vpcs.go
@@ -18,11 +18,12 @@ package mockec2
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
-	"strings"
 )
 
 type vpcInfo struct {

diff --git a/cloudmock/aws/mockroute53/api.go b/cloudmock/aws/mockroute53/api.go
@@ -17,10 +17,11 @@ limitations under the License.
 package mockroute53
 
 import (
+	"strings"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/route53"
 	"github.com/aws/aws-sdk-go/service/route53/route53iface"
-	"strings"
 )
 
 type zoneInfo struct {

diff --git a/cloudmock/aws/mockroute53/records.go b/cloudmock/aws/mockroute53/records.go
@@ -18,6 +18,7 @@ package mockroute53
 
 import (
 	"fmt"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/service/route53"

diff --git a/cloudmock/aws/mockroute53/zones.go b/cloudmock/aws/mockroute53/zones.go
@@ -18,6 +18,7 @@ package mockroute53
 
 import (
 	"fmt"
+
 	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/service/route53"
 	"github.com/golang/glog"

diff --git a/cmd/kops-server/main.go b/cmd/kops-server/main.go
@@ -21,11 +21,12 @@ import (
 	"os"
 	"runtime"
 
+	"math/rand"
+	"time"
+
 	"github.com/golang/glog"
 	"k8s.io/apiserver/pkg/util/logs"
 	"k8s.io/kops/pkg/apiserver/cmd/server"
-	"math/rand"
-	"time"
 )
 
 func main() {

diff --git a/cmd/kops/delete.go b/cmd/kops/delete.go
@@ -21,6 +21,7 @@ import (
 	"io"
 
 	"bytes"
+
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/runtime/schema"

diff --git a/cmd/kops/status_discovery.go b/cmd/kops/status_discovery.go
@@ -18,6 +18,7 @@ package main
 
 import (
 	"fmt"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi/cloudup"

diff --git a/dns-controller/pkg/dns/zonespec.go b/dns-controller/pkg/dns/zonespec.go
@@ -18,9 +18,10 @@ package dns
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/golang/glog"
 	"k8s.io/kubernetes/federation/pkg/dnsprovider"
-	"strings"
 )
 
 type ZoneSpec struct {

diff --git a/examples/kops-api-example/main.go b/examples/kops-api-example/main.go
@@ -19,9 +19,10 @@ package main
 import (
 	"flag"
 	"fmt"
-	"k8s.io/kops/util/pkg/vfs"
 	"os"
 	"strings"
+
+	"k8s.io/kops/util/pkg/vfs"
 )
 
 // registryBase is the base path where state files are kept (the state store)

diff --git a/examples/kops-api-example/up.go b/examples/kops-api-example/up.go
@@ -19,6 +19,7 @@ package main
 import (
 	"fmt"
 	"io/ioutil"
+
 	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/pkg/client/simple/vfsclientset"
 	"k8s.io/kops/upup/pkg/fi"

diff --git a/federation/federation_cluster.go b/federation/federation_cluster.go
@@ -18,6 +18,7 @@ package federation
 
 import (
 	"fmt"
+
 	"github.com/golang/glog"
 	"k8s.io/api/core/v1"
 	k8sapiv1 "k8s.io/api/core/v1"

diff --git a/federation/federation_configuration.go b/federation/federation_configuration.go
@@ -18,6 +18,7 @@ package federation
 
 import (
 	"fmt"
+
 	"github.com/golang/glog"
 	"k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"

diff --git a/federation/federation_namespace.go b/federation/federation_namespace.go
@@ -18,6 +18,7 @@ package federation
 
 import (
 	"fmt"
+
 	"github.com/golang/glog"
 	"k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"

diff --git a/federation/targets/kubernetestarget/kubernetestarget.go b/federation/targets/kubernetestarget/kubernetestarget.go
@@ -18,6 +18,7 @@ package kubernetestarget
 
 import (
 	"fmt"
+
 	"k8s.io/client-go/kubernetes"
 	kopsapi "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/pkg/client/simple"

diff --git a/federation/tasks/kubernetesresource.go b/federation/tasks/kubernetesresource.go
@@ -18,6 +18,7 @@ package tasks
 
 import (
 	"fmt"
+
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	"k8s.io/kops/federation/targets/kubernetestarget"
 	"k8s.io/kops/upup/pkg/fi"

diff --git a/nodeup/pkg/distros/identify.go b/nodeup/pkg/distros/identify.go
@@ -18,11 +18,12 @@ package distros
 
 import (
 	"fmt"
-	"github.com/golang/glog"
 	"io/ioutil"
 	"os"
 	"path"
 	"strings"
+
+	"github.com/golang/glog"
 )
 
 // FindDistribution identifies the distribution on which we are running

diff --git a/nodeup/pkg/model/docker_test.go b/nodeup/pkg/model/docker_test.go
@@ -17,11 +17,12 @@ limitations under the License.
 package model
 
 import (
+	"path"
+	"testing"
+
 	"k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/pkg/flagbuilder"
 	"k8s.io/kops/upup/pkg/fi"
-	"path"
-	"testing"
 )
 
 func TestDockerBuilder_Simple(t *testing.T) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,6 +21,7 @@ import ( @@
     	"io"
     	"bytes"
     	"github.com/golang/glog"
     	"github.com/spf13/cobra"
     	"k8s.io/apimachinery/pkg/runtime/schema"
@@ Expand Down @@