Change the paths to be absolute.

pull/2/head
Victor Agababov 9 years ago
parent 94db53d080
commit 6a27f268e6

@ -4,7 +4,7 @@ TARGETS := all build test push container clean
SUBDIRS_TARGETS := \ SUBDIRS_TARGETS := \
$(foreach t,$(TARGETS),$(addsuffix $t,$(SUBDIRS))) $(foreach t,$(TARGETS),$(addsuffix $t,$(SUBDIRS)))
GO_DEPS := util/... version/... expandybird/... resourcifier/... manager/... client/... GO_DEPS := github.com/kubernetes/deployment-manager/util/... github.com/kubernetes/deployment-manager/version/... github.com/kubernetes/deployment-manager/expandybird/... github.com/kubernetes/deployment-manager/resourcifier/... github.com/kubernetes/deployment-manager/manager/... github.com/kubernetes/deployment-manager/client/...
.PHONY : all build test clean $(TARGETS) $(SUBDIRS_TARGETS) .project .docker .PHONY : all build test clean $(TARGETS) $(SUBDIRS_TARGETS) .project .docker

@ -14,7 +14,7 @@ limitations under the License.
package main package main
import ( import (
"expandybird/expander" "github.com/kubernetes/deployment-manager/expandybird/expander"
"bytes" "bytes"
"encoding/json" "encoding/json"

@ -14,14 +14,13 @@ limitations under the License.
package expander package expander
import ( import (
"path/filepath"
"bytes" "bytes"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"log" "log"
"os/exec" "os/exec"
"path" "path"
"path/filepath"
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
) )

@ -14,9 +14,9 @@ limitations under the License.
package main package main
import ( import (
"expandybird/expander" "github.com/kubernetes/deployment-manager/expandybird/expander"
"expandybird/service" "github.com/kubernetes/deployment-manager/expandybird/service"
"version" "github.com/kubernetes/deployment-manager/version"
"flag" "flag"
"fmt" "fmt"

@ -14,8 +14,8 @@ limitations under the License.
package service package service
import ( import (
"expandybird/expander" "github.com/kubernetes/deployment-manager/expandybird/expander"
"util" "github.com/kubernetes/deployment-manager/util"
"errors" "errors"
"fmt" "fmt"

@ -23,8 +23,8 @@ import (
"reflect" "reflect"
"testing" "testing"
"expandybird/expander" "github.com/kubernetes/deployment-manager/expandybird/expander"
"util" "github.com/kubernetes/deployment-manager/util"
restful "github.com/emicklei/go-restful" restful "github.com/emicklei/go-restful"
) )

@ -28,9 +28,9 @@ import (
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"manager/manager" "github.com/kubernetes/deployment-manager/manager/manager"
"manager/repository" "github.com/kubernetes/deployment-manager/manager/repository"
"util" "github.com/kubernetes/deployment-manager/util"
) )
var deployments = []Route{ var deployments = []Route{

@ -14,7 +14,7 @@ limitations under the License.
package main package main
import ( import (
"version" "github.com/kubernetes/deployment-manager/version"
"flag" "flag"
"fmt" "fmt"

@ -16,13 +16,14 @@ package manager
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"github.com/ghodss/yaml"
"io" "io"
"io/ioutil" "io/ioutil"
"log" "log"
"net/http" "net/http"
"net/url" "net/url"
"strings" "strings"
"github.com/ghodss/yaml"
) )
// Deployer abstracts interactions with the expander and deployer services. // Deployer abstracts interactions with the expander and deployer services.

@ -23,7 +23,7 @@ import (
"strings" "strings"
"testing" "testing"
"util" "github.com/kubernetes/deployment-manager/util"
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
) )

@ -22,7 +22,8 @@ import (
"reflect" "reflect"
"strings" "strings"
"testing" "testing"
"util"
"github.com/kubernetes/deployment-manager/util"
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
) )

@ -17,7 +17,8 @@ import (
"fmt" "fmt"
"net/http" "net/http"
"time" "time"
"util"
"github.com/kubernetes/deployment-manager/util"
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
) )

@ -19,9 +19,10 @@ package repository
import ( import (
"fmt" "fmt"
"log" "log"
"manager/manager"
"sync" "sync"
"time" "time"
"github.com/kubernetes/deployment-manager/manager/manager"
) )
// deploymentTypeInstanceMap stores type instances mapped by deployment name. // deploymentTypeInstanceMap stores type instances mapped by deployment name.

@ -14,7 +14,8 @@ limitations under the License.
package repository package repository
import ( import (
"manager/manager" "github.com/kubernetes/deployment-manager/manager/manager"
"testing" "testing"
) )

@ -14,8 +14,8 @@ limitations under the License.
package main package main
import ( import (
"resourcifier/configurator" "github.com/kubernetes/deployment-manager/resourcifier/configurator"
"util" "github.com/kubernetes/deployment-manager/util"
"encoding/json" "encoding/json"
"errors" "errors"

@ -16,10 +16,11 @@ package configurator
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"github.com/ghodss/yaml"
"log" "log"
"os/exec" "os/exec"
"strings" "strings"
"github.com/ghodss/yaml"
) )
// TODO(jackgr): Define an interface and a struct type for Configurator and move initialization to the caller. // TODO(jackgr): Define an interface and a struct type for Configurator and move initialization to the caller.

@ -14,7 +14,7 @@ limitations under the License.
package main package main
import ( import (
"version" "github.com/kubernetes/deployment-manager/version"
"flag" "flag"
"fmt" "fmt"

Loading…
Cancel
Save