Skip to content
This repository has been archived by the owner on Sep 30, 2020. It is now read-only.

Commit

Permalink
rename imports from github.com/coreos to github.com/kubernetes-incuba…
Browse files Browse the repository at this point in the history
…tor (#451)

* rename imports from github.com/coreos to github.com/kubernetes-incubator

* fixing travis for renamed source repo
  • Loading branch information
jeremyd authored and mumoshu committed Mar 24, 2017
1 parent 3e5fbb2 commit 7dc5727
Show file tree
Hide file tree
Showing 53 changed files with 124 additions and 123 deletions.
2 changes: 1 addition & 1 deletion .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:
Expand Down
2 changes: 1 addition & 1 deletion cfnstack/assets.go
Expand Up @@ -2,7 +2,7 @@ package cfnstack

import (
"fmt"
"github.com/coreos/kube-aws/model"
"github.com/kubernetes-incubator/kube-aws/model"
"path/filepath"
"strings"
)
Expand Down
2 changes: 1 addition & 1 deletion cfnstack/provisioner.go
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion cfnstack/provisioner_test.go
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/calculator.go
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/destroy.go
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions cmd/init.go
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/render.go
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/status.go
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/up.go
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/update.go
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/validate.go
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/version.go
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions core/controlplane/cluster/cluster.go
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions core/controlplane/cluster/cluster_test.go
Expand Up @@ -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"
)

Expand Down
18 changes: 9 additions & 9 deletions core/controlplane/config/config.go
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions core/controlplane/config/config_test.go
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion core/controlplane/config/credential.go
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions core/controlplane/config/stack_config.go
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions 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"
)

Expand Down
8 changes: 4 additions & 4 deletions core/controlplane/config/tls_config.go
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions core/controlplane/config/tls_config_test.go
Expand Up @@ -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"
Expand Down Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion core/controlplane/config/token_config.go
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions core/controlplane/config/token_config_test.go
Expand Up @@ -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
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion core/controlplane/config/user_data_config_test.go
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions core/nodepool/cluster/cluster.go
Expand Up @@ -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"
)

Expand Down
6 changes: 3 additions & 3 deletions core/nodepool/cluster/cluster_test.go
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions 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) {
Expand Down
12 changes: 6 additions & 6 deletions core/nodepool/config/config.go
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion core/nodepool/config/deployment.go
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions core/nodepool/config/stack_config.go
Expand Up @@ -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"
)

Expand Down

0 comments on commit 7dc5727

Please sign in to comment.