forked from LaconicNetwork/kompose
move to kubernetes-incubator
update imports to reflect move to kubernetes-incubator
This commit is contained in:
parent
1210c9aa4d
commit
f8f737be7b
2
Godeps/Godeps.json
generated
2
Godeps/Godeps.json
generated
@ -1,5 +1,5 @@
|
||||
{
|
||||
"ImportPath": "github.com/skippbox/kompose",
|
||||
"ImportPath": "github.com/kubernetes-incubator/kompose",
|
||||
"GoVersion": "go1.6",
|
||||
"GodepVersion": "v74",
|
||||
"Packages": [
|
||||
|
||||
@ -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 (
|
||||
|
||||
@ -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) {
|
||||
|
||||
@ -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"
|
||||
)
|
||||
|
||||
|
||||
@ -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())
|
||||
|
||||
@ -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 {
|
||||
|
||||
@ -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 {
|
||||
|
||||
@ -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 {
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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"
|
||||
)
|
||||
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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}")
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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=(
|
||||
|
||||
Loading…
Reference in New Issue
Block a user