deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

move to kubernetes-incubator

Browse Source 
update imports to reflect move to kubernetes-incubator
This commit is contained in:
Tomas Kral 2016-10-17 12:45:41 +02:00
parent 1210c9aa4d
commit f8f737be7b
No known key found for this signature in database
GPG Key ID: E690DA7E4F291FA6
17 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Godeps/Godeps.json generated
View File

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

10
cli/app/app.go
View File

@ -31,11 +31,11 @@ import (
_ "github.com/openshift/origin/pkg/deploy/api/install" _ "github.com/openshift/origin/pkg/deploy/api/install"
_ "github.com/openshift/origin/pkg/image/api/install" _ "github.com/openshift/origin/pkg/image/api/install"
"github.com/skippbox/kompose/pkg/kobject" "github.com/kubernetes-incubator/kompose/pkg/kobject"
"github.com/skippbox/kompose/pkg/loader" "github.com/kubernetes-incubator/kompose/pkg/loader"
"github.com/skippbox/kompose/pkg/transformer" "github.com/kubernetes-incubator/kompose/pkg/transformer"
"github.com/skippbox/kompose/pkg/transformer/kubernetes" "github.com/kubernetes-incubator/kompose/pkg/transformer/kubernetes"
"github.com/skippbox/kompose/pkg/transformer/openshift" "github.com/kubernetes-incubator/kompose/pkg/transformer/openshift"
) )
const ( const (

2
cli/app/app_test.go
View File

@ -20,7 +20,7 @@ import (
"fmt" "fmt"
"testing" "testing"
"github.com/skippbox/kompose/pkg/transformer" "github.com/kubernetes-incubator/kompose/pkg/transformer"
) )
func TestParseVolume(t *testing.T) { func TestParseVolume(t *testing.T) {

2
cli/command/command.go
View File

@ -21,7 +21,7 @@ import (
"strings" "strings"
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/skippbox/kompose/cli/app" "github.com/kubernetes-incubator/kompose/cli/app"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

6
cli/main/main.go
View File

@ -19,8 +19,8 @@ package main
import ( import (
"os" "os"
"github.com/skippbox/kompose/cli/command" "github.com/kubernetes-incubator/kompose/cli/command"
"github.com/skippbox/kompose/version" "github.com/kubernetes-incubator/kompose/version"
"github.com/urfave/cli" "github.com/urfave/cli"
) )
@ -30,7 +30,7 @@ func main() {
app.Usage = "A tool helping Docker Compose users move to Kubernetes." app.Usage = "A tool helping Docker Compose users move to Kubernetes."
app.Version = version.VERSION + " (" + version.GITCOMMIT + ")" app.Version = version.VERSION + " (" + version.GITCOMMIT + ")"
app.Author = "Skippbox Kompose Contributors" app.Author = "Skippbox Kompose Contributors"
app.Email = "https://github.com/skippbox/kompose" app.Email = "https://github.com/kubernetes-incubator/kompose"
app.EnableBashCompletion = true app.EnableBashCompletion = true
app.Before = command.BeforeApp app.Before = command.BeforeApp
app.Flags = append(command.CommonFlags()) app.Flags = append(command.CommonFlags())

2
pkg/loader/bundle/bundle.go
View File

@ -24,7 +24,7 @@ import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/docker/docker/cli/command/bundlefile" "github.com/docker/docker/cli/command/bundlefile"
"github.com/skippbox/kompose/pkg/kobject" "github.com/kubernetes-incubator/kompose/pkg/kobject"
) )
type Bundle struct { type Bundle struct {

2
pkg/loader/compose/compose.go
View File

@ -29,7 +29,7 @@ import (
"github.com/docker/libcompose/config" "github.com/docker/libcompose/config"
"github.com/docker/libcompose/lookup" "github.com/docker/libcompose/lookup"
"github.com/docker/libcompose/project" "github.com/docker/libcompose/project"
"github.com/skippbox/kompose/pkg/kobject" "github.com/kubernetes-incubator/kompose/pkg/kobject"
) )
type Compose struct { type Compose struct {

6
pkg/loader/loader.go
View File

@ -20,9 +20,9 @@ import (
"errors" "errors"
"fmt" "fmt"
"github.com/skippbox/kompose/pkg/kobject" "github.com/kubernetes-incubator/kompose/pkg/kobject"
"github.com/skippbox/kompose/pkg/loader/bundle" "github.com/kubernetes-incubator/kompose/pkg/loader/bundle"
"github.com/skippbox/kompose/pkg/loader/compose" "github.com/kubernetes-incubator/kompose/pkg/loader/compose"
) )
type Loader interface { type Loader interface {

4
pkg/transformer/kubernetes/k8sutils.go
View File

@ -28,8 +28,8 @@ import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
"github.com/skippbox/kompose/pkg/kobject" "github.com/kubernetes-incubator/kompose/pkg/kobject"
"github.com/skippbox/kompose/pkg/transformer" "github.com/kubernetes-incubator/kompose/pkg/transformer"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"

4
pkg/transformer/kubernetes/kubernetes.go
View File

@ -22,8 +22,8 @@ import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
deployapi "github.com/openshift/origin/pkg/deploy/api" deployapi "github.com/openshift/origin/pkg/deploy/api"
"github.com/skippbox/kompose/pkg/kobject" "github.com/kubernetes-incubator/kompose/pkg/kobject"
"github.com/skippbox/kompose/pkg/transformer" "github.com/kubernetes-incubator/kompose/pkg/transformer"
// install kubernetes api // install kubernetes api
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"

4
pkg/transformer/kubernetes/kubernetes_test.go
View File

@ -22,8 +22,8 @@ import (
deployapi "github.com/openshift/origin/pkg/deploy/api" deployapi "github.com/openshift/origin/pkg/deploy/api"
"github.com/skippbox/kompose/pkg/kobject" "github.com/kubernetes-incubator/kompose/pkg/kobject"
"github.com/skippbox/kompose/pkg/transformer" "github.com/kubernetes-incubator/kompose/pkg/transformer"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions"

4
pkg/transformer/openshift/openshift.go
View File

@ -22,8 +22,8 @@ import (
deployapi "github.com/openshift/origin/pkg/deploy/api" deployapi "github.com/openshift/origin/pkg/deploy/api"
imageapi "github.com/openshift/origin/pkg/image/api" imageapi "github.com/openshift/origin/pkg/image/api"
"github.com/skippbox/kompose/pkg/kobject" "github.com/kubernetes-incubator/kompose/pkg/kobject"
"github.com/skippbox/kompose/pkg/transformer/kubernetes" "github.com/kubernetes-incubator/kompose/pkg/transformer/kubernetes"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"

2
pkg/transformer/transformer.go
View File

@ -17,7 +17,7 @@ limitations under the License.
package transformer package transformer
import ( import (
"github.com/skippbox/kompose/pkg/kobject" "github.com/kubernetes-incubator/kompose/pkg/kobject"
"k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime"
) )

2
pkg/transformer/utils.go
View File

@ -10,7 +10,7 @@ import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/ghodss/yaml" "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"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"

2
script/.build
View File

@ -2,4 +2,4 @@
GITCOMMIT=$(git rev-parse --short HEAD) 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}")

2
script/.validate
View File

@ -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 # this is kind of an expensive check, so let's not do this twice if we
# are running more than one validate bundlescript # 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' VALIDATE_BRANCH='master'
if [ "$TRAVIS" = 'true' -a "$TRAVIS_PULL_REQUEST" != 'false' ]; then if [ "$TRAVIS" = 'true' -a "$TRAVIS_PULL_REQUEST" != 'false' ]; then

2
script/make.sh
View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -e 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 # List of bundles to create when no argument is passed
DEFAULT_BUNDLES=( DEFAULT_BUNDLES=(