diff --git a/.travis.yml b/.travis.yml index c45e2b46e..2f019265b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: go go: - 1.7 -go_import_path: github.com/coreos/kube-aws +go_import_path: github.com/kubernetes-incubator/kube-aws script: - make test-with-cover after_success: diff --git a/cfnstack/assets.go b/cfnstack/assets.go index 08f934659..f526b2e59 100644 --- a/cfnstack/assets.go +++ b/cfnstack/assets.go @@ -2,7 +2,7 @@ package cfnstack import ( "fmt" - "github.com/coreos/kube-aws/model" + "github.com/kubernetes-incubator/kube-aws/model" "path/filepath" "strings" ) diff --git a/cfnstack/provisioner.go b/cfnstack/provisioner.go index f214e9ab3..74059cf8a 100644 --- a/cfnstack/provisioner.go +++ b/cfnstack/provisioner.go @@ -7,7 +7,7 @@ import ( "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/cloudformation" "github.com/aws/aws-sdk-go/service/s3" - "github.com/coreos/kube-aws/model" + "github.com/kubernetes-incubator/kube-aws/model" "strings" "time" ) diff --git a/cfnstack/provisioner_test.go b/cfnstack/provisioner_test.go index 195368f87..334409cd7 100644 --- a/cfnstack/provisioner_test.go +++ b/cfnstack/provisioner_test.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" "github.com/aws/aws-sdk-go/service/s3" - "github.com/coreos/kube-aws/model" + "github.com/kubernetes-incubator/kube-aws/model" "testing" ) diff --git a/cmd/calculator.go b/cmd/calculator.go index 1c3859f7c..51af5a025 100644 --- a/cmd/calculator.go +++ b/cmd/calculator.go @@ -2,7 +2,7 @@ package cmd import ( "fmt" - "github.com/coreos/kube-aws/core/root" + "github.com/kubernetes-incubator/kube-aws/core/root" "github.com/spf13/cobra" "strings" ) diff --git a/cmd/destroy.go b/cmd/destroy.go index dca8f1e3d..64b9bf0f2 100644 --- a/cmd/destroy.go +++ b/cmd/destroy.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/coreos/kube-aws/core/root" + "github.com/kubernetes-incubator/kube-aws/core/root" ) var ( diff --git a/cmd/init.go b/cmd/init.go index 5817d25ec..e58892998 100644 --- a/cmd/init.go +++ b/cmd/init.go @@ -3,8 +3,8 @@ package cmd import ( "fmt" - "github.com/coreos/kube-aws/core/controlplane/config" - "github.com/coreos/kube-aws/filegen" + "github.com/kubernetes-incubator/kube-aws/core/controlplane/config" + "github.com/kubernetes-incubator/kube-aws/filegen" "github.com/spf13/cobra" ) diff --git a/cmd/render.go b/cmd/render.go index 9316a7f23..4ea7bb897 100644 --- a/cmd/render.go +++ b/cmd/render.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/coreos/kube-aws/core/controlplane/config" - "github.com/coreos/kube-aws/core/root" + "github.com/kubernetes-incubator/kube-aws/core/controlplane/config" + "github.com/kubernetes-incubator/kube-aws/core/root" "github.com/spf13/cobra" ) diff --git a/cmd/status.go b/cmd/status.go index b720facf9..f394a4e88 100644 --- a/cmd/status.go +++ b/cmd/status.go @@ -3,7 +3,7 @@ package cmd import ( "fmt" - "github.com/coreos/kube-aws/core/root" + "github.com/kubernetes-incubator/kube-aws/core/root" "github.com/spf13/cobra" ) diff --git a/cmd/up.go b/cmd/up.go index a21a294c2..4aacbdfd5 100644 --- a/cmd/up.go +++ b/cmd/up.go @@ -3,7 +3,7 @@ package cmd import ( "fmt" - "github.com/coreos/kube-aws/core/root" + "github.com/kubernetes-incubator/kube-aws/core/root" "github.com/spf13/cobra" ) diff --git a/cmd/update.go b/cmd/update.go index a54fa795d..e7e13aa53 100644 --- a/cmd/update.go +++ b/cmd/update.go @@ -3,7 +3,7 @@ package cmd import ( "fmt" - "github.com/coreos/kube-aws/core/root" + "github.com/kubernetes-incubator/kube-aws/core/root" "github.com/spf13/cobra" ) diff --git a/cmd/validate.go b/cmd/validate.go index f242e3836..be516bb34 100644 --- a/cmd/validate.go +++ b/cmd/validate.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/coreos/kube-aws/core/root" + "github.com/kubernetes-incubator/kube-aws/core/root" "github.com/spf13/cobra" ) diff --git a/cmd/version.go b/cmd/version.go index 35bbcc1b6..c41daad6e 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -3,7 +3,7 @@ package cmd import ( "fmt" - "github.com/coreos/kube-aws/core/controlplane/cluster" + "github.com/kubernetes-incubator/kube-aws/core/controlplane/cluster" "github.com/spf13/cobra" ) diff --git a/core/controlplane/cluster/cluster.go b/core/controlplane/cluster/cluster.go index 080cd3323..26fd27cae 100644 --- a/core/controlplane/cluster/cluster.go +++ b/core/controlplane/cluster/cluster.go @@ -15,8 +15,8 @@ import ( "github.com/aws/aws-sdk-go/service/route53" "github.com/aws/aws-sdk-go/service/s3" - "github.com/coreos/kube-aws/cfnstack" - "github.com/coreos/kube-aws/core/controlplane/config" + "github.com/kubernetes-incubator/kube-aws/cfnstack" + "github.com/kubernetes-incubator/kube-aws/core/controlplane/config" ) // VERSION set by build script diff --git a/core/controlplane/cluster/cluster_test.go b/core/controlplane/cluster/cluster_test.go index c37ac0fc7..b59a9626e 100644 --- a/core/controlplane/cluster/cluster_test.go +++ b/core/controlplane/cluster/cluster_test.go @@ -10,9 +10,9 @@ import ( "github.com/aws/aws-sdk-go/service/cloudformation" "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/route53" - "github.com/coreos/kube-aws/cfnstack" - "github.com/coreos/kube-aws/core/controlplane/config" - "github.com/coreos/kube-aws/test/helper" + "github.com/kubernetes-incubator/kube-aws/cfnstack" + "github.com/kubernetes-incubator/kube-aws/core/controlplane/config" + "github.com/kubernetes-incubator/kube-aws/test/helper" yaml "gopkg.in/yaml.v2" ) diff --git a/core/controlplane/config/config.go b/core/controlplane/config/config.go index abde6700c..a1b5cd463 100644 --- a/core/controlplane/config/config.go +++ b/core/controlplane/config/config.go @@ -12,12 +12,12 @@ import ( "unicode/utf8" "github.com/coreos/go-semver/semver" - "github.com/coreos/kube-aws/cfnresource" - "github.com/coreos/kube-aws/coreos/amiregistry" - "github.com/coreos/kube-aws/filereader/userdatatemplate" - "github.com/coreos/kube-aws/model" - "github.com/coreos/kube-aws/model/derived" - "github.com/coreos/kube-aws/netutil" + "github.com/kubernetes-incubator/kube-aws/cfnresource" + "github.com/kubernetes-incubator/kube-aws/coreos/amiregistry" + "github.com/kubernetes-incubator/kube-aws/filereader/userdatatemplate" + "github.com/kubernetes-incubator/kube-aws/model" + "github.com/kubernetes-incubator/kube-aws/model/derived" + "github.com/kubernetes-incubator/kube-aws/netutil" yaml "gopkg.in/yaml.v2" "regexp" "sort" @@ -242,7 +242,7 @@ func (c *Cluster) SetDefaults() { } // DEPRECATED AND REMOVED IN THE FUTURE - // See https://github.com/coreos/kube-aws/pull/284#issuecomment-275998862 + // See https://github.com/kubernetes-incubator/kube-aws/pull/284#issuecomment-275998862 // // This implies a deployment to an existing VPC with a route table with a preconfigured Internet Gateway // and all the subnets created by kube-aws are public @@ -255,7 +255,7 @@ func (c *Cluster) SetDefaults() { } // DEPRECATED AND REMOVED IN THE FUTURE - // See https://github.com/coreos/kube-aws/pull/284#issuecomment-275998862 + // See https://github.com/kubernetes-incubator/kube-aws/pull/284#issuecomment-275998862 // // This implies a deployment to an existing VPC with a route table with a preconfigured NAT Gateway // and all the subnets created by kube-aws are private @@ -956,7 +956,7 @@ func (c Cluster) valid() error { } if c.ControllerInstanceType == "t2.micro" || c.EtcdInstanceType == "t2.micro" || c.ControllerInstanceType == "t2.nano" || c.EtcdInstanceType == "t2.nano" { - fmt.Println(`WARNING: instance types "t2.nano" and "t2.micro" are not recommended. See https://github.com/coreos/kube-aws/issues/258 for more information`) + fmt.Println(`WARNING: instance types "t2.nano" and "t2.micro" are not recommended. See https://github.com/kubernetes-incubator/kube-aws/issues/258 for more information`) } if e := cfnresource.ValidateRoleNameLength(c.ClusterName, c.NestedStackName(), c.Controller.ManagedIamRoleName, c.Region.String()); e != nil { diff --git a/core/controlplane/config/config_test.go b/core/controlplane/config/config_test.go index b03dbfb5a..a2c76942d 100644 --- a/core/controlplane/config/config_test.go +++ b/core/controlplane/config/config_test.go @@ -6,8 +6,8 @@ import ( "reflect" "testing" - "github.com/coreos/kube-aws/model" - "github.com/coreos/kube-aws/netutil" + "github.com/kubernetes-incubator/kube-aws/model" + "github.com/kubernetes-incubator/kube-aws/netutil" ) const minimalConfigYaml = `externalDNSName: test.staging.core-os.net diff --git a/core/controlplane/config/credential.go b/core/controlplane/config/credential.go index 2e7f64f25..ace46de91 100644 --- a/core/controlplane/config/credential.go +++ b/core/controlplane/config/credential.go @@ -15,7 +15,7 @@ type RawCredentialOnDisk struct { } // The fact KMS encryption produces different ciphertexts for the same plaintext had been -// causing unnecessary node replacements(https://github.com/coreos/kube-aws/issues/107) +// causing unnecessary node replacements(https://github.com/kubernetes-incubator/kube-aws/issues/107) // Persist encrypted assets for caching purpose so that we can avoid that. type EncryptedCredentialOnDisk struct { content []byte diff --git a/core/controlplane/config/stack_config.go b/core/controlplane/config/stack_config.go index 6dbebe9d3..2b594527d 100644 --- a/core/controlplane/config/stack_config.go +++ b/core/controlplane/config/stack_config.go @@ -2,9 +2,9 @@ package config import ( "fmt" - "github.com/coreos/kube-aws/coreos/userdatavalidation" - "github.com/coreos/kube-aws/filereader/jsontemplate" - "github.com/coreos/kube-aws/fingerprint" + "github.com/kubernetes-incubator/kube-aws/coreos/userdatavalidation" + "github.com/kubernetes-incubator/kube-aws/filereader/jsontemplate" + "github.com/kubernetes-incubator/kube-aws/fingerprint" "net/url" ) diff --git a/core/controlplane/config/stack_config_test.go b/core/controlplane/config/stack_config_test.go index 9bdf7a10c..99abf1b77 100644 --- a/core/controlplane/config/stack_config_test.go +++ b/core/controlplane/config/stack_config_test.go @@ -1,8 +1,8 @@ package config import ( - "github.com/coreos/kube-aws/model" - "github.com/coreos/kube-aws/test/helper" + "github.com/kubernetes-incubator/kube-aws/model" + "github.com/kubernetes-incubator/kube-aws/test/helper" "testing" ) diff --git a/core/controlplane/config/tls_config.go b/core/controlplane/config/tls_config.go index 72791b063..e1fdd73e5 100644 --- a/core/controlplane/config/tls_config.go +++ b/core/controlplane/config/tls_config.go @@ -13,10 +13,10 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/kms" - "github.com/coreos/kube-aws/gzipcompressor" - "github.com/coreos/kube-aws/model" - "github.com/coreos/kube-aws/netutil" - "github.com/coreos/kube-aws/tlsutil" + "github.com/kubernetes-incubator/kube-aws/gzipcompressor" + "github.com/kubernetes-incubator/kube-aws/model" + "github.com/kubernetes-incubator/kube-aws/netutil" + "github.com/kubernetes-incubator/kube-aws/tlsutil" ) // PEM encoded TLS assets. diff --git a/core/controlplane/config/tls_config_test.go b/core/controlplane/config/tls_config_test.go index c61da16a3..bec636998 100644 --- a/core/controlplane/config/tls_config_test.go +++ b/core/controlplane/config/tls_config_test.go @@ -7,8 +7,8 @@ import ( "crypto/x509" "encoding/pem" "fmt" - "github.com/coreos/kube-aws/model" - "github.com/coreos/kube-aws/test/helper" + "github.com/kubernetes-incubator/kube-aws/model" + "github.com/kubernetes-incubator/kube-aws/test/helper" "os" "path/filepath" "reflect" @@ -117,7 +117,7 @@ func TestReadOrCreateCompactTLSAssets(t *testing.T) { EncryptService: &dummyEncryptService{}, } - // See https://github.com/coreos/kube-aws/issues/107 + // See https://github.com/kubernetes-incubator/kube-aws/issues/107 t.Run("CachedToPreventUnnecessaryNodeReplacement", func(t *testing.T) { created, err := ReadOrCreateCompactTLSAssets(dir, kmsConfig) diff --git a/core/controlplane/config/token_config.go b/core/controlplane/config/token_config.go index 97e6ae52d..dc406bafa 100644 --- a/core/controlplane/config/token_config.go +++ b/core/controlplane/config/token_config.go @@ -12,7 +12,7 @@ import ( "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/kms" - "github.com/coreos/kube-aws/gzipcompressor" + "github.com/kubernetes-incubator/kube-aws/gzipcompressor" ) // Contents of the CSV file holding auth tokens. diff --git a/core/controlplane/config/token_config_test.go b/core/controlplane/config/token_config_test.go index cf3e7961b..20faa3dd5 100644 --- a/core/controlplane/config/token_config_test.go +++ b/core/controlplane/config/token_config_test.go @@ -9,8 +9,8 @@ import ( "path/filepath" "reflect" - "github.com/coreos/kube-aws/model" - "github.com/coreos/kube-aws/test/helper" + "github.com/kubernetes-incubator/kube-aws/model" + "github.com/kubernetes-incubator/kube-aws/test/helper" ) // The default token file is empty, and since encryption/compaction only @@ -46,7 +46,7 @@ func TestReadOrCreateCompactEmptyAuthTokens(t *testing.T) { EncryptService: &dummyEncryptService{}, } - // See https://github.com/coreos/kube-aws/issues/107 + // See https://github.com/kubernetes-incubator/kube-aws/issues/107 t.Run("CachedToPreventUnnecessaryNodeReplacement", func(t *testing.T) { created, err := ReadOrCreateCompactAuthTokens(dir, kmsConfig) @@ -137,7 +137,7 @@ func TestReadOrCreateCompactNonEmptyValidAuthTokens(t *testing.T) { writeSampleValidAuthTokenFile(dir, t) - // See https://github.com/coreos/kube-aws/issues/107 + // See https://github.com/kubernetes-incubator/kube-aws/issues/107 t.Run("CachedToPreventUnnecessaryNodeReplacement", func(t *testing.T) { created, err := ReadOrCreateCompactAuthTokens(dir, kmsConfig) diff --git a/core/controlplane/config/user_data_config_test.go b/core/controlplane/config/user_data_config_test.go index 29acb404f..0a1827691 100644 --- a/core/controlplane/config/user_data_config_test.go +++ b/core/controlplane/config/user_data_config_test.go @@ -8,7 +8,7 @@ import ( "fmt" "github.com/aws/aws-sdk-go/service/kms" "github.com/coreos/coreos-cloudinit/config/validate" - "github.com/coreos/kube-aws/test/helper" + "github.com/kubernetes-incubator/kube-aws/test/helper" ) var numEncryption int diff --git a/core/nodepool/cluster/cluster.go b/core/nodepool/cluster/cluster.go index 4b35a3c60..6b8add817 100644 --- a/core/nodepool/cluster/cluster.go +++ b/core/nodepool/cluster/cluster.go @@ -9,8 +9,8 @@ import ( "github.com/aws/aws-sdk-go/service/cloudformation" "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/s3" - "github.com/coreos/kube-aws/cfnstack" - "github.com/coreos/kube-aws/core/nodepool/config" + "github.com/kubernetes-incubator/kube-aws/cfnstack" + "github.com/kubernetes-incubator/kube-aws/core/nodepool/config" "text/tabwriter" ) diff --git a/core/nodepool/cluster/cluster_test.go b/core/nodepool/cluster/cluster_test.go index b2c7731ca..e59cee5ee 100644 --- a/core/nodepool/cluster/cluster_test.go +++ b/core/nodepool/cluster/cluster_test.go @@ -9,9 +9,9 @@ import ( "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/cloudformation" "github.com/aws/aws-sdk-go/service/ec2" - controlplane "github.com/coreos/kube-aws/core/controlplane/config" - "github.com/coreos/kube-aws/core/nodepool/config" - "github.com/coreos/kube-aws/test/helper" + controlplane "github.com/kubernetes-incubator/kube-aws/core/controlplane/config" + "github.com/kubernetes-incubator/kube-aws/core/nodepool/config" + "github.com/kubernetes-incubator/kube-aws/test/helper" ) type dummyEC2CreateVolumeService struct { diff --git a/core/nodepool/cluster/factory.go b/core/nodepool/cluster/factory.go index 1e3449193..c9bd1a171 100644 --- a/core/nodepool/cluster/factory.go +++ b/core/nodepool/cluster/factory.go @@ -1,8 +1,8 @@ package cluster import ( - controlplane "github.com/coreos/kube-aws/core/controlplane/config" - "github.com/coreos/kube-aws/core/nodepool/config" + controlplane "github.com/kubernetes-incubator/kube-aws/core/controlplane/config" + "github.com/kubernetes-incubator/kube-aws/core/nodepool/config" ) func ClusterRefFromBytes(bytes []byte, main *controlplane.Config, awsDebug bool) (*ClusterRef, error) { diff --git a/core/nodepool/config/config.go b/core/nodepool/config/config.go index 3ead4d2fc..aca097016 100644 --- a/core/nodepool/config/config.go +++ b/core/nodepool/config/config.go @@ -8,12 +8,12 @@ import ( "strings" "errors" - "github.com/coreos/kube-aws/cfnresource" - cfg "github.com/coreos/kube-aws/core/controlplane/config" - "github.com/coreos/kube-aws/coreos/amiregistry" - "github.com/coreos/kube-aws/filereader/userdatatemplate" - "github.com/coreos/kube-aws/model" - "github.com/coreos/kube-aws/model/derived" + "github.com/kubernetes-incubator/kube-aws/cfnresource" + cfg "github.com/kubernetes-incubator/kube-aws/core/controlplane/config" + "github.com/kubernetes-incubator/kube-aws/coreos/amiregistry" + "github.com/kubernetes-incubator/kube-aws/filereader/userdatatemplate" + "github.com/kubernetes-incubator/kube-aws/model" + "github.com/kubernetes-incubator/kube-aws/model/derived" "gopkg.in/yaml.v2" "strconv" ) diff --git a/core/nodepool/config/deployment.go b/core/nodepool/config/deployment.go index 2428f56c1..feccbfe5a 100644 --- a/core/nodepool/config/deployment.go +++ b/core/nodepool/config/deployment.go @@ -3,7 +3,7 @@ package config import ( "fmt" - cfg "github.com/coreos/kube-aws/core/controlplane/config" + cfg "github.com/kubernetes-incubator/kube-aws/core/controlplane/config" ) func (c DeploymentSettings) ValidateInputs() error { diff --git a/core/nodepool/config/stack_config.go b/core/nodepool/config/stack_config.go index 3a962bbbb..aacfc791f 100644 --- a/core/nodepool/config/stack_config.go +++ b/core/nodepool/config/stack_config.go @@ -2,9 +2,9 @@ package config import ( "fmt" - "github.com/coreos/kube-aws/coreos/userdatavalidation" - "github.com/coreos/kube-aws/filereader/jsontemplate" - "github.com/coreos/kube-aws/fingerprint" + "github.com/kubernetes-incubator/kube-aws/coreos/userdatavalidation" + "github.com/kubernetes-incubator/kube-aws/filereader/jsontemplate" + "github.com/kubernetes-incubator/kube-aws/fingerprint" "net/url" ) diff --git a/core/nodepool/config/worker.go b/core/nodepool/config/worker.go index 71111df3e..2a772b17e 100644 --- a/core/nodepool/config/worker.go +++ b/core/nodepool/config/worker.go @@ -1,8 +1,8 @@ package config import ( - cfg "github.com/coreos/kube-aws/core/controlplane/config" - "github.com/coreos/kube-aws/model" + cfg "github.com/kubernetes-incubator/kube-aws/core/controlplane/config" + "github.com/kubernetes-incubator/kube-aws/model" ) type WorkerNodePoolConfig struct { diff --git a/core/root/cluster.go b/core/root/cluster.go index ff83c48a2..1c2db32d1 100644 --- a/core/root/cluster.go +++ b/core/root/cluster.go @@ -6,14 +6,14 @@ import ( "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/cloudformation" "github.com/aws/aws-sdk-go/service/s3" - "github.com/coreos/kube-aws/cfnstack" - controlplane "github.com/coreos/kube-aws/core/controlplane/cluster" - controlplane_cfg "github.com/coreos/kube-aws/core/controlplane/config" - nodepool "github.com/coreos/kube-aws/core/nodepool/cluster" - nodepool_cfg "github.com/coreos/kube-aws/core/nodepool/config" - "github.com/coreos/kube-aws/core/root/config" - "github.com/coreos/kube-aws/core/root/defaults" - "github.com/coreos/kube-aws/filereader/jsontemplate" + "github.com/kubernetes-incubator/kube-aws/cfnstack" + controlplane "github.com/kubernetes-incubator/kube-aws/core/controlplane/cluster" + controlplane_cfg "github.com/kubernetes-incubator/kube-aws/core/controlplane/config" + nodepool "github.com/kubernetes-incubator/kube-aws/core/nodepool/cluster" + nodepool_cfg "github.com/kubernetes-incubator/kube-aws/core/nodepool/config" + "github.com/kubernetes-incubator/kube-aws/core/root/config" + "github.com/kubernetes-incubator/kube-aws/core/root/defaults" + "github.com/kubernetes-incubator/kube-aws/filereader/jsontemplate" "io/ioutil" "os" "path/filepath" diff --git a/core/root/config/config.go b/core/root/config/config.go index d4e5e364a..067c5ba15 100644 --- a/core/root/config/config.go +++ b/core/root/config/config.go @@ -5,9 +5,9 @@ package config import ( "fmt" - controlplane "github.com/coreos/kube-aws/core/controlplane/config" - nodepool "github.com/coreos/kube-aws/core/nodepool/config" - "github.com/coreos/kube-aws/model" + controlplane "github.com/kubernetes-incubator/kube-aws/core/controlplane/config" + nodepool "github.com/kubernetes-incubator/kube-aws/core/nodepool/config" + "github.com/kubernetes-incubator/kube-aws/model" "gopkg.in/yaml.v2" "io/ioutil" ) diff --git a/core/root/describer.go b/core/root/describer.go index ff97a8fd3..3afa2eb7b 100644 --- a/core/root/describer.go +++ b/core/root/describer.go @@ -5,8 +5,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/cloudformation" - "github.com/coreos/kube-aws/core/controlplane/cluster" - "github.com/coreos/kube-aws/core/root/config" + "github.com/kubernetes-incubator/kube-aws/core/controlplane/cluster" + "github.com/kubernetes-incubator/kube-aws/core/root/config" ) type Info struct { diff --git a/core/root/destroyer.go b/core/root/destroyer.go index e9289973d..2a6353220 100644 --- a/core/root/destroyer.go +++ b/core/root/destroyer.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/session" - "github.com/coreos/kube-aws/cfnstack" - "github.com/coreos/kube-aws/core/root/config" + "github.com/kubernetes-incubator/kube-aws/cfnstack" + "github.com/kubernetes-incubator/kube-aws/core/root/config" ) type DestroyOptions struct { diff --git a/core/root/options.go b/core/root/options.go index 63612134b..289352b49 100644 --- a/core/root/options.go +++ b/core/root/options.go @@ -1,6 +1,6 @@ package root -import "github.com/coreos/kube-aws/core/root/defaults" +import "github.com/kubernetes-incubator/kube-aws/core/root/defaults" type options struct { AssetsDir string diff --git a/core/root/render/credentials.go b/core/root/render/credentials.go index 418bf6e48..42e658048 100644 --- a/core/root/render/credentials.go +++ b/core/root/render/credentials.go @@ -4,9 +4,9 @@ import ( "crypto/rsa" "crypto/x509" "fmt" - "github.com/coreos/kube-aws/core/controlplane/config" - "github.com/coreos/kube-aws/core/root/defaults" - "github.com/coreos/kube-aws/tlsutil" + "github.com/kubernetes-incubator/kube-aws/core/controlplane/config" + "github.com/kubernetes-incubator/kube-aws/core/root/defaults" + "github.com/kubernetes-incubator/kube-aws/tlsutil" "io/ioutil" "os" ) diff --git a/core/root/render/stack.go b/core/root/render/stack.go index 2c9ac41e1..121a0e8db 100644 --- a/core/root/render/stack.go +++ b/core/root/render/stack.go @@ -3,11 +3,11 @@ package render import ( "bytes" "fmt" - controlplane "github.com/coreos/kube-aws/core/controlplane/config" - nodepool "github.com/coreos/kube-aws/core/nodepool/config" - "github.com/coreos/kube-aws/core/root/config" - "github.com/coreos/kube-aws/core/root/defaults" - "github.com/coreos/kube-aws/filegen" + controlplane "github.com/kubernetes-incubator/kube-aws/core/controlplane/config" + nodepool "github.com/kubernetes-incubator/kube-aws/core/nodepool/config" + "github.com/kubernetes-incubator/kube-aws/core/root/config" + "github.com/kubernetes-incubator/kube-aws/core/root/defaults" + "github.com/kubernetes-incubator/kube-aws/filegen" "path/filepath" "text/template" ) diff --git a/core/root/renderer.go b/core/root/renderer.go index bb3fc5c13..a7280a9f7 100644 --- a/core/root/renderer.go +++ b/core/root/renderer.go @@ -1,8 +1,8 @@ package root import ( - "github.com/coreos/kube-aws/core/controlplane/config" - "github.com/coreos/kube-aws/core/root/render" + "github.com/kubernetes-incubator/kube-aws/core/controlplane/config" + "github.com/kubernetes-incubator/kube-aws/core/root/render" ) func StackAssetsRendererFromFile(configPath string) (render.StackRenderer, error) { diff --git a/core/root/template_params.go b/core/root/template_params.go index a7bde451f..eb9a0ec5d 100644 --- a/core/root/template_params.go +++ b/core/root/template_params.go @@ -2,8 +2,8 @@ package root import ( "fmt" - controlplane "github.com/coreos/kube-aws/core/controlplane/cluster" - nodepool "github.com/coreos/kube-aws/core/nodepool/cluster" + controlplane "github.com/kubernetes-incubator/kube-aws/core/controlplane/cluster" + nodepool "github.com/kubernetes-incubator/kube-aws/core/nodepool/cluster" ) type TemplateParams struct { diff --git a/filereader/jsontemplate/jsontemplate.go b/filereader/jsontemplate/jsontemplate.go index e674efc59..97c5ed166 100644 --- a/filereader/jsontemplate/jsontemplate.go +++ b/filereader/jsontemplate/jsontemplate.go @@ -4,7 +4,7 @@ import ( "bytes" "encoding/json" "fmt" - "github.com/coreos/kube-aws/filereader/texttemplate" + "github.com/kubernetes-incubator/kube-aws/filereader/texttemplate" ) func GetBytes(filename string, data interface{}, prettyPrint bool) ([]byte, error) { diff --git a/filereader/userdatatemplate/userdatatemplate.go b/filereader/userdatatemplate/userdatatemplate.go index 1fc6aa846..570606758 100644 --- a/filereader/userdatatemplate/userdatatemplate.go +++ b/filereader/userdatatemplate/userdatatemplate.go @@ -1,7 +1,7 @@ package userdatatemplate import ( - "github.com/coreos/kube-aws/filereader/texttemplate" + "github.com/kubernetes-incubator/kube-aws/filereader/texttemplate" ) func GetString(filename string, data interface{}) (string, error) { diff --git a/main.go b/main.go index 131f072d9..79fb5bb21 100644 --- a/main.go +++ b/main.go @@ -1,8 +1,9 @@ package main import ( - "github.com/coreos/kube-aws/cmd" "os" + + "github.com/kubernetes-incubator/kube-aws/cmd" ) func main() { diff --git a/model/derived/etcd_cluster.go b/model/derived/etcd_cluster.go index eb16277f2..657216cbb 100644 --- a/model/derived/etcd_cluster.go +++ b/model/derived/etcd_cluster.go @@ -2,7 +2,7 @@ package derived import ( "fmt" - "github.com/coreos/kube-aws/model" + "github.com/kubernetes-incubator/kube-aws/model" ) type EtcdCluster struct { diff --git a/model/derived/etcd_cluster_test.go b/model/derived/etcd_cluster_test.go index 5c842bbf3..7387cd645 100644 --- a/model/derived/etcd_cluster_test.go +++ b/model/derived/etcd_cluster_test.go @@ -1,7 +1,7 @@ package derived import ( - "github.com/coreos/kube-aws/model" + "github.com/kubernetes-incubator/kube-aws/model" "reflect" "testing" ) diff --git a/model/derived/etcd_node.go b/model/derived/etcd_node.go index 5b96b1171..4854fc696 100644 --- a/model/derived/etcd_node.go +++ b/model/derived/etcd_node.go @@ -2,7 +2,7 @@ package derived import ( "fmt" - "github.com/coreos/kube-aws/model" + "github.com/kubernetes-incubator/kube-aws/model" ) type EtcdNode interface { diff --git a/model/derived/etcd_nodes.go b/model/derived/etcd_nodes.go index 37ddbddb1..2c72ec29b 100644 --- a/model/derived/etcd_nodes.go +++ b/model/derived/etcd_nodes.go @@ -2,7 +2,7 @@ package derived import ( "fmt" - "github.com/coreos/kube-aws/model" + "github.com/kubernetes-incubator/kube-aws/model" ) // NewEtcdNodes derives etcd nodes from user-provided etcd node configs diff --git a/model/derived/network.go b/model/derived/network.go index 9805e20a0..ff67cbef6 100644 --- a/model/derived/network.go +++ b/model/derived/network.go @@ -2,7 +2,7 @@ package derived import ( "fmt" - "github.com/coreos/kube-aws/model" + "github.com/kubernetes-incubator/kube-aws/model" ) type Network interface { diff --git a/model/node_pool_config.go b/model/node_pool_config.go index 1d71fbf7b..9ad325898 100644 --- a/model/node_pool_config.go +++ b/model/node_pool_config.go @@ -114,7 +114,7 @@ func (c NodePoolConfig) Valid() error { } if c.InstanceType == "t2.micro" || c.InstanceType == "t2.nano" { - fmt.Println(`WARNING: instance types "t2.nano" and "t2.micro" are not recommended. See https://github.com/coreos/kube-aws/issues/258 for more information`) + fmt.Println(`WARNING: instance types "t2.nano" and "t2.micro" are not recommended. See https://github.com/kubernetes-incubator/kube-aws/issues/258 for more information`) } return nil diff --git a/test/integration/aws_test.go b/test/integration/aws_test.go index 8fdefaf13..a2d59d098 100644 --- a/test/integration/aws_test.go +++ b/test/integration/aws_test.go @@ -2,9 +2,9 @@ package integration import ( "fmt" - "github.com/coreos/kube-aws/core/controlplane/config" - "github.com/coreos/kube-aws/model" - "github.com/coreos/kube-aws/test/helper" + "github.com/kubernetes-incubator/kube-aws/core/controlplane/config" + "github.com/kubernetes-incubator/kube-aws/model" + "github.com/kubernetes-incubator/kube-aws/test/helper" "os" "testing" ) diff --git a/test/integration/maincluster_test.go b/test/integration/maincluster_test.go index 2f9a12e97..82a28c333 100644 --- a/test/integration/maincluster_test.go +++ b/test/integration/maincluster_test.go @@ -2,12 +2,12 @@ package integration import ( "fmt" - "github.com/coreos/kube-aws/cfnstack" - controlplane_config "github.com/coreos/kube-aws/core/controlplane/config" - "github.com/coreos/kube-aws/core/root" - "github.com/coreos/kube-aws/core/root/config" - "github.com/coreos/kube-aws/model" - "github.com/coreos/kube-aws/test/helper" + "github.com/kubernetes-incubator/kube-aws/cfnstack" + controlplane_config "github.com/kubernetes-incubator/kube-aws/core/controlplane/config" + "github.com/kubernetes-incubator/kube-aws/core/root" + "github.com/kubernetes-incubator/kube-aws/core/root/config" + "github.com/kubernetes-incubator/kube-aws/model" + "github.com/kubernetes-incubator/kube-aws/test/helper" "os" "reflect" "strings" @@ -1311,7 +1311,7 @@ worker: configYaml: mainClusterYaml + ` vpcId: vpc-1a2b3c4d # This, in combination with mapPublicIPs=false, implies that the route table contains a route to a preconfigured NAT gateway -# See https://github.com/coreos/kube-aws/pull/284#issuecomment-276008202 +# See https://github.com/kubernetes-incubator/kube-aws/pull/284#issuecomment-276008202 routeTableId: rtb-1a2b3c4d # This means that all the subnets created by kube-aws should be private mapPublicIPs: false @@ -1382,7 +1382,7 @@ subnets: configYaml: mainClusterYaml + ` vpcId: vpc-1a2b3c4d # This, in combination with mapPublicIPs=true, implies that the route table contains a route to a preconfigured internet gateway -# See https://github.com/coreos/kube-aws/pull/284#issuecomment-276008202 +# See https://github.com/kubernetes-incubator/kube-aws/pull/284#issuecomment-276008202 routeTableId: rtb-1a2b3c4d # This means that all the subnets created by kube-aws should be public mapPublicIPs: true @@ -1455,7 +1455,7 @@ subnets: configYaml: mainClusterYaml + ` vpcId: vpc-1a2b3c4d # routeTableId must be omitted -# See https://github.com/coreos/kube-aws/pull/284#issuecomment-275962332 +# See https://github.com/kubernetes-incubator/kube-aws/pull/284#issuecomment-275962332 # routeTableId: rtb-1a2b3c4d subnets: - name: private1 @@ -1564,7 +1564,7 @@ worker: configYaml: mainClusterYaml + ` vpcId: vpc-1a2b3c4d # routeTableId must be omitted -# See https://github.com/coreos/kube-aws/pull/284#issuecomment-275962332 +# See https://github.com/kubernetes-incubator/kube-aws/pull/284#issuecomment-275962332 # routeTableId: rtb-1a2b3c4d subnets: - name: private1 @@ -1641,7 +1641,7 @@ subnets: configYaml: mainClusterYaml + ` vpcId: vpc-1a2b3c4d # routeTableId must be omitted -# See https://github.com/coreos/kube-aws/pull/284#issuecomment-275962332 +# See https://github.com/kubernetes-incubator/kube-aws/pull/284#issuecomment-275962332 # routeTableId: rtb-1a2b3c4d subnets: - name: private1 @@ -1742,7 +1742,7 @@ worker: configYaml: mainClusterYaml + ` vpcId: vpc-1a2b3c4d # routeTableId must be omitted -# See https://github.com/coreos/kube-aws/pull/284#issuecomment-275962332 +# See https://github.com/kubernetes-incubator/kube-aws/pull/284#issuecomment-275962332 # routeTableId: rtb-1a2b3c4d subnets: - name: private1 diff --git a/test/integration/nodepool_test.go b/test/integration/nodepool_test.go index 831043e74..f879cfc7e 100644 --- a/test/integration/nodepool_test.go +++ b/test/integration/nodepool_test.go @@ -2,8 +2,8 @@ package integration import ( "fmt" - cfg "github.com/coreos/kube-aws/core/controlplane/config" - "github.com/coreos/kube-aws/core/nodepool/config" + cfg "github.com/kubernetes-incubator/kube-aws/core/controlplane/config" + "github.com/kubernetes-incubator/kube-aws/core/nodepool/config" "strings" "testing" )