diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index ae439abc..f1016143 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1,5 +1,5 @@ { - "ImportPath": "github.com/skippbox/kompose", + "ImportPath": "github.com/kubernetes-incubator/kompose", "GoVersion": "go1.6", "GodepVersion": "v74", "Packages": [ diff --git a/cli/app/app.go b/cli/app/app.go index 6d1b612b..5642674a 100644 --- a/cli/app/app.go +++ b/cli/app/app.go @@ -31,11 +31,11 @@ import ( _ "github.com/openshift/origin/pkg/deploy/api/install" _ "github.com/openshift/origin/pkg/image/api/install" - "github.com/skippbox/kompose/pkg/kobject" - "github.com/skippbox/kompose/pkg/loader" - "github.com/skippbox/kompose/pkg/transformer" - "github.com/skippbox/kompose/pkg/transformer/kubernetes" - "github.com/skippbox/kompose/pkg/transformer/openshift" + "github.com/kubernetes-incubator/kompose/pkg/kobject" + "github.com/kubernetes-incubator/kompose/pkg/loader" + "github.com/kubernetes-incubator/kompose/pkg/transformer" + "github.com/kubernetes-incubator/kompose/pkg/transformer/kubernetes" + "github.com/kubernetes-incubator/kompose/pkg/transformer/openshift" ) const ( diff --git a/cli/app/app_test.go b/cli/app/app_test.go index bf64ae2c..d2548b87 100644 --- a/cli/app/app_test.go +++ b/cli/app/app_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "github.com/skippbox/kompose/pkg/transformer" + "github.com/kubernetes-incubator/kompose/pkg/transformer" ) func TestParseVolume(t *testing.T) { diff --git a/cli/command/command.go b/cli/command/command.go index 706b5290..19ad595a 100644 --- a/cli/command/command.go +++ b/cli/command/command.go @@ -21,7 +21,7 @@ import ( "strings" "github.com/Sirupsen/logrus" - "github.com/skippbox/kompose/cli/app" + "github.com/kubernetes-incubator/kompose/cli/app" "github.com/urfave/cli" ) diff --git a/cli/main/main.go b/cli/main/main.go index dc30ce0b..3aa1c90e 100644 --- a/cli/main/main.go +++ b/cli/main/main.go @@ -19,8 +19,8 @@ package main import ( "os" - "github.com/skippbox/kompose/cli/command" - "github.com/skippbox/kompose/version" + "github.com/kubernetes-incubator/kompose/cli/command" + "github.com/kubernetes-incubator/kompose/version" "github.com/urfave/cli" ) @@ -30,7 +30,7 @@ func main() { app.Usage = "A tool helping Docker Compose users move to Kubernetes." app.Version = version.VERSION + " (" + version.GITCOMMIT + ")" app.Author = "Skippbox Kompose Contributors" - app.Email = "https://github.com/skippbox/kompose" + app.Email = "https://github.com/kubernetes-incubator/kompose" app.EnableBashCompletion = true app.Before = command.BeforeApp app.Flags = append(command.CommonFlags()) diff --git a/pkg/loader/bundle/bundle.go b/pkg/loader/bundle/bundle.go index fe99cdb5..6cc70d40 100644 --- a/pkg/loader/bundle/bundle.go +++ b/pkg/loader/bundle/bundle.go @@ -24,7 +24,7 @@ import ( "github.com/Sirupsen/logrus" "github.com/docker/docker/cli/command/bundlefile" - "github.com/skippbox/kompose/pkg/kobject" + "github.com/kubernetes-incubator/kompose/pkg/kobject" ) type Bundle struct { diff --git a/pkg/loader/compose/compose.go b/pkg/loader/compose/compose.go index 083746f8..68bbbc29 100644 --- a/pkg/loader/compose/compose.go +++ b/pkg/loader/compose/compose.go @@ -29,7 +29,7 @@ import ( "github.com/docker/libcompose/config" "github.com/docker/libcompose/lookup" "github.com/docker/libcompose/project" - "github.com/skippbox/kompose/pkg/kobject" + "github.com/kubernetes-incubator/kompose/pkg/kobject" ) type Compose struct { diff --git a/pkg/loader/loader.go b/pkg/loader/loader.go index 9b77d482..4df7da85 100644 --- a/pkg/loader/loader.go +++ b/pkg/loader/loader.go @@ -20,9 +20,9 @@ import ( "errors" "fmt" - "github.com/skippbox/kompose/pkg/kobject" - "github.com/skippbox/kompose/pkg/loader/bundle" - "github.com/skippbox/kompose/pkg/loader/compose" + "github.com/kubernetes-incubator/kompose/pkg/kobject" + "github.com/kubernetes-incubator/kompose/pkg/loader/bundle" + "github.com/kubernetes-incubator/kompose/pkg/loader/compose" ) type Loader interface { diff --git a/pkg/transformer/kubernetes/k8sutils.go b/pkg/transformer/kubernetes/k8sutils.go index 21b5df56..fa4cb736 100644 --- a/pkg/transformer/kubernetes/k8sutils.go +++ b/pkg/transformer/kubernetes/k8sutils.go @@ -28,8 +28,8 @@ import ( "github.com/Sirupsen/logrus" "github.com/ghodss/yaml" - "github.com/skippbox/kompose/pkg/kobject" - "github.com/skippbox/kompose/pkg/transformer" + "github.com/kubernetes-incubator/kompose/pkg/kobject" + "github.com/kubernetes-incubator/kompose/pkg/transformer" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" diff --git a/pkg/transformer/kubernetes/kubernetes.go b/pkg/transformer/kubernetes/kubernetes.go index 2f92105e..bb66ef97 100644 --- a/pkg/transformer/kubernetes/kubernetes.go +++ b/pkg/transformer/kubernetes/kubernetes.go @@ -22,8 +22,8 @@ import ( "github.com/Sirupsen/logrus" deployapi "github.com/openshift/origin/pkg/deploy/api" - "github.com/skippbox/kompose/pkg/kobject" - "github.com/skippbox/kompose/pkg/transformer" + "github.com/kubernetes-incubator/kompose/pkg/kobject" + "github.com/kubernetes-incubator/kompose/pkg/transformer" // install kubernetes api "k8s.io/kubernetes/pkg/api" diff --git a/pkg/transformer/kubernetes/kubernetes_test.go b/pkg/transformer/kubernetes/kubernetes_test.go index 6478cbbc..06ff96f0 100644 --- a/pkg/transformer/kubernetes/kubernetes_test.go +++ b/pkg/transformer/kubernetes/kubernetes_test.go @@ -22,8 +22,8 @@ import ( deployapi "github.com/openshift/origin/pkg/deploy/api" - "github.com/skippbox/kompose/pkg/kobject" - "github.com/skippbox/kompose/pkg/transformer" + "github.com/kubernetes-incubator/kompose/pkg/kobject" + "github.com/kubernetes-incubator/kompose/pkg/transformer" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" diff --git a/pkg/transformer/openshift/openshift.go b/pkg/transformer/openshift/openshift.go index 492acc62..082fe837 100644 --- a/pkg/transformer/openshift/openshift.go +++ b/pkg/transformer/openshift/openshift.go @@ -22,8 +22,8 @@ import ( deployapi "github.com/openshift/origin/pkg/deploy/api" imageapi "github.com/openshift/origin/pkg/image/api" - "github.com/skippbox/kompose/pkg/kobject" - "github.com/skippbox/kompose/pkg/transformer/kubernetes" + "github.com/kubernetes-incubator/kompose/pkg/kobject" + "github.com/kubernetes-incubator/kompose/pkg/transformer/kubernetes" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" diff --git a/pkg/transformer/transformer.go b/pkg/transformer/transformer.go index 26c50838..c2b08db2 100644 --- a/pkg/transformer/transformer.go +++ b/pkg/transformer/transformer.go @@ -17,7 +17,7 @@ limitations under the License. package transformer import ( - "github.com/skippbox/kompose/pkg/kobject" + "github.com/kubernetes-incubator/kompose/pkg/kobject" "k8s.io/kubernetes/pkg/runtime" ) diff --git a/pkg/transformer/utils.go b/pkg/transformer/utils.go index ce9d09ec..edc4ca67 100644 --- a/pkg/transformer/utils.go +++ b/pkg/transformer/utils.go @@ -10,7 +10,7 @@ import ( "github.com/Sirupsen/logrus" "github.com/ghodss/yaml" - "github.com/skippbox/kompose/pkg/kobject" + "github.com/kubernetes-incubator/kompose/pkg/kobject" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" diff --git a/script/.build b/script/.build index bd647b6b..d55c7737 100644 --- a/script/.build +++ b/script/.build @@ -2,4 +2,4 @@ GITCOMMIT=$(git rev-parse --short HEAD) -BUILD_FLAGS=(-tags experimental -ldflags="-w -X github.com/skippbox/kompose/version.GITCOMMIT=${GITCOMMIT}") +BUILD_FLAGS=(-tags experimental -ldflags="-w -X github.com/kubernetes-incubator/kompose/version.GITCOMMIT=${GITCOMMIT}") diff --git a/script/.validate b/script/.validate index 90038e98..2d2645f5 100644 --- a/script/.validate +++ b/script/.validate @@ -4,7 +4,7 @@ if [ -z "$VALIDATE_UPSTREAM" ]; then # this is kind of an expensive check, so let's not do this twice if we # are running more than one validate bundlescript - VALIDATE_REPO='https://github.com/skippbox/kompose.git' + VALIDATE_REPO='https://github.com/kubernetes-incubator/kompose.git' VALIDATE_BRANCH='master' if [ "$TRAVIS" = 'true' -a "$TRAVIS_PULL_REQUEST" != 'false' ]; then diff --git a/script/make.sh b/script/make.sh index 811e7365..323f90cf 100755 --- a/script/make.sh +++ b/script/make.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -e -export KOMPOSE_PKG='github.com/skippbox/kompose' +export KOMPOSE_PKG='github.com/kubernetes-incubator/kompose' # List of bundles to create when no argument is passed DEFAULT_BUNDLES=(