Merge pull request #629 from justinsb/move_apis

Move API to pkg/apis/kops

cmd/kops/create_cluster.go

@@ -5,9 +5,9 @@ import (
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"
 	"io/ioutil"
+	api "k8s.io/kops/pkg/apis/kops"
+	"k8s.io/kops/pkg/apis/kops/registry"
 	"k8s.io/kops/pkg/client/simple/vfsclientset"
-	"k8s.io/kops/upup/pkg/api"
-	"k8s.io/kops/upup/pkg/api/registry"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup"
 	"k8s.io/kops/upup/pkg/fi/utils"

cmd/kops/create_ig.go

@@ -6,7 +6,7 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi/cloudup"
 	"k8s.io/kubernetes/pkg/kubectl/cmd/util/editor"
 	"path/filepath"

cmd/kops/create_secret_sshpublickey.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"io/ioutil"
-	"k8s.io/kops/upup/pkg/api/registry"
+	"k8s.io/kops/pkg/apis/kops/registry"
 )
 
 type CreateSecretPublickeyCommand struct {

cmd/kops/delete_cluster.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
+	api "k8s.io/kops/pkg/apis/kops"
+	"k8s.io/kops/pkg/apis/kops/registry"
 	"k8s.io/kops/pkg/client/simple"
-	"k8s.io/kops/upup/pkg/api"
-	"k8s.io/kops/upup/pkg/api/registry"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup"
 	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"

cmd/kops/delete_secret.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
-	"k8s.io/kops/upup/pkg/api/registry"
+	"k8s.io/kops/pkg/apis/kops/registry"
 	"k8s.io/kops/upup/pkg/fi"
 )
 

cmd/kops/describe_secrets.go

@@ -6,7 +6,7 @@ import (
 	"bytes"
 	"crypto/rsa"
 	"github.com/spf13/cobra"
-	"k8s.io/kops/upup/pkg/api/registry"
+	"k8s.io/kops/pkg/apis/kops/registry"
 	"k8s.io/kops/upup/pkg/fi"
 	"os"
 	"sort"

cmd/kops/edit_cluster.go

@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 
 	"github.com/spf13/cobra"
-	"k8s.io/kops/upup/pkg/api"
-	"k8s.io/kops/upup/pkg/api/registry"
+	api "k8s.io/kops/pkg/apis/kops"
+	"k8s.io/kops/pkg/apis/kops/registry"
 	"k8s.io/kops/upup/pkg/fi/cloudup"
 	k8sapi "k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/kubectl/cmd/util/editor"

cmd/kops/edit_instancegroup.go

@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 
 	"github.com/spf13/cobra"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi/cloudup"
 	"k8s.io/kubernetes/pkg/kubectl/cmd/util/editor"
 )

cmd/kops/export_kubecfg.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"github.com/spf13/cobra"
-	"k8s.io/kops/upup/pkg/api/registry"
+	"k8s.io/kops/pkg/apis/kops/registry"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/kutil"
 )

cmd/kops/get_cluster.go

@@ -5,8 +5,8 @@ import (
 
 	"fmt"
 	"github.com/spf13/cobra"
-	"k8s.io/kops/upup/pkg/api"
-	"k8s.io/kops/upup/pkg/api/registry"
+	api "k8s.io/kops/pkg/apis/kops"
+	"k8s.io/kops/pkg/apis/kops/registry"
 	"k8s.io/kops/util/pkg/tables"
 	k8sapi "k8s.io/kubernetes/pkg/api"
 	"strings"

cmd/kops/get_instancegroups.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/util/pkg/tables"
 	k8sapi "k8s.io/kubernetes/pkg/api"
 )

cmd/kops/get_secrets.go

@@ -5,7 +5,7 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
-	"k8s.io/kops/upup/pkg/api/registry"
+	"k8s.io/kops/pkg/apis/kops/registry"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/util/pkg/tables"
 	"strings"

cmd/kops/rollingupdate_cluster.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 	"github.com/spf13/cobra"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi/cloudup"
 	"k8s.io/kops/upup/pkg/kutil"
 	"k8s.io/kops/util/pkg/tables"

cmd/kops/root.go

@@ -6,9 +6,9 @@ import (
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/pkg/client/simple"
 	"k8s.io/kops/pkg/client/simple/vfsclientset"
-	"k8s.io/kops/upup/pkg/api"
 	"k8s.io/kops/upup/pkg/kutil"
 	"k8s.io/kops/util/pkg/vfs"
 	"os"

cmd/kops/toolbox_convert_imported.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
 	"k8s.io/kops/upup/pkg/kutil"
 	k8sapi "k8s.io/kubernetes/pkg/api"

cmd/kops/update_cluster.go

@@ -5,7 +5,7 @@ import (
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"
 	"io/ioutil"
-	"k8s.io/kops/upup/pkg/api/registry"
+	"k8s.io/kops/pkg/apis/kops/registry"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup"
 	"k8s.io/kops/upup/pkg/fi/utils"

cmd/kops/upgrade_cluster.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup"
 	"k8s.io/kops/util/pkg/tables"

examples/kops-api-example/up.go

@@ -2,13 +2,13 @@ package main
 
 import (
 	"k8s.io/kops/pkg/client/simple/vfsclientset"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi/cloudup"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/utils"
 	"io/ioutil"
 	"fmt"
-	"k8s.io/kops/upup/pkg/api/registry"
+	"k8s.io/kops/pkg/apis/kops/registry"
 )
 
 func up() error {

pkg/apis/kops/channel.go

@@ -1,4 +1,4 @@
-package api
+package kops
 
 import (
 	"fmt"

pkg/apis/kops/cluster.go

@@ -1,4 +1,4 @@
-package api
+package kops
 
 import (
 	"encoding/binary"

pkg/apis/kops/componentconfig.go

@@ -1,4 +1,4 @@
-package api
+package kops
 
 import (
 	k8sapi "k8s.io/kubernetes/pkg/api"

pkg/apis/kops/dockerconfig.go

@@ -1,4 +1,4 @@
-package api
+package kops
 
 import (
 	"k8s.io/kubernetes/pkg/util/validation/field"

pkg/apis/kops/dockerconfig_test.go

@@ -1,4 +1,4 @@
-package api
+package kops
 
 import (
 	"k8s.io/kubernetes/pkg/util/validation/field"

pkg/apis/kops/instancegroup.go

@@ -1,4 +1,4 @@
-package api
+package kops
 
 import (
 	"fmt"

pkg/apis/kops/kubeletconfig.go

@@ -1,4 +1,4 @@
-package api
+package kops
 
 import "k8s.io/kops/upup/pkg/fi/utils"
 

pkg/apis/kops/labels.go

@@ -1,4 +1,4 @@
-package api
+package kops
 
 // AnnotationNameManagement is the annotation that indicates that a cluster is under external or non-standard management
 const AnnotationNameManagement = "kops.kubernetes.io/management"

pkg/apis/kops/networking.go

@@ -1,4 +1,4 @@
-package api
+package kops
 
 // NetworkingSpec allows selection and configuration of a networking plugin
 type NetworkingSpec struct {

pkg/apis/kops/parse.go

@@ -1,4 +1,4 @@
-package api
+package kops
 
 import (
 	"fmt"

pkg/apis/kops/registry/helpers.go

@@ -3,7 +3,7 @@ package registry
 import (
 	"fmt"
 	"k8s.io/kops/pkg/client/simple"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 )
 
 func CreateClusterConfig(clientset simple.Clientset, cluster *api.Cluster, groups []*api.InstanceGroup) error {

pkg/apis/kops/registry/registry.go

@@ -2,7 +2,7 @@ package registry
 
 import (
 	"fmt"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/secrets"
 	"k8s.io/kops/util/pkg/vfs"

pkg/apis/kops/validation.go

@@ -1,4 +1,4 @@
-package api
+package kops
 
 import (
 	"fmt"

pkg/apis/kops/validation_test.go

@@ -1,4 +1,4 @@
-package api
+package kops
 
 import (
 	"k8s.io/kubernetes/pkg/util/validation"

pkg/apis/kops/versions.go

@@ -1,4 +1,4 @@
-package api
+package kops
 
 import (
 	"fmt"

pkg/apis/kops/versions_test.go

@@ -1,4 +1,4 @@
-package api
+package kops
 
 import (
 	"testing"

pkg/client/simple/cluster.go

@@ -1,7 +1,7 @@
 package simple
 
 import (
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	k8sapi "k8s.io/kubernetes/pkg/api"
 )
 

pkg/client/simple/instancegroup.go

@@ -1,7 +1,7 @@
 package simple
 
 import (
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	k8sapi "k8s.io/kubernetes/pkg/api"
 )
 

pkg/client/simple/vfsclientset/cluster.go

@@ -2,10 +2,10 @@ package vfsclientset
 
 import (
 	"k8s.io/kops/pkg/client/simple"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	k8sapi "k8s.io/kubernetes/pkg/api"
 	"fmt"
-	"k8s.io/kops/upup/pkg/api/registry"
+	"k8s.io/kops/pkg/apis/kops/registry"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"time"
 	"k8s.io/kops/util/pkg/vfs"

pkg/client/simple/vfsclientset/instancegroup.go

@@ -2,7 +2,7 @@ package vfsclientset
 
 import (
 	"k8s.io/kops/pkg/client/simple"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	k8sapi "k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"time"
@@ -10,7 +10,7 @@ import (
 	"os"
 	"github.com/golang/glog"
 	"k8s.io/kops/util/pkg/vfs"
-	"k8s.io/kops/upup/pkg/api/registry"
+	"k8s.io/kops/pkg/apis/kops/registry"
 )
 
 type InstanceGroupVFS struct {

upup/pkg/fi/cloudup/apply_cluster.go

@@ -3,9 +3,9 @@ package cloudup
 import (
 	"fmt"
 	"github.com/golang/glog"
+	api "k8s.io/kops/pkg/apis/kops"
+	"k8s.io/kops/pkg/apis/kops/registry"
 	"k8s.io/kops/pkg/client/simple"
-	"k8s.io/kops/upup/pkg/api"
-	"k8s.io/kops/upup/pkg/api/registry"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup/awstasks"
 	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"

upup/pkg/fi/cloudup/deepvalidate_test.go

@@ -2,7 +2,7 @@ package cloudup
 
 import (
 	"fmt"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 	"strings"
 	"testing"

upup/pkg/fi/cloudup/iam_builder.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/golang/glog"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/util/pkg/vfs"
 	"k8s.io/kubernetes/pkg/util/sets"
 	"strings"

upup/pkg/fi/cloudup/loader.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"github.com/golang/glog"
 	"io"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/loader"
 	"k8s.io/kops/upup/pkg/fi/utils"

upup/pkg/fi/cloudup/networking.go

@@ -2,7 +2,7 @@ package cloudup
 
 import (
 	"github.com/golang/glog"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 )
 
 func usesCNI(c *api.Cluster) bool {

upup/pkg/fi/cloudup/populate_cluster_spec.go

@@ -4,9 +4,9 @@ import (
 	"encoding/binary"
 	"fmt"
 	"github.com/golang/glog"
+	api "k8s.io/kops/pkg/apis/kops"
+	"k8s.io/kops/pkg/apis/kops/registry"
 	"k8s.io/kops/upup/models"
-	"k8s.io/kops/upup/pkg/api"
-	"k8s.io/kops/upup/pkg/api/registry"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/loader"
 	"k8s.io/kops/upup/pkg/fi/utils"

upup/pkg/fi/cloudup/populate_instancegroup_spec.go

@@ -3,7 +3,7 @@ package cloudup
 import (
 	"fmt"
 	"github.com/golang/glog"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/utils"
 )

upup/pkg/fi/cloudup/populatecluster_test.go

@@ -2,7 +2,7 @@ package cloudup
 
 import (
 	"fmt"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kubernetes/pkg/util/sets"
 	"strings"

upup/pkg/fi/cloudup/populateinstancegroup_test.go

@@ -2,7 +2,7 @@ package cloudup
 
 import (
 	"fmt"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"strings"
 	"testing"
 )

upup/pkg/fi/cloudup/spec_builder.go

@@ -2,7 +2,7 @@ package cloudup
 
 import (
 	"github.com/golang/glog"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/loader"
 	"k8s.io/kops/upup/pkg/fi/utils"

upup/pkg/fi/cloudup/tagbuilder.go

@@ -3,7 +3,7 @@ package cloudup
 import (
 	"fmt"
 	"github.com/golang/glog"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 )
 

upup/pkg/fi/cloudup/tagbuilder_test.go

@@ -1,7 +1,7 @@
 package cloudup
 
 import (
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 	"testing"
 )

upup/pkg/fi/cloudup/template_functions.go

@@ -5,7 +5,7 @@ import (
 	"encoding/binary"
 	"fmt"
 	"github.com/golang/glog"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/util/pkg/vfs"
 	"math/big"

upup/pkg/fi/cloudup/utils.go

@@ -2,7 +2,7 @@ package cloudup
 
 import (
 	"fmt"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
 	"k8s.io/kops/upup/pkg/fi/cloudup/gce"

upup/pkg/fi/cloudup/validation_test.go

@@ -3,7 +3,7 @@ package cloudup
 import (
 	"fmt"
 	"github.com/golang/glog"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
 	"k8s.io/kubernetes/pkg/util/sets"
@@ -171,7 +171,7 @@ func expectNoErrorFromValidate(t *testing.T, c *api.Cluster) {
 //
 //import (
 //	"fmt"
-//	"k8s.io/kops/upup/pkg/api"
+//	api "k8s.io/kops/pkg/apis/kops"
 //	"k8s.io/kops/upup/pkg/fi/vfs"
 //	k8sapi "k8s.io/kubernetes/pkg/api"
 //	"os"

upup/pkg/fi/nodeup/command.go

@@ -5,8 +5,8 @@ import (
 	"github.com/golang/glog"
 	"io"
 	"io/ioutil"
-	"k8s.io/kops/upup/pkg/api"
-	"k8s.io/kops/upup/pkg/api/registry"
+	api "k8s.io/kops/pkg/apis/kops"
+	"k8s.io/kops/pkg/apis/kops/registry"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/nodeup/cloudinit"
 	"k8s.io/kops/upup/pkg/fi/nodeup/local"

upup/pkg/fi/nodeup/loader.go

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/golang/glog"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/loader"
 	"k8s.io/kops/upup/pkg/fi/nodeup/nodetasks"

upup/pkg/fi/nodeup/template_functions.go

@@ -4,7 +4,7 @@ import (
 	"encoding/base64"
 	"fmt"
 	"github.com/golang/glog"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/secrets"
 	"k8s.io/kops/util/pkg/vfs"

upup/pkg/kutil/convert_kubeup_cluster.go

@@ -6,10 +6,10 @@ import (
 	"github.com/aws/aws-sdk-go/service/autoscaling"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
+	api "k8s.io/kops/pkg/apis/kops"
+	"k8s.io/kops/pkg/apis/kops/registry"
 	"k8s.io/kops/pkg/client/simple"
 	"k8s.io/kops/pkg/client/simple/vfsclientset"
-	"k8s.io/kops/upup/pkg/api"
-	"k8s.io/kops/upup/pkg/api/registry"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup"
 	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"

upup/pkg/kutil/delete_instancegroup.go

@@ -3,8 +3,8 @@ package kutil
 import (
 	"fmt"
 
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/pkg/client/simple"
-	"k8s.io/kops/upup/pkg/api"
 	"k8s.io/kops/upup/pkg/fi"
 )
 

upup/pkg/kutil/import_cluster.go

@@ -6,10 +6,10 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
+	api "k8s.io/kops/pkg/apis/kops"
+	"k8s.io/kops/pkg/apis/kops/registry"
 	"k8s.io/kops/pkg/client/simple"
 	"k8s.io/kops/pkg/client/simple/vfsclientset"
-	"k8s.io/kops/upup/pkg/api"
-	"k8s.io/kops/upup/pkg/api/registry"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup"
 	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"

upup/pkg/kutil/rollingupdate_cluster.go

@@ -6,7 +6,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/autoscaling"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
-	"k8s.io/kops/upup/pkg/api"
+	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
 	"k8s.io/kubernetes/pkg/api/v1"