Merge pull request #1 from justinsb/rename_to_kops

Rename to kops

Makefile

@@ -1,16 +1,16 @@
 gocode: godeps
-	GO15VENDOREXPERIMENT=1 go install k8s.io/kube-deploy/upup/cmd/...
-	ln -sfn ${GOPATH}/src/k8s.io/kube-deploy/upup/models/ ${GOPATH}/bin/models
+	GO15VENDOREXPERIMENT=1 go install k8s.io/kops/cmd/...
+	ln -sfn ${GOPATH}/src/k8s.io/kops/upup/models/ ${GOPATH}/bin/models
 
 codegen:
-	GO15VENDOREXPERIMENT=1 go install k8s.io/kube-deploy/upup/tools/generators/...
-	GO15VENDOREXPERIMENT=1 go generate k8s.io/kube-deploy/upup/pkg/fi/cloudup/awstasks
-	GO15VENDOREXPERIMENT=1 go generate k8s.io/kube-deploy/upup/pkg/fi/cloudup/gcetasks
-	GO15VENDOREXPERIMENT=1 go generate k8s.io/kube-deploy/upup/pkg/fi/fitasks
+	GO15VENDOREXPERIMENT=1 go install k8s.io/kops/upup/tools/generators/...
+	GO15VENDOREXPERIMENT=1 go generate k8s.io/kops/upup/pkg/fi/cloudup/awstasks
+	GO15VENDOREXPERIMENT=1 go generate k8s.io/kops/upup/pkg/fi/cloudup/gcetasks
+	GO15VENDOREXPERIMENT=1 go generate k8s.io/kops/upup/pkg/fi/fitasks
 
 test:
-	GO15VENDOREXPERIMENT=1 go test k8s.io/kube-deploy/upup/cmd/...
-	GO15VENDOREXPERIMENT=1 go test k8s.io/kube-deploy/upup/pkg/...
+	GO15VENDOREXPERIMENT=1 go test k8s.io/kops/cmd/...
+	GO15VENDOREXPERIMENT=1 go test k8s.io/kops/upup/pkg/...
 
 godeps:
 	# I think strip-vendor is the workaround for 25572
@@ -20,15 +20,15 @@ gofmt:
 	gofmt -w -s cmd/
 	gofmt -w -s pkg/
 
-upup-tar: gocode
-	rm -rf .build/upup/tar
-	mkdir -p .build/upup/tar/upup/
-	cp ${GOPATH}/bin/cloudup .build/upup/tar/upup/cloudup
-	cp ${GOPATH}/bin/upup .build/upup/tar/upup/upup
-	cp -r models/ .build/upup/tar/upup/models/
-	tar czvf .build/upup.tar.gz -C .build/upup/tar/ .
-	tar tvf .build/upup.tar.gz
-	(sha1sum .build/upup.tar.gz | cut -d' ' -f1) > .build/upup.tar.gz.sha1
+kops-tar: gocode
+	rm -rf .build/kops/tar
+	mkdir -p .build/kops/tar/kops/
+	cp ${GOPATH}/bin/cloudup .build/kops/tar/kops/cloudup
+	cp ${GOPATH}/bin/kops .build/kops/tar/kops/kops
+	cp -r models/ .build/kops/tar/kops/models/
+	tar czvf .build/kops.tar.gz -C .build/kops/tar/ .
+	tar tvf .build/kops.tar.gz
+	(sha1sum .build/kops.tar.gz | cut -d' ' -f1) > .build/kops.tar.gz.sha1
 
 nodeup-tar: gocode
 	rm -rf .build/nodeup/tar
@@ -39,14 +39,14 @@ nodeup-tar: gocode
 	tar tvf .build/nodeup.tar.gz
 	(sha1sum .build/nodeup.tar.gz | cut -d' ' -f1) > .build/nodeup.tar.gz.sha1 
 
-upload: nodeup-tar upup-tar
+upload: nodeup-tar kops-tar
 	rm -rf .build/s3
 	mkdir -p .build/s3/nodeup
 	cp .build/nodeup.tar.gz .build/s3/nodeup/nodeup-1.3.tar.gz
 	cp .build/nodeup.tar.gz.sha1 .build/s3/nodeup/nodeup-1.3.tar.gz.sha1
-	mkdir -p .build/s3/upup
-	cp .build/upup.tar.gz .build/s3/upup/upup-1.3.tar.gz
-	cp .build/upup.tar.gz.sha1 .build/s3/upup/upup-1.3.tar.gz.sha1
+	mkdir -p .build/s3/kops
+	cp .build/kops.tar.gz .build/s3/kops/kops-1.3.tar.gz
+	cp .build/kops.tar.gz.sha1 .build/s3/kops/kops-1.3.tar.gz.sha1
 	aws s3 sync --acl public-read .build/s3/ s3://kubeupv2/
 
 push: nodeup-tar

cmd/cloudup/createcluster_test.go

@@ -3,9 +3,9 @@ package main
 import (
 	"fmt"
 	"github.com/golang/glog"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup"
-	"k8s.io/kube-deploy/upup/pkg/fi/vfs"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/cloudup"
+	"k8s.io/kops/upup/pkg/fi/vfs"
 	"testing"
 )
 

cmd/cloudup/main.go

@@ -4,11 +4,11 @@ import (
 	goflag "flag"
 	"github.com/golang/glog"
 	"github.com/spf13/pflag"
-	"k8s.io/kube-deploy/upup/pkg/api"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup"
-	"k8s.io/kube-deploy/upup/pkg/fi/utils"
-	"k8s.io/kube-deploy/upup/pkg/fi/vfs"
+	"k8s.io/kops/upup/pkg/api"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/cloudup"
+	"k8s.io/kops/upup/pkg/fi/utils"
+	"k8s.io/kops/upup/pkg/fi/vfs"
 	"k8s.io/kubernetes/pkg/util/sets"
 	"os"
 	"os/exec"

cmd/kops/addons.go

@@ -6,8 +6,8 @@ import (
 	"encoding/json"
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"
-	"k8s.io/kube-deploy/upup/pkg/fi/utils"
-	"k8s.io/kube-deploy/upup/pkg/kutil"
+	"k8s.io/kops/upup/pkg/fi/utils"
+	"k8s.io/kops/upup/pkg/kutil"
 	"strings"
 )
 

cmd/kops/addons_create.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"
-	"k8s.io/kube-deploy/upup/pkg/fi/vfs"
+	"k8s.io/kops/upup/pkg/fi/vfs"
 )
 
 type AddonsCreateCmd struct {

cmd/kops/addons_get.go

@@ -6,7 +6,7 @@ import (
 	"bytes"
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"
-	"k8s.io/kube-deploy/upup/pkg/kutil"
+	"k8s.io/kops/upup/pkg/kutil"
 	"os"
 	"text/tabwriter"
 )

cmd/kops/delete_cluster.go

@@ -6,11 +6,11 @@ import (
 	"bytes"
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"
-	"k8s.io/kube-deploy/upup/pkg/api"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/awsup"
-	"k8s.io/kube-deploy/upup/pkg/kutil"
+	"k8s.io/kops/upup/pkg/api"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/cloudup"
+	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
+	"k8s.io/kops/upup/pkg/kutil"
 	"os"
 	"reflect"
 	"text/tabwriter"

cmd/kops/export_kubecfg.go

@@ -6,9 +6,9 @@ import (
 	"github.com/spf13/cobra"
 	"io"
 	"io/ioutil"
-	"k8s.io/kube-deploy/upup/pkg/api"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/kubecfg"
+	"k8s.io/kops/upup/pkg/api"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/kubecfg"
 	"os"
 	"path"
 )

cmd/kops/get_cluster.go

@@ -6,8 +6,8 @@ import (
 	"bytes"
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"
-	"k8s.io/kube-deploy/upup/pkg/api"
-	"k8s.io/kube-deploy/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/api"
+	"k8s.io/kops/upup/pkg/fi"
 	"os"
 	"reflect"
 	"text/tabwriter"

cmd/kops/import_cluster.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/awsup"
-	"k8s.io/kube-deploy/upup/pkg/kutil"
+	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
+	"k8s.io/kops/upup/pkg/kutil"
 )
 
 type ImportClusterCmd struct {

cmd/kops/rollingupdate_cluster.go

@@ -6,8 +6,8 @@ import (
 	"bytes"
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/awsup"
-	"k8s.io/kube-deploy/upup/pkg/kutil"
+	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
+	"k8s.io/kops/upup/pkg/kutil"
 	"os"
 	"text/tabwriter"
 )

cmd/kops/root.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/vfs"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/vfs"
 	"strings"
 )
 
@@ -24,10 +24,10 @@ type RootCmd struct {
 
 var rootCommand = RootCmd{
 	cobraCommand: &cobra.Command{
-		Use:   "upup",
-		Short: "upup manages kubernetes clusters",
-		Long: `upup manages kubernetes clusters.
-It allows you to create, destroy, upgrade and maintain them.`,
+		Use:   "kops",
+		Short: "kops is kubernetes ops",
+		Long: `kops is kubernetes ops.
+It allows you to create, destroy, upgrade and maintain clusters.`,
 	},
 }
 
@@ -46,7 +46,7 @@ func init() {
 
 	cmd.PersistentFlags().AddGoFlagSet(goflag.CommandLine)
 
-	cmd.PersistentFlags().StringVar(&rootCommand.configFile, "config", "", "config file (default is $HOME/.upup.yaml)")
+	cmd.PersistentFlags().StringVar(&rootCommand.configFile, "config", "", "config file (default is $HOME/.kops.yaml)")
 
 	defaultStateStore := os.Getenv("KOPS_STATE_STORE")
 	cmd.PersistentFlags().StringVarP(&rootCommand.stateLocation, "state", "", defaultStateStore, "Location of state storage")
@@ -61,7 +61,7 @@ func initConfig() {
 		viper.SetConfigFile(rootCommand.configFile)
 	}
 
-	viper.SetConfigName(".upup") // name of config file (without extension)
+	viper.SetConfigName(".kops") // name of config file (without extension)
 	viper.AddConfigPath("$HOME") // adding home directory as first search path
 	viper.AutomaticEnv()         // read in environment variables that match
 

cmd/kops/secrets_describe.go

@@ -7,7 +7,7 @@ import (
 	"crypto/rsa"
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"
-	"k8s.io/kube-deploy/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi"
 	"os"
 	"sort"
 	"strings"

cmd/kops/upgrade_cluster.go

@@ -5,9 +5,9 @@ import (
 
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"
-	"k8s.io/kube-deploy/upup/pkg/api"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/awsup"
-	"k8s.io/kube-deploy/upup/pkg/kutil"
+	"k8s.io/kops/upup/pkg/api"
+	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
+	"k8s.io/kops/upup/pkg/kutil"
 )
 
 type UpgradeClusterCmd struct {

cmd/nodeup/main.go

@@ -4,7 +4,7 @@ import (
 	"flag"
 	"fmt"
 	"github.com/golang/glog"
-	"k8s.io/kube-deploy/upup/pkg/fi/nodeup"
+	"k8s.io/kops/upup/pkg/fi/nodeup"
 	"os"
 )
 

kops.iml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="GO_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="jdk" jdkName="Go 1.6" jdkType="Go SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="GOPATH &lt;kops&gt;" level="project" />
+  </component>
+</module>

protokube/Makefile

@@ -1,5 +1,5 @@
 gocode: godeps
-	go install k8s.io/kube-deploy/protokube/cmd/protokube
+	go install k8s.io/kops/protokube/cmd/protokube
 
 godeps:
 	# I think strip-vendor is the workaround for 25572

protokube/cmd/protokube/main.go

@@ -4,7 +4,7 @@ import (
 	"flag"
 	"fmt"
 	"github.com/golang/glog"
-	"k8s.io/kube-deploy/protokube/pkg/protokube"
+	"k8s.io/kops/protokube/pkg/protokube"
 	"net"
 	"os"
 	"strings"

protokube/glide.yaml

@@ -1,4 +1,4 @@
-package: k8s.io/kube-deploy/protokube
+package: k8s.io/kops/protokube
 import:
 - package: github.com/aws/aws-sdk-go
   subpackages:

protokube/images/builder/onbuild.sh

@@ -3,12 +3,12 @@
 mkdir -p /go
 export GOPATH=/go
 
-mkdir -p /go/src/k8s.io/kube-deploy
-ln -s /src/ /go/src/k8s.io/kube-deploy/protokube
+mkdir -p /go/src/k8s.io/kops
+ln -s /src/ /go/src/k8s.io/kops/protokube
 
-ls -lR  /go/src/k8s.io/kube-deploy/protokube/cmd/
+ls -lR  /go/src/k8s.io/kops/protokube/cmd/
 
-cd /go/src/k8s.io/kube-deploy/protokube/
+cd /go/src/k8s.io/kops/protokube/
 make gocode
 
 mkdir -p /src/.build/artifacts/

upup/DEVELOP.md

@@ -6,7 +6,7 @@ Random scribblings useful for development...
 ssh ${HOST} sudo mkdir -p /opt/nodeup/state
 ssh ${HOST} sudo chown -R ${USER} /opt/nodeup
 
-go install k8s.io/kube-deploy/upup/... && rsync ~/k8s/bin/nodeup ${HOST}:/opt/nodeup/nodeup && rsync --delete -avz trees/ ${HOST}:/opt/nodeup/trees/ \
+go install k8s.io/kops/upup/... && rsync ~/k8s/bin/nodeup ${HOST}:/opt/nodeup/nodeup && rsync --delete -avz trees/ ${HOST}:/opt/nodeup/trees/ \
 && rsync state/node.yaml ${HOST}:/opt/nodeup/state/node.yaml \
 && ssh ${HOST} sudo /opt/nodeup/nodeup --v=2  --template=/opt/nodeup/trees/nodeup --state=/opt/nodeup/state --tags=kubernetes_pool,debian_family,gce,systemd
 

upup/README.md

@@ -1,7 +1,6 @@
-## UpUp - CloudUp & NodeUp
+## Kops - Kubernetes Ops
 
-CloudUp and NodeUp are two tools that are aiming to replace kube-up:
-the easiest way to get a production Kubernetes up and running.
+kops is the easiest way to get a production Kubernetes up and running.
 
 (Currently work in progress, but working.  Some of these statements are forward-looking.)
 
@@ -19,8 +18,8 @@ Install glide from [http://glide.sh/](http://glide.sh/)
 
 Build the code (make sure you have set GOPATH):
 ```
-go get -d k8s.io/kube-deploy
-cd ${GOPATH}/src/k8s.io/kube-deploy/upup
+go get -d k8s.io/kops
+cd ${GOPATH}/src/k8s.io/kops/cmd/...
 make
 ```
 
@@ -50,23 +49,23 @@ If you have problems, please set `--v=8 --logtostderr` and open an issue, and pi
 
 ## Build a kubectl file
 
-The upup tool is a CLI for doing administrative tasks.  You can use it to create the kubecfg configuration,
+The kops tool is a CLI for doing administrative tasks.  You can use it to create the kubecfg configuration,
 for use with kubectl:
 
 ```
 export MYZONE=<kubernetes.myzone.com>
 export KOPS_STATE_STORE=s3://<somes3bucket>
-${GOPATH}/bin/upup export kubecfg --name=${MYZONE}
+${GOPATH}/bin/kops export kubecfg --name=${MYZONE}
 ```
 
 ## Delete the cluster
 
-When you're done, you can also have upup delete the cluster.  It will delete all AWS resources tagged
+When you're done, you can also have kops delete the cluster.  It will delete all AWS resources tagged
 with the cluster name in the specified region.
 
 ```
 export MYZONE=<kubernetes.myzone.com>
-${GOPATH}/bin/upup delete cluster --region=us-east-1 --name=${MYZONE} # --yes
+${GOPATH}/bin/kops delete cluster --region=us-east-1 --name=${MYZONE} # --yes
 ```
 
 You must pass --yes to actually delete resources (without the `#` comment!)

upup/docs/run_in_existing_vpc.md

@@ -15,7 +15,7 @@ cloudup --zones=us-east-1b --name=${CLUSTER_NAME} \
   --vpc=vpc-a80734c1 --network-cidr=10.100.0.0/16 --dryrun
 ```
 
-Then `upup edit cluster  --name=${CLUSTER_NAME}` should show you something like:
+Then `kops edit cluster  --name=${CLUSTER_NAME}` should show you something like:
 
 ```
 metadata:

upup/docs/state.md

@@ -1,13 +1,13 @@
 # The State Store
 
-upup has the notion of a 'state store'; a location where we store the configuration of your cluster.  State is stored
+kops has the notion of a 'state store'; a location where we store the configuration of your cluster.  State is stored
 here not only when you first create a cluster, but also you can change the state and apply changes to a running cluster.
 
 Eventually, kubernetes services will also pull from the state store, so that we don't need to marshal all our
 configuration through a channel like user-data.  (This is currently done for secrets and SSL keys, for example,
 though we have to copy the data from the state store to a file where components like kubelet can read them).
 
-The state store uses upup's VFS implementation, so can in theory be stored anywhere.  Currently storage on S3
+The state store uses kops's VFS implementation, so can in theory be stored anywhere.  Currently storage on S3
 is supported, but support for GCS is coming soon, along with encrypted storage.
 
 The state store is just files; you can copy the files down and put them into git (or your preferred version

upup/docs/upgrade_from_k8s_12.md

@@ -33,7 +33,7 @@ of the old cluster name, you can find it by looking at the `KubernetesCluster` t
 ```
 export OLD_NAME=kubernetes
 export REGION=us-west-2
-upup import cluster --region ${REGION} --name ${OLD_NAME}
+kops import cluster --region ${REGION} --name ${OLD_NAME}
 ```
 
 ## Verify the cluster configuration
@@ -42,7 +42,7 @@ Now have a look at the cluster configuration, to make sure it looks right.  If i
 open an issue.
 
 ```
-upup edit cluster --name ${OLD_NAME}
+kops edit cluster --name ${OLD_NAME}
 ````
 
 ## Move resources to a new cluster
@@ -60,12 +60,12 @@ The upgrade procedure forces you to choose a new cluster name (e.g. `k8s.mydomai
 
 ```
 export NEW_NAME=k8s.mydomain.com
-upup upgrade cluster --newname ${NEW_NAME} --name ${OLD_NAME}
+kops upgrade cluster --newname ${NEW_NAME} --name ${OLD_NAME}
 ```
 
 If you now list the clusters, you should see both the old cluster & the new cluster
 
-```upup get clusters```
+```kops get clusters```
 
 ## Bring up the new cluster
 
@@ -87,7 +87,7 @@ cloudup --name ${NEW_NAME}
 ## Export kubecfg settings to access the new cluster
 
 ```
-upup export kubecfg --name ${NEW_NAME}
+kops export kubecfg --name ${NEW_NAME}
 ```
 
 Within a few minutes the new cluster should be running.  Try `kubectl get nodes --show-labels`, `kubectl get pods` etc until you are sure that all is well.
@@ -146,9 +146,9 @@ kubectl delete pod --namespace=kube-system kube-dns-v14-4ygfz
 
 Due to a limitation in ELBs (you can't replace all the subnets), if you have ELBs you must do the following:
 
-* `upup edit cluster --name ${NEW_NAME}`
+* `kops edit cluster --name ${NEW_NAME}`
 * Add a zone to the `zones` section and save the file (it normally suffices to just add `- name: us-west-2b` or whatever
-  zone you are adding; upup will auto-populate the CIDR.
+  zone you are adding; kops will auto-populate the CIDR.
 * cloudup --name ${NEW_NAME}
 
 
@@ -163,7 +163,7 @@ You should now have an ELB in your new zones; within a few minutes k8s should re
 ## Delete remaining resources of the old cluster
 
 ```
-upup delete cluster --name ${OLD_NAME}
+kops delete cluster --name ${OLD_NAME}
 ```
 
 And once you've confirmed it looks right, run with `--yes`

upup/pkg/api/registry.go

@@ -2,8 +2,8 @@ package api
 
 import (
 	"fmt"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/vfs"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/vfs"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"strings"
 	"time"

upup/pkg/fi/assetstore.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"github.com/golang/glog"
 	"io"
-	"k8s.io/kube-deploy/upup/pkg/fi/hashing"
-	"k8s.io/kube-deploy/upup/pkg/fi/utils"
+	"k8s.io/kops/upup/pkg/fi/hashing"
+	"k8s.io/kops/upup/pkg/fi/utils"
 	"net/http"
 	"os"
 	"os/exec"

upup/pkg/fi/ca.go

@@ -13,7 +13,7 @@ import (
 	"fmt"
 	"github.com/golang/glog"
 	"io"
-	"k8s.io/kube-deploy/upup/pkg/fi/vfs"
+	"k8s.io/kops/upup/pkg/fi/vfs"
 	"math/big"
 	"time"
 )

upup/pkg/fi/cloudup/awstasks/autoscalinggroup.go

@@ -6,9 +6,9 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/autoscaling"
 	"github.com/golang/glog"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/awsup"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/terraform"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
+	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 	"reflect"
 	"sort"
 	"strings"

upup/pkg/fi/cloudup/awstasks/autoscalinggroup_fitask.go

@@ -5,7 +5,7 @@ package awstasks
 import (
 	"encoding/json"
 
-	"k8s.io/kube-deploy/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi"
 )
 
 // AutoscalingGroup

upup/pkg/fi/cloudup/awstasks/block_device_mappings.go

@@ -4,7 +4,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/autoscaling"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"k8s.io/kube-deploy/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi"
 )
 
 type BlockDeviceMapping struct {

upup/pkg/fi/cloudup/awstasks/dhcp_options.go

@@ -6,9 +6,9 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/awsup"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/terraform"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
+	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 	"strings"
 )
 

upup/pkg/fi/cloudup/awstasks/dhcpoptions_fitask.go

@@ -5,7 +5,7 @@ package awstasks
 import (
 	"encoding/json"
 
-	"k8s.io/kube-deploy/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi"
 )
 
 // DHCPOptions

upup/pkg/fi/cloudup/awstasks/dnsname.go

@@ -6,9 +6,9 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/route53"
 	"github.com/golang/glog"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/awsup"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/terraform"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
+	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 	"strings"
 )
 

upup/pkg/fi/cloudup/awstasks/dnsname_fitask.go

@@ -5,7 +5,7 @@ package awstasks
 import (
 	"encoding/json"
 
-	"k8s.io/kube-deploy/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi"
 )
 
 // DNSName

upup/pkg/fi/cloudup/awstasks/dnszone.go

@@ -6,9 +6,9 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/route53"
 	"github.com/golang/glog"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/awsup"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/terraform"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
+	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 	"strings"
 )
 

upup/pkg/fi/cloudup/awstasks/dnszone_fitask.go

@@ -5,7 +5,7 @@ package awstasks
 import (
 	"encoding/json"
 
-	"k8s.io/kube-deploy/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi"
 )
 
 // DNSZone

upup/pkg/fi/cloudup/awstasks/ebsvolume.go

@@ -5,9 +5,9 @@ import (
 
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/awsup"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/terraform"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
+	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
 //go:generate fitask -type=EBSVolume

upup/pkg/fi/cloudup/awstasks/ebsvolume_fitask.go

@@ -5,7 +5,7 @@ package awstasks
 import (
 	"encoding/json"
 
-	"k8s.io/kube-deploy/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi"
 )
 
 // EBSVolume

upup/pkg/fi/cloudup/awstasks/elastic_ip.go

@@ -6,8 +6,8 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/awsup"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
 )
 
 //go:generate fitask -type=ElasticIP

upup/pkg/fi/cloudup/awstasks/elasticip_fitask.go

@@ -5,7 +5,7 @@ package awstasks
 import (
 	"encoding/json"
 
-	"k8s.io/kube-deploy/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi"
 )
 
 // ElasticIP

upup/pkg/fi/cloudup/awstasks/iaminstanceprofile.go

@@ -6,9 +6,9 @@ import (
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/service/iam"
 	"github.com/golang/glog"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/awsup"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/terraform"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
+	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
 //go:generate fitask -type=IAMInstanceProfile

upup/pkg/fi/cloudup/awstasks/iaminstanceprofile_fitask.go

@@ -5,7 +5,7 @@ package awstasks
 import (
 	"encoding/json"
 
-	"k8s.io/kube-deploy/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi"
 )
 
 // IAMInstanceProfile

upup/pkg/fi/cloudup/awstasks/iaminstanceprofilerole.go

@@ -7,9 +7,9 @@ import (
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/service/iam"
 	"github.com/golang/glog"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/awsup"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/terraform"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
+	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
 type IAMInstanceProfileRole struct {

upup/pkg/fi/cloudup/awstasks/iamrole.go

@@ -8,9 +8,9 @@ import (
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/service/iam"
 	"github.com/golang/glog"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/awsup"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/terraform"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
+	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 	"k8s.io/kubernetes/pkg/util/diff"
 	"net/url"
 	"reflect"

upup/pkg/fi/cloudup/awstasks/iamrole_fitask.go

@@ -5,7 +5,7 @@ package awstasks
 import (
 	"encoding/json"
 
-	"k8s.io/kube-deploy/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi"
 )
 
 // IAMRole

upup/pkg/fi/cloudup/awstasks/iamrolepolicy.go

@@ -7,9 +7,9 @@ import (
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/service/iam"
 	"github.com/golang/glog"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/awsup"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/terraform"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
+	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 	"k8s.io/kubernetes/pkg/util/diff"
 	"net/url"
 )

upup/pkg/fi/cloudup/awstasks/iamrolepolicy_fitask.go

@@ -5,7 +5,7 @@ package awstasks
 import (
 	"encoding/json"
 
-	"k8s.io/kube-deploy/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi"
 )
 
 // IAMRolePolicy

upup/pkg/fi/cloudup/awstasks/instance.go

@@ -7,9 +7,9 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/awsup"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/terraform"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
+	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 	"strings"
 )
 

upup/pkg/fi/cloudup/awstasks/instance_elasticip_attachment.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/awsup"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
 )
 
 type InstanceElasticIPAttachment struct {

upup/pkg/fi/cloudup/awstasks/instance_volume_attachment.go

@@ -6,8 +6,8 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/awsup"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
 )
 
 type InstanceVolumeAttachment struct {

upup/pkg/fi/cloudup/awstasks/internetgateway.go

@@ -5,9 +5,9 @@ import (
 
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/awsup"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/terraform"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
+	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
 //go:generate fitask -type=InternetGateway

upup/pkg/fi/cloudup/awstasks/internetgateway_fitask.go

@@ -5,7 +5,7 @@ package awstasks
 import (
 	"encoding/json"
 
-	"k8s.io/kube-deploy/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi"
 )
 
 // InternetGateway

upup/pkg/fi/cloudup/awstasks/launchconfiguration.go

@@ -7,9 +7,9 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/autoscaling"
 	"github.com/golang/glog"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/awsup"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/terraform"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
+	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 	"strings"
 )
 

upup/pkg/fi/cloudup/awstasks/launchconfiguration_fitask.go

@@ -5,7 +5,7 @@ package awstasks
 import (
 	"encoding/json"
 
-	"k8s.io/kube-deploy/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi"
 )
 
 // LaunchConfiguration

upup/pkg/fi/cloudup/awstasks/load_balancer.go

@@ -7,8 +7,8 @@ import (
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/service/elb"
 	"github.com/golang/glog"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/awsup"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
 	"strconv"
 )
 

upup/pkg/fi/cloudup/awstasks/load_balancer_attachment.go

@@ -6,8 +6,8 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/autoscaling"
 	"github.com/golang/glog"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/awsup"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
 )
 
 type LoadBalancerAttachment struct {

upup/pkg/fi/cloudup/awstasks/loadbalancer_fitask.go

@@ -5,7 +5,7 @@ package awstasks
 import (
 	"encoding/json"
 
-	"k8s.io/kube-deploy/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi"
 )
 
 // LoadBalancer

upup/pkg/fi/cloudup/awstasks/loadbalancer_healthchecks.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/aws/aws-sdk-go/service/elb"
 	"github.com/golang/glog"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/awsup"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
 )
 
 type LoadBalancerHealthChecks struct {

upup/pkg/fi/cloudup/awstasks/route.go

@@ -6,9 +6,9 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/awsup"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/terraform"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
+	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
 //go:generate fitask -type=Route

upup/pkg/fi/cloudup/awstasks/route_fitask.go

@@ -5,7 +5,7 @@ package awstasks
 import (
 	"encoding/json"
 
-	"k8s.io/kube-deploy/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi"
 )
 
 // Route

upup/pkg/fi/cloudup/awstasks/routetable.go

@@ -5,9 +5,9 @@ import (
 
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/awsup"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/terraform"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
+	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
 //go:generate fitask -type=RouteTable

upup/pkg/fi/cloudup/awstasks/routetable_fitask.go

@@ -5,7 +5,7 @@ package awstasks
 import (
 	"encoding/json"
 
-	"k8s.io/kube-deploy/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi"
 )
 
 // RouteTable

upup/pkg/fi/cloudup/awstasks/routetableassociation.go

@@ -6,9 +6,9 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/awsup"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/terraform"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
+	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
 //go:generate fitask -type=RouteTableAssociation

upup/pkg/fi/cloudup/awstasks/routetableassociation_fitask.go

@@ -5,7 +5,7 @@ package awstasks
 import (
 	"encoding/json"
 
-	"k8s.io/kube-deploy/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi"
 )
 
 // RouteTableAssociation

upup/pkg/fi/cloudup/awstasks/securitygroup.go

@@ -5,9 +5,9 @@ import (
 
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/awsup"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/terraform"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
+	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
 //go:generate fitask -type=SecurityGroup

upup/pkg/fi/cloudup/awstasks/securitygroup_fitask.go

@@ -5,7 +5,7 @@ package awstasks
 import (
 	"encoding/json"
 
-	"k8s.io/kube-deploy/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi"
 )
 
 // SecurityGroup

upup/pkg/fi/cloudup/awstasks/securitygrouprule.go

@@ -6,9 +6,9 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/awsup"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/terraform"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
+	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
 //go:generate fitask -type=SecurityGroupRule

upup/pkg/fi/cloudup/awstasks/securitygrouprule_fitask.go

@@ -5,7 +5,7 @@ package awstasks
 import (
 	"encoding/json"
 
-	"k8s.io/kube-deploy/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi"
 )
 
 // SecurityGroupRule

upup/pkg/fi/cloudup/awstasks/sshkey.go

@@ -14,10 +14,10 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
 	"golang.org/x/crypto/ssh"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/awsup"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/terraform"
-	"k8s.io/kube-deploy/upup/pkg/fi/utils"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
+	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
+	"k8s.io/kops/upup/pkg/fi/utils"
 	"reflect"
 	"strings"
 )

upup/pkg/fi/cloudup/awstasks/sshkey_fitask.go

@@ -5,7 +5,7 @@ package awstasks
 import (
 	"encoding/json"
 
-	"k8s.io/kube-deploy/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi"
 )
 
 // SSHKey

upup/pkg/fi/cloudup/awstasks/subnet.go

@@ -5,10 +5,10 @@ import (
 
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/awsup"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/terraform"
-	"k8s.io/kube-deploy/upup/pkg/fi/utils"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
+	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
+	"k8s.io/kops/upup/pkg/fi/utils"
 )
 
 //go:generate fitask -type=Subnet

upup/pkg/fi/cloudup/awstasks/subnet_fitask.go

@@ -5,7 +5,7 @@ package awstasks
 import (
 	"encoding/json"
 
-	"k8s.io/kube-deploy/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi"
 )
 
 // Subnet

upup/pkg/fi/cloudup/awstasks/vpc.go

@@ -6,9 +6,9 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/awsup"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/terraform"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
+	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
 //go:generate fitask -type=VPC

upup/pkg/fi/cloudup/awstasks/vpc_dhcpoptions_association.go

@@ -5,9 +5,9 @@ import (
 
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/awsup"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/terraform"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
+	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 )
 
 type VPCDHCPOptionsAssociation struct {

upup/pkg/fi/cloudup/awstasks/vpc_fitask.go

@@ -5,7 +5,7 @@ package awstasks
 import (
 	"encoding/json"
 
-	"k8s.io/kube-deploy/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi"
 )
 
 // VPC

upup/pkg/fi/cloudup/awsup/aws_apitarget.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/golang/glog"
-	"k8s.io/kube-deploy/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi"
 	"time"
 )
 

upup/pkg/fi/cloudup/awsup/aws_cloud.go

@@ -11,7 +11,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/iam"
 	"github.com/aws/aws-sdk-go/service/route53"
 	"github.com/golang/glog"
-	"k8s.io/kube-deploy/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi"
 	"strings"
 	"time"
 )

upup/pkg/fi/cloudup/create_cluster.go

@@ -6,17 +6,17 @@ import (
 	"fmt"
 	"github.com/golang/glog"
 	"io/ioutil"
-	"k8s.io/kube-deploy/upup/pkg/api"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/awstasks"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/awsup"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/gce"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/gcetasks"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/terraform"
-	"k8s.io/kube-deploy/upup/pkg/fi/fitasks"
-	"k8s.io/kube-deploy/upup/pkg/fi/loader"
-	"k8s.io/kube-deploy/upup/pkg/fi/utils"
-	"k8s.io/kube-deploy/upup/pkg/fi/vfs"
+	"k8s.io/kops/upup/pkg/api"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/cloudup/awstasks"
+	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
+	"k8s.io/kops/upup/pkg/fi/cloudup/gce"
+	"k8s.io/kops/upup/pkg/fi/cloudup/gcetasks"
+	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
+	"k8s.io/kops/upup/pkg/fi/fitasks"
+	"k8s.io/kops/upup/pkg/fi/loader"
+	"k8s.io/kops/upup/pkg/fi/utils"
+	"k8s.io/kops/upup/pkg/fi/vfs"
 	"net"
 	"os"
 	"path"

upup/pkg/fi/cloudup/gce/gce_apitarget.go

@@ -1,7 +1,7 @@
 package gce
 
 import (
-	"k8s.io/kube-deploy/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi"
 )
 
 type GCEAPITarget struct {

upup/pkg/fi/cloudup/gce/gce_cloud.go

@@ -7,7 +7,7 @@ import (
 	"golang.org/x/oauth2/google"
 	"google.golang.org/api/compute/v1"
 	"google.golang.org/api/storage/v1"
-	"k8s.io/kube-deploy/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi"
 )
 
 type GCECloud struct {

upup/pkg/fi/cloudup/gcetasks/firewall_rule.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 
 	"google.golang.org/api/compute/v1"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/gce"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/terraform"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/cloudup/gce"
+	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 	"strings"
 )
 

upup/pkg/fi/cloudup/gcetasks/firewallrule_fitask.go

@@ -5,7 +5,7 @@ package gcetasks
 import (
 	"encoding/json"
 
-	"k8s.io/kube-deploy/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi"
 )
 
 // FirewallRule

upup/pkg/fi/cloudup/gcetasks/instance.go

@@ -5,9 +5,9 @@ import (
 
 	"github.com/golang/glog"
 	"google.golang.org/api/compute/v1"
-	"k8s.io/kube-deploy/upup/pkg/fi"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/gce"
-	"k8s.io/kube-deploy/upup/pkg/fi/cloudup/terraform"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/cloudup/gce"
+	"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
 	"reflect"
 	"strings"
 	"time"