Merge pull request #212 from kadel/kubernetes-incubator

Update imports to reflect move to kubernetes-incubator

Godeps/Godeps.json

@@ -1,5 +1,5 @@
 {
-	"ImportPath": "github.com/skippbox/kompose",
+	"ImportPath": "github.com/kubernetes-incubator/kompose",
 	"GoVersion": "go1.6",
 	"GodepVersion": "v74",
 	"Packages": [

README.md

@@ -1,6 +1,6 @@
 # Kompose (Kubernetes + Compose)
 
-[![Build Status](https://travis-ci.org/skippbox/kompose.svg?branch=master)](https://travis-ci.org/skippbox/kompose) [![Join us on Slack](https://s3.eu-central-1.amazonaws.com/ngtuna/join-us-on-slack.png)](https://skippbox.herokuapp.com)
+[![Build Status](https://travis-ci.org/kubernetes-incubator/kompose.svg?branch=master)](https://travis-ci.org/kubernetes-incubator/kompose) [![Join us on Slack](https://s3.eu-central-1.amazonaws.com/ngtuna/join-us-on-slack.png)](https://skippbox.herokuapp.com)
 
 `kompose` is a tool to help users who are familiar with `docker-compose` move to [Kubernetes](http://kubernetes.io). `kompose` takes a Docker Compose file and translates it into Kubernetes resources.
 
@@ -30,11 +30,11 @@ Other examples are provided in the _examples_ [directory](./examples).
 
 ## Installation 
 
-Grab the latest [release](https://github.com/skippbox/kompose/releases) for your OS, untar and extract the binary.
+Grab the latest [release](https://github.com/kubernetes-incubator/kompose/releases) for your OS, untar and extract the binary.
 
 Linux example:
 ```
-wget https://github.com/skippbox/kompose/releases/download/v0.1.1/kompose_linux-amd64.tar.gz
+wget https://github.com/kubernetes-incubator/kompose/releases/download/v0.1.1/kompose_linux-amd64.tar.gz
 tar -xvf kompose_linux-amd64.tar.gz --strip 1
 sudo mv kompose /usr/local/bin
 ```
@@ -83,7 +83,7 @@ $ make binary-cross
 ## Contributing and Issues
 
 `kompose` is a work in progress, we will see how far it takes us. We welcome any pull request to make it even better.
-If you find any issues, please [file it](https://github.com/skippbox/kompose/issues).
+If you find any issues, please [file it](https://github.com/kubernetes-incubator/kompose/issues).
 
 ## Community, discussion, contribution, and support
 

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 (

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) {

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"
 )
 

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())

docs/architecture.md

@@ -24,7 +24,7 @@ Every loader “implementation” should be placed into `kompose/pkg/loader` (li
 
 ## KomposeObject
 
-`KomposeObject` is Kompose internal representation of all containers loaded from input file. First version of `KomposeObject` looks like this (source: [kobject.go](https://github.com/skippbox/kompose/blob/master/pkg/kobject/kobject.go)):
+`KomposeObject` is Kompose internal representation of all containers loaded from input file. First version of `KomposeObject` looks like this (source: [kobject.go](https://github.com/kubernetes-incubator/kompose/blob/master/pkg/kobject/kobject.go)):
 
 ```go
 // KomposeObject holds the generic struct of Kompose transformation

docs/development.md

@@ -30,7 +30,7 @@ $ make binary
 ## Workflow
 ### Fork the main repository
 
-1. Go to https://github.com/skippbox/kompose
+1. Go to https://github.com/kubernetes-incubator/kompose
 2. Click the "Fork" button (at the top right)
 
 ### Clone your fork
@@ -38,11 +38,11 @@ $ make binary
 The commands below require that you have $GOPATH. We highly recommended you put Kompose' code into your $GOPATH.
 
 ```console
-mkdir -p $GOPATH/src/github.com/skippbox
-cd $GOPATH/src/github.com/skippbox
+mkdir -p $GOPATH/src/github.com/kubernetes-incubator
+cd $GOPATH/src/github.com/kubernetes-incubator
 git clone https://github.com/$YOUR_GITHUB_USERNAME/kompose.git
 cd kompose
-git remote add upstream 'https://github.com/skippbox/kompose'
+git remote add upstream 'https://github.com/kubernetes-incubator/kompose'
 ```
 
 ### Create a branch and make changes
@@ -59,7 +59,7 @@ git fetch upstream
 git rebase upstream/master
 ```
 
-Note: If you have write access to the main repository at github.com/skippbox/kompose, you should modify your git configuration so that you can't accidentally push to upstream:
+Note: If you have write access to the main repository at github.com/kubernetes-incubator/kompose, you should modify your git configuration so that you can't accidentally push to upstream:
 
 ```console
 git remote set-url --push upstream no_push
@@ -119,7 +119,7 @@ If it is not a valid version try, make sure you have updated the godep repo with
 1. Populate dependencies for your Kompose.
 
 ```console
-cd $GOPATH/src/github.com/skippbox
+cd $GOPATH/src/github.com/kubernetes-incubator
 script/godep-restore.sh
 ```
 

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 {

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 {

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 {

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"

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"

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"

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"

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"
 )
 

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"

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}")

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

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=(