From 1805e15601543c362d1dd3f9979bb81bb6b7d741 Mon Sep 17 00:00:00 2001 From: Adam Reese Date: Tue, 15 Mar 2016 15:40:57 -0600 Subject: [PATCH] fix(*): update import paths for helm repo naming --- README.md | 6 +++--- circle.yml | 4 ++-- cmd/dm/dm.go | 4 ++-- cmd/expandybird/expander/expander.go | 2 +- cmd/expandybird/expander/expander_test.go | 4 ++-- cmd/expandybird/main.go | 6 +++--- cmd/expandybird/service/service.go | 6 +++--- cmd/expandybird/service/service_test.go | 6 +++--- cmd/helm/chart_upload.go | 4 ++-- cmd/helm/create.go | 2 +- cmd/helm/delete.go | 2 +- cmd/helm/deploy.go | 2 +- cmd/helm/dm.go | 6 +++--- cmd/helm/doctor.go | 6 +++--- cmd/helm/get.go | 2 +- cmd/helm/helm.go | 4 ++-- cmd/helm/list.go | 2 +- cmd/helm/pack.go | 4 ++-- cmd/helm/release.go | 2 +- cmd/helm/target.go | 4 ++-- cmd/manager/deployments.go | 18 ++++++++--------- cmd/manager/deployments_test.go | 2 +- cmd/manager/main.go | 4 ++-- cmd/manager/manager/deployer.go | 2 +- cmd/manager/manager/deployer_test.go | 4 ++-- cmd/manager/manager/expander.go | 2 +- cmd/manager/manager/expander_test.go | 4 ++-- cmd/manager/manager/manager.go | 8 ++++---- cmd/manager/manager/manager_test.go | 4 ++-- cmd/manager/manager/typeresolver.go | 6 +++--- cmd/manager/manager/typeresolver_test.go | 4 ++-- .../repository/persistent/persistent.go | 4 ++-- .../repository/persistent/persistent_test.go | 2 +- cmd/manager/repository/repository.go | 2 +- cmd/manager/repository/test_common.go | 2 +- cmd/manager/repository/transient/transient.go | 4 ++-- .../repository/transient/transient_test.go | 2 +- cmd/manager/router/context.go | 8 ++++---- cmd/manager/router/router.go | 2 +- cmd/resourcifier/configurations.go | 6 +++--- cmd/resourcifier/configurator/configurator.go | 4 ++-- cmd/resourcifier/main.go | 4 ++-- docs/pushing.md | 2 +- docs/templates/registry.md | 20 +++++++++---------- glide.yaml | 2 +- hack/README.md | 8 ++++---- hack/Vagrantfile | 6 +++--- hack/dm-push.sh | 2 +- pkg/chart/chart.go | 2 +- pkg/chart/chart_test.go | 2 +- pkg/chart/save.go | 2 +- pkg/client/client.go | 2 +- pkg/client/client_test.go | 2 +- pkg/client/install.go | 4 ++-- pkg/client/uninstall.go | 2 +- pkg/registry/filebased_credential_provider.go | 2 +- .../filebased_credential_provider_test.go | 2 +- pkg/registry/gcs_registry.go | 4 ++-- pkg/registry/github_package_registry.go | 2 +- pkg/registry/github_registry.go | 4 ++-- pkg/registry/github_template_registry.go | 2 +- pkg/registry/inmem_credential_provider.go | 2 +- .../inmem_credential_provider_test.go | 2 +- pkg/registry/inmem_registry_service.go | 4 ++-- pkg/registry/registry.go | 4 ++-- pkg/registry/registryprovider.go | 4 ++-- pkg/registry/secrets_credential_provider.go | 4 ++-- pkg/registry/testhelper.go | 4 ++-- pkg/util/kubernetesutil.go | 2 +- pkg/util/kubernetesutil_test.go | 2 +- pkg/util/templateutil.go | 2 +- scripts/build-go.sh | 2 +- 72 files changed, 140 insertions(+), 140 deletions(-) diff --git a/README.md b/README.md index a2ecce172..d34804578 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Deployment Manager -[![Circle CI](https://circleci.com/gh/kubernetes/deployment-manager.svg?style=svg)](https://circleci.com/gh/kubernetes/deployment-manager) [![Go Report Card](http://goreportcard.com/badge/kubernetes/deployment-manager)](http://goreportcard.com/report/kubernetes/deployment-manager) +[![Circle CI](https://circleci.com/gh/kubernetes/helm.svg?style=svg)](https://circleci.com/gh/kubernetes/helm) [![Go Report Card](http://goreportcard.com/badge/kubernetes/helm)](http://goreportcard.com/report/kubernetes/helm) Deployment Manager (DM) `dm` makes it easy to create, describe, update and delete Kubernetes resources using declarative configuration. A configuration is @@ -63,13 +63,13 @@ for the Kubernetes configuration SIG. ## Installing Deployment Manager Note: if you're exploring or using the project, you'll probably want to pull -(the latest release)[https://github.com/kubernetes/deployment-manager/releases/latest], +(the latest release)[https://github.com/kubernetes/helm/releases/latest], since there may be undiscovered or unresolved issues at HEAD. From a Linux or Mac OS X client: ``` -curl -s https://raw.githubusercontent.com/kubernetes/deployment-manager/master/get-install.sh | sh +curl -s https://raw.githubusercontent.com/kubernetes/helm/master/get-install.sh | sh ``` and then install the DM services into your Kubernetes cluster: diff --git a/circle.yml b/circle.yml index d1bfebe7b..503b7bc8f 100644 --- a/circle.yml +++ b/circle.yml @@ -4,14 +4,14 @@ machine: GO15VENDOREXPERIMENT: 1 GOPATH: /usr/local/go_workspace HOME: /home/ubuntu - IMPORT_PATH: "github.com/kubernetes/deployment-manager" + IMPORT_PATH: "github.com/kubernetes/helm" dependencies: override: - sudo chown -R $(whoami):staff /usr/local - cd $GOPATH - mkdir -p $GOPATH/src/$IMPORT_PATH - - cd $HOME/deployment-manager + - cd $HOME/helm - rsync -az --delete ./ "$GOPATH/src/$IMPORT_PATH/" - wget "https://github.com/Masterminds/glide/releases/download/$GLIDE_VERSION/glide-$GLIDE_VERSION-linux-amd64.tar.gz" - mkdir -p $HOME/bin diff --git a/cmd/dm/dm.go b/cmd/dm/dm.go index 883c47277..0d586e876 100644 --- a/cmd/dm/dm.go +++ b/cmd/dm/dm.go @@ -19,8 +19,8 @@ package main import ( "github.com/ghodss/yaml" - "github.com/kubernetes/deployment-manager/pkg/common" - "github.com/kubernetes/deployment-manager/pkg/util" + "github.com/kubernetes/helm/pkg/common" + "github.com/kubernetes/helm/pkg/util" "archive/tar" "bytes" diff --git a/cmd/expandybird/expander/expander.go b/cmd/expandybird/expander/expander.go index f8d5472ca..8fda42f3e 100644 --- a/cmd/expandybird/expander/expander.go +++ b/cmd/expandybird/expander/expander.go @@ -24,7 +24,7 @@ import ( "os/exec" "github.com/ghodss/yaml" - "github.com/kubernetes/deployment-manager/pkg/common" + "github.com/kubernetes/helm/pkg/common" ) // Expander abstracts interactions with the expander and deployer services. diff --git a/cmd/expandybird/expander/expander_test.go b/cmd/expandybird/expander/expander_test.go index efde69559..2a86b28f6 100644 --- a/cmd/expandybird/expander/expander_test.go +++ b/cmd/expandybird/expander/expander_test.go @@ -26,8 +26,8 @@ import ( "strings" "testing" - "github.com/kubernetes/deployment-manager/pkg/common" - "github.com/kubernetes/deployment-manager/pkg/util" + "github.com/kubernetes/helm/pkg/common" + "github.com/kubernetes/helm/pkg/util" ) var importFileNames = []string{ diff --git a/cmd/expandybird/main.go b/cmd/expandybird/main.go index ac071cb55..aa2536c18 100644 --- a/cmd/expandybird/main.go +++ b/cmd/expandybird/main.go @@ -17,9 +17,9 @@ limitations under the License. package main import ( - "github.com/kubernetes/deployment-manager/cmd/expandybird/expander" - "github.com/kubernetes/deployment-manager/cmd/expandybird/service" - "github.com/kubernetes/deployment-manager/pkg/version" + "github.com/kubernetes/helm/cmd/expandybird/expander" + "github.com/kubernetes/helm/cmd/expandybird/service" + "github.com/kubernetes/helm/pkg/version" "flag" "fmt" diff --git a/cmd/expandybird/service/service.go b/cmd/expandybird/service/service.go index e12fdda8a..09e9132c6 100644 --- a/cmd/expandybird/service/service.go +++ b/cmd/expandybird/service/service.go @@ -17,9 +17,9 @@ limitations under the License. package service import ( - "github.com/kubernetes/deployment-manager/cmd/expandybird/expander" - "github.com/kubernetes/deployment-manager/pkg/common" - "github.com/kubernetes/deployment-manager/pkg/util" + "github.com/kubernetes/helm/cmd/expandybird/expander" + "github.com/kubernetes/helm/pkg/common" + "github.com/kubernetes/helm/pkg/util" "errors" "fmt" diff --git a/cmd/expandybird/service/service_test.go b/cmd/expandybird/service/service_test.go index 1af7a4d35..4f8a1bb62 100644 --- a/cmd/expandybird/service/service_test.go +++ b/cmd/expandybird/service/service_test.go @@ -26,9 +26,9 @@ import ( "reflect" "testing" - "github.com/kubernetes/deployment-manager/cmd/expandybird/expander" - "github.com/kubernetes/deployment-manager/pkg/common" - "github.com/kubernetes/deployment-manager/pkg/util" + "github.com/kubernetes/helm/cmd/expandybird/expander" + "github.com/kubernetes/helm/pkg/common" + "github.com/kubernetes/helm/pkg/util" restful "github.com/emicklei/go-restful" ) diff --git a/cmd/helm/chart_upload.go b/cmd/helm/chart_upload.go index a6a18a22a..6077675d3 100644 --- a/cmd/helm/chart_upload.go +++ b/cmd/helm/chart_upload.go @@ -25,8 +25,8 @@ import ( "github.com/aokoli/goutils" "github.com/codegangsta/cli" - "github.com/kubernetes/deployment-manager/pkg/chart" - "github.com/kubernetes/deployment-manager/pkg/format" + "github.com/kubernetes/helm/pkg/chart" + "github.com/kubernetes/helm/pkg/format" ) func uploadChart(c *cli.Context) error { diff --git a/cmd/helm/create.go b/cmd/helm/create.go index d4d4418e5..4b00a031b 100644 --- a/cmd/helm/create.go +++ b/cmd/helm/create.go @@ -21,7 +21,7 @@ import ( "path/filepath" "github.com/codegangsta/cli" - "github.com/kubernetes/deployment-manager/pkg/chart" + "github.com/kubernetes/helm/pkg/chart" ) func init() { diff --git a/cmd/helm/delete.go b/cmd/helm/delete.go index 5aaa39c7f..750bd1f6c 100644 --- a/cmd/helm/delete.go +++ b/cmd/helm/delete.go @@ -20,7 +20,7 @@ import ( "errors" "github.com/codegangsta/cli" - "github.com/kubernetes/deployment-manager/pkg/format" + "github.com/kubernetes/helm/pkg/format" ) func init() { diff --git a/cmd/helm/deploy.go b/cmd/helm/deploy.go index 3e33572e0..e1cef8747 100644 --- a/cmd/helm/deploy.go +++ b/cmd/helm/deploy.go @@ -21,7 +21,7 @@ import ( "os" "github.com/codegangsta/cli" - "github.com/kubernetes/deployment-manager/pkg/common" + "github.com/kubernetes/helm/pkg/common" "gopkg.in/yaml.v2" ) diff --git a/cmd/helm/dm.go b/cmd/helm/dm.go index 6a9b349f6..9b5d8065c 100644 --- a/cmd/helm/dm.go +++ b/cmd/helm/dm.go @@ -21,9 +21,9 @@ import ( "os" "github.com/codegangsta/cli" - "github.com/kubernetes/deployment-manager/pkg/client" - "github.com/kubernetes/deployment-manager/pkg/format" - "github.com/kubernetes/deployment-manager/pkg/kubectl" + "github.com/kubernetes/helm/pkg/client" + "github.com/kubernetes/helm/pkg/format" + "github.com/kubernetes/helm/pkg/kubectl" ) // ErrAlreadyInstalled indicates that DM is already installed. diff --git a/cmd/helm/doctor.go b/cmd/helm/doctor.go index f3214e332..4335e6b69 100644 --- a/cmd/helm/doctor.go +++ b/cmd/helm/doctor.go @@ -18,9 +18,9 @@ package main import ( "github.com/codegangsta/cli" - "github.com/kubernetes/deployment-manager/pkg/client" - "github.com/kubernetes/deployment-manager/pkg/format" - "github.com/kubernetes/deployment-manager/pkg/kubectl" + "github.com/kubernetes/helm/pkg/client" + "github.com/kubernetes/helm/pkg/format" + "github.com/kubernetes/helm/pkg/kubectl" ) func init() { diff --git a/cmd/helm/get.go b/cmd/helm/get.go index a07fa7c87..119593ca8 100644 --- a/cmd/helm/get.go +++ b/cmd/helm/get.go @@ -20,7 +20,7 @@ import ( "errors" "github.com/codegangsta/cli" - "github.com/kubernetes/deployment-manager/pkg/format" + "github.com/kubernetes/helm/pkg/format" ) func init() { diff --git a/cmd/helm/helm.go b/cmd/helm/helm.go index c6e9e5e98..c7a02585d 100644 --- a/cmd/helm/helm.go +++ b/cmd/helm/helm.go @@ -20,8 +20,8 @@ import ( "os" "github.com/codegangsta/cli" - "github.com/kubernetes/deployment-manager/pkg/client" - "github.com/kubernetes/deployment-manager/pkg/version" + "github.com/kubernetes/helm/pkg/client" + "github.com/kubernetes/helm/pkg/version" ) var commands []cli.Command diff --git a/cmd/helm/list.go b/cmd/helm/list.go index 108f7b2c6..9d418ff21 100644 --- a/cmd/helm/list.go +++ b/cmd/helm/list.go @@ -18,7 +18,7 @@ package main import ( "github.com/codegangsta/cli" - "github.com/kubernetes/deployment-manager/pkg/format" + "github.com/kubernetes/helm/pkg/format" ) func init() { diff --git a/cmd/helm/pack.go b/cmd/helm/pack.go index 62d704923..216bb5fb5 100644 --- a/cmd/helm/pack.go +++ b/cmd/helm/pack.go @@ -22,8 +22,8 @@ import ( "os" "github.com/codegangsta/cli" - "github.com/kubernetes/deployment-manager/pkg/chart" - "github.com/kubernetes/deployment-manager/pkg/format" + "github.com/kubernetes/helm/pkg/chart" + "github.com/kubernetes/helm/pkg/format" ) func init() { diff --git a/cmd/helm/release.go b/cmd/helm/release.go index 03c92ac9c..feadc8f2a 100644 --- a/cmd/helm/release.go +++ b/cmd/helm/release.go @@ -21,7 +21,7 @@ import ( "os" "github.com/codegangsta/cli" - "github.com/kubernetes/deployment-manager/pkg/format" + "github.com/kubernetes/helm/pkg/format" ) func init() { diff --git a/cmd/helm/target.go b/cmd/helm/target.go index c0f604229..bcf61bb40 100644 --- a/cmd/helm/target.go +++ b/cmd/helm/target.go @@ -19,8 +19,8 @@ package main import ( "fmt" - "github.com/kubernetes/deployment-manager/pkg/format" - "github.com/kubernetes/deployment-manager/pkg/kubectl" + "github.com/kubernetes/helm/pkg/format" + "github.com/kubernetes/helm/pkg/kubectl" ) func target(dryRun bool) error { diff --git a/cmd/manager/deployments.go b/cmd/manager/deployments.go index e3537fc0e..c3c7af8fd 100644 --- a/cmd/manager/deployments.go +++ b/cmd/manager/deployments.go @@ -32,15 +32,15 @@ import ( "github.com/ghodss/yaml" "github.com/gorilla/mux" - "github.com/kubernetes/deployment-manager/cmd/manager/manager" - "github.com/kubernetes/deployment-manager/cmd/manager/repository" - "github.com/kubernetes/deployment-manager/cmd/manager/repository/persistent" - "github.com/kubernetes/deployment-manager/cmd/manager/repository/transient" - "github.com/kubernetes/deployment-manager/cmd/manager/router" - "github.com/kubernetes/deployment-manager/pkg/common" - "github.com/kubernetes/deployment-manager/pkg/httputil" - "github.com/kubernetes/deployment-manager/pkg/registry" - "github.com/kubernetes/deployment-manager/pkg/util" + "github.com/kubernetes/helm/cmd/manager/manager" + "github.com/kubernetes/helm/cmd/manager/repository" + "github.com/kubernetes/helm/cmd/manager/repository/persistent" + "github.com/kubernetes/helm/cmd/manager/repository/transient" + "github.com/kubernetes/helm/cmd/manager/router" + "github.com/kubernetes/helm/pkg/common" + "github.com/kubernetes/helm/pkg/httputil" + "github.com/kubernetes/helm/pkg/registry" + "github.com/kubernetes/helm/pkg/util" ) var deployments = []Route{ diff --git a/cmd/manager/deployments_test.go b/cmd/manager/deployments_test.go index b4560f794..582842ff3 100644 --- a/cmd/manager/deployments_test.go +++ b/cmd/manager/deployments_test.go @@ -5,7 +5,7 @@ import ( "net/http/httptest" "testing" - "github.com/kubernetes/deployment-manager/cmd/manager/router" + "github.com/kubernetes/helm/cmd/manager/router" ) func TestHealthz(t *testing.T) { diff --git a/cmd/manager/main.go b/cmd/manager/main.go index 297f53706..ce570a8dd 100644 --- a/cmd/manager/main.go +++ b/cmd/manager/main.go @@ -17,8 +17,8 @@ limitations under the License. package main import ( - "github.com/kubernetes/deployment-manager/cmd/manager/router" - "github.com/kubernetes/deployment-manager/pkg/version" + "github.com/kubernetes/helm/cmd/manager/router" + "github.com/kubernetes/helm/pkg/version" "flag" "fmt" diff --git a/cmd/manager/manager/deployer.go b/cmd/manager/manager/deployer.go index 9c9c70190..52179886b 100644 --- a/cmd/manager/manager/deployer.go +++ b/cmd/manager/manager/deployer.go @@ -28,7 +28,7 @@ import ( "time" "github.com/ghodss/yaml" - "github.com/kubernetes/deployment-manager/pkg/common" + "github.com/kubernetes/helm/pkg/common" ) // Deployer abstracts interactions with the expander and deployer services. diff --git a/cmd/manager/manager/deployer_test.go b/cmd/manager/manager/deployer_test.go index 6947119ae..bab7fb463 100644 --- a/cmd/manager/manager/deployer_test.go +++ b/cmd/manager/manager/deployer_test.go @@ -26,8 +26,8 @@ import ( "strings" "testing" - "github.com/kubernetes/deployment-manager/pkg/common" - "github.com/kubernetes/deployment-manager/pkg/util" + "github.com/kubernetes/helm/pkg/common" + "github.com/kubernetes/helm/pkg/util" "github.com/ghodss/yaml" ) diff --git a/cmd/manager/manager/expander.go b/cmd/manager/manager/expander.go index bc3fc2bb5..63092abfa 100644 --- a/cmd/manager/manager/expander.go +++ b/cmd/manager/manager/expander.go @@ -24,7 +24,7 @@ import ( "net/http" "github.com/ghodss/yaml" - "github.com/kubernetes/deployment-manager/pkg/common" + "github.com/kubernetes/helm/pkg/common" ) const ( diff --git a/cmd/manager/manager/expander_test.go b/cmd/manager/manager/expander_test.go index 6e803e6ea..22a6093d7 100644 --- a/cmd/manager/manager/expander_test.go +++ b/cmd/manager/manager/expander_test.go @@ -26,8 +26,8 @@ import ( "strings" "testing" - "github.com/kubernetes/deployment-manager/pkg/common" - "github.com/kubernetes/deployment-manager/pkg/util" + "github.com/kubernetes/helm/pkg/common" + "github.com/kubernetes/helm/pkg/util" "github.com/ghodss/yaml" ) diff --git a/cmd/manager/manager/manager.go b/cmd/manager/manager/manager.go index e62488256..86123cd17 100644 --- a/cmd/manager/manager/manager.go +++ b/cmd/manager/manager/manager.go @@ -24,10 +24,10 @@ import ( "strings" "time" - "github.com/kubernetes/deployment-manager/cmd/manager/repository" - "github.com/kubernetes/deployment-manager/pkg/common" - "github.com/kubernetes/deployment-manager/pkg/registry" - "github.com/kubernetes/deployment-manager/pkg/util" + "github.com/kubernetes/helm/cmd/manager/repository" + "github.com/kubernetes/helm/pkg/common" + "github.com/kubernetes/helm/pkg/registry" + "github.com/kubernetes/helm/pkg/util" ) // Manager manages a persistent set of Deployments. diff --git a/cmd/manager/manager/manager_test.go b/cmd/manager/manager/manager_test.go index 3065f281a..86428372a 100644 --- a/cmd/manager/manager/manager_test.go +++ b/cmd/manager/manager/manager_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/kubernetes/deployment-manager/pkg/common" - "github.com/kubernetes/deployment-manager/pkg/registry" + "github.com/kubernetes/helm/pkg/common" + "github.com/kubernetes/helm/pkg/registry" ) var template = common.Template{Name: "test", Content: "test"} diff --git a/cmd/manager/manager/typeresolver.go b/cmd/manager/manager/typeresolver.go index 449003fee..929c6119e 100644 --- a/cmd/manager/manager/typeresolver.go +++ b/cmd/manager/manager/typeresolver.go @@ -20,9 +20,9 @@ import ( "fmt" "net/http" - "github.com/kubernetes/deployment-manager/pkg/common" - "github.com/kubernetes/deployment-manager/pkg/registry" - "github.com/kubernetes/deployment-manager/pkg/util" + "github.com/kubernetes/helm/pkg/common" + "github.com/kubernetes/helm/pkg/registry" + "github.com/kubernetes/helm/pkg/util" "github.com/ghodss/yaml" ) diff --git a/cmd/manager/manager/typeresolver_test.go b/cmd/manager/manager/typeresolver_test.go index 0c1b1719c..1b138ba0f 100644 --- a/cmd/manager/manager/typeresolver_test.go +++ b/cmd/manager/manager/typeresolver_test.go @@ -24,8 +24,8 @@ import ( "testing" "github.com/ghodss/yaml" - "github.com/kubernetes/deployment-manager/pkg/common" - "github.com/kubernetes/deployment-manager/pkg/registry" + "github.com/kubernetes/helm/pkg/common" + "github.com/kubernetes/helm/pkg/registry" ) type responseAndError struct { diff --git a/cmd/manager/repository/persistent/persistent.go b/cmd/manager/repository/persistent/persistent.go index f5a9e0ca9..8d49c33a6 100644 --- a/cmd/manager/repository/persistent/persistent.go +++ b/cmd/manager/repository/persistent/persistent.go @@ -25,8 +25,8 @@ import ( "os" "time" - "github.com/kubernetes/deployment-manager/cmd/manager/repository" - "github.com/kubernetes/deployment-manager/pkg/common" + "github.com/kubernetes/helm/cmd/manager/repository" + "github.com/kubernetes/helm/pkg/common" "gopkg.in/mgo.v2" "gopkg.in/mgo.v2/bson" diff --git a/cmd/manager/repository/persistent/persistent_test.go b/cmd/manager/repository/persistent/persistent_test.go index 00ac70d05..30d0196f6 100644 --- a/cmd/manager/repository/persistent/persistent_test.go +++ b/cmd/manager/repository/persistent/persistent_test.go @@ -14,7 +14,7 @@ limitations under the License. package persistent import ( - "github.com/kubernetes/deployment-manager/cmd/manager/repository" + "github.com/kubernetes/helm/cmd/manager/repository" "sync" "testing" diff --git a/cmd/manager/repository/repository.go b/cmd/manager/repository/repository.go index e9424b1ab..dfb102de6 100644 --- a/cmd/manager/repository/repository.go +++ b/cmd/manager/repository/repository.go @@ -18,7 +18,7 @@ limitations under the License. package repository import ( - "github.com/kubernetes/deployment-manager/pkg/common" + "github.com/kubernetes/helm/pkg/common" ) // Repository manages storage for all Deployment Manager entities, as well as diff --git a/cmd/manager/repository/test_common.go b/cmd/manager/repository/test_common.go index 7f20b7d0c..709b51ac8 100644 --- a/cmd/manager/repository/test_common.go +++ b/cmd/manager/repository/test_common.go @@ -17,7 +17,7 @@ limitations under the License. package repository import ( - "github.com/kubernetes/deployment-manager/pkg/common" + "github.com/kubernetes/helm/pkg/common" "fmt" "testing" diff --git a/cmd/manager/repository/transient/transient.go b/cmd/manager/repository/transient/transient.go index 4655709c7..cc14993c2 100644 --- a/cmd/manager/repository/transient/transient.go +++ b/cmd/manager/repository/transient/transient.go @@ -23,8 +23,8 @@ import ( "sync" "time" - "github.com/kubernetes/deployment-manager/cmd/manager/repository" - "github.com/kubernetes/deployment-manager/pkg/common" + "github.com/kubernetes/helm/cmd/manager/repository" + "github.com/kubernetes/helm/pkg/common" ) // deploymentTypeInstanceMap stores type instances mapped by deployment name. diff --git a/cmd/manager/repository/transient/transient_test.go b/cmd/manager/repository/transient/transient_test.go index 06ca917f3..3b5699f35 100644 --- a/cmd/manager/repository/transient/transient_test.go +++ b/cmd/manager/repository/transient/transient_test.go @@ -14,7 +14,7 @@ limitations under the License. package transient import ( - "github.com/kubernetes/deployment-manager/cmd/manager/repository" + "github.com/kubernetes/helm/cmd/manager/repository" "testing" ) diff --git a/cmd/manager/router/context.go b/cmd/manager/router/context.go index bca74ddfc..e0072af94 100644 --- a/cmd/manager/router/context.go +++ b/cmd/manager/router/context.go @@ -1,9 +1,9 @@ package router import ( - "github.com/kubernetes/deployment-manager/cmd/manager/manager" - "github.com/kubernetes/deployment-manager/pkg/common" - helmhttp "github.com/kubernetes/deployment-manager/pkg/httputil" + "github.com/kubernetes/helm/cmd/manager/manager" + "github.com/kubernetes/helm/pkg/common" + helmhttp "github.com/kubernetes/helm/pkg/httputil" ) // Config holds the global configuration parameters passed into the router. @@ -44,7 +44,7 @@ type Config struct { // Members of the context must be concurrency safe. type Context struct { Config *Config - // Manager is a deployment-manager/manager/manager.Manager + // Manager is a helm/manager/manager.Manager Manager manager.Manager Encoder helmhttp.Encoder CredentialProvider common.CredentialProvider diff --git a/cmd/manager/router/router.go b/cmd/manager/router/router.go index 69ecc1e72..3ed685061 100644 --- a/cmd/manager/router/router.go +++ b/cmd/manager/router/router.go @@ -33,7 +33,7 @@ import ( "net/http" "github.com/Masterminds/httputil" - helmhttp "github.com/kubernetes/deployment-manager/pkg/httputil" + helmhttp "github.com/kubernetes/helm/pkg/httputil" ) // HandlerFunc responds to an individual HTTP request. diff --git a/cmd/resourcifier/configurations.go b/cmd/resourcifier/configurations.go index f2d9f93dc..c1b457ab8 100644 --- a/cmd/resourcifier/configurations.go +++ b/cmd/resourcifier/configurations.go @@ -17,9 +17,9 @@ limitations under the License. package main import ( - "github.com/kubernetes/deployment-manager/cmd/resourcifier/configurator" - "github.com/kubernetes/deployment-manager/pkg/common" - "github.com/kubernetes/deployment-manager/pkg/util" + "github.com/kubernetes/helm/cmd/resourcifier/configurator" + "github.com/kubernetes/helm/pkg/common" + "github.com/kubernetes/helm/pkg/util" "encoding/json" "errors" diff --git a/cmd/resourcifier/configurator/configurator.go b/cmd/resourcifier/configurator/configurator.go index 25499922e..49255be94 100644 --- a/cmd/resourcifier/configurator/configurator.go +++ b/cmd/resourcifier/configurator/configurator.go @@ -23,8 +23,8 @@ import ( "strings" "github.com/ghodss/yaml" - "github.com/kubernetes/deployment-manager/pkg/common" - "github.com/kubernetes/deployment-manager/pkg/util" + "github.com/kubernetes/helm/pkg/common" + "github.com/kubernetes/helm/pkg/util" ) // Configurator configures a Kubernetes cluster using kubectl. diff --git a/cmd/resourcifier/main.go b/cmd/resourcifier/main.go index cbaac3cf5..bc8ae084a 100644 --- a/cmd/resourcifier/main.go +++ b/cmd/resourcifier/main.go @@ -25,8 +25,8 @@ import ( "github.com/gorilla/handlers" "github.com/gorilla/mux" - "github.com/kubernetes/deployment-manager/pkg/util" - "github.com/kubernetes/deployment-manager/pkg/version" + "github.com/kubernetes/helm/pkg/util" + "github.com/kubernetes/helm/pkg/version" ) // Route defines a routing table entry to be registered with gorilla/mux. diff --git a/docs/pushing.md b/docs/pushing.md index 381e7a28b..4b139c96d 100644 --- a/docs/pushing.md +++ b/docs/pushing.md @@ -16,7 +16,7 @@ In order to build and push DM, you must: To build and push the service containers: ``` -$ cd ${GOPATH}/src/github.com/kubernetes/deployment-manager +$ cd ${GOPATH}/src/github.com/kubernetes/helm $ export PROJECT=dm-k8s-prod $ make push ``` diff --git a/docs/templates/registry.md b/docs/templates/registry.md index 8e53ee748..5f295cfd6 100644 --- a/docs/templates/registry.md +++ b/docs/templates/registry.md @@ -2,7 +2,7 @@ DM lets configurations instantiate [templates](../design/design.md#templates) using both [imports](../design/design.md#template-imports) and -[references](../design/design.md#template-references). +[references](../design/design.md#template-references). Because template references can use any public HTTP endpoint, they provide a way to share templates. While you can store templates anywhere you want and @@ -24,7 +24,7 @@ Every template must therefore carry a version based on the [Semantic Versioning](http://semver.org/) specification. A template version consists of a MAJOR version, a MINOR version and a PATCH version, and can be represented as a three part string starting with the letter `v` and using -dot delimiters between the parts. For example `v1.1.0`. +dot delimiters between the parts. For example `v1.1.0`. Parts may be omitted from right to left, up to but not include the MAJOR version. All omitted parts default to zero. So, for example: @@ -53,15 +53,15 @@ Every template version should include a configuration named `example.yaml` that can be used to deploy an instance of the template. This file, along with any supporting files it requires, may be used automatically in the future by a template testing framework to validate the template, and should therefore be -well formed. +well formed. ## Template Organization Technically, all you need to reference a template is a directory at a public HTTP endpoint that contains a template file named either `.py` -or `.jinja`, depending on the implementation language, along -with any supporting files it might require, such as an optional schema file -named `.py.schema` or `.jinja.schema`, respectively, +or `.jinja`, depending on the implementation language, along +with any supporting files it might require, such as an optional schema file +named `.py.schema` or `.jinja.schema`, respectively, helper files used by the implementation, files imported by the schema, and so on. ### Basic structure @@ -109,13 +109,13 @@ templateA/ helper.py ``` -In this example, `templateA` is a template directory, and `v1`, `v1.01`, and +In this example, `templateA` is a template directory, and `v1`, `v1.01`, and `v1.1` are template version directories that hold the versions of `templateA`. ### Registry based template references -In general, -[templates references](https://github.com/kubernetes/deployment-manager/blob/master/docs/design/design.md#template-references) +In general, +[templates references](https://github.com/kubernetes/helm/blob/master/docs/design/design.md#template-references) are just URLs to HTTP endpoints. However, because a template registry follows the conventions outlined above, references to templates in a template registry can be shorter and simpler than generalized template references. @@ -164,7 +164,7 @@ This example, where template directories are organized by category, is also vali ``` templates/ - big-data/ + big-data/ templateA/ v1/ ... diff --git a/glide.yaml b/glide.yaml index 79237d249..bf1e7df9f 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,4 +1,4 @@ -package: github.com/kubernetes/deployment-manager +package: github.com/kubernetes/helm ignore: - google.golang.com/appengine import: diff --git a/hack/README.md b/hack/README.md index 65570d16e..2f26db573 100644 --- a/hack/README.md +++ b/hack/README.md @@ -7,18 +7,18 @@ Collection of convenience scripts A Vagrantfile to create a standalone build environment for helm. It is handy if you do not have Golang and the dependencies used by Helm on your local machine. - $ git clone https://github.com/kubernetes/deployment-manager.git - $ cd deployment-manager/hack + $ git clone https://github.com/kubernetes/helm.git + $ cd helm/hack $ vagrant up Once the machine is up, you can SSH to it and start a new build of helm $ vagrant ssh - $ cd src/github.com/kubernetes/deployment-manager + $ cd src/github.com/kubernetes/helm $ make build [dm-push.sh](dm-push.sh) ------------------------ -Run this from deployment-manager root to build and push the dm client plus +Run this from helm root to build and push the dm client plus kubernetes install config into the publicly readable GCS bucket gs://get-dm. diff --git a/hack/Vagrantfile b/hack/Vagrantfile index ffdb30e80..2f5b4a244 100644 --- a/hack/Vagrantfile +++ b/hack/Vagrantfile @@ -20,7 +20,7 @@ curl -L https://storage.googleapis.com/golang/go#{GO_VERSION}.linux-amd64.tar.gz tar -C /usr/local -xzf go#{GO_VERSION}.linux-amd64.tar.gz wget "https://github.com/Masterminds/glide/releases/download/#{GLIDE_VERSION}/glide-#{GLIDE_VERSION}-linux-amd64.tar.gz" su vagrant -c "mkdir -p /home/vagrant/bin" -su vagrant -c "mkdir -p /home/vagrant/src/github.com/kubernetes/deployment-manager" +su vagrant -c "mkdir -p /home/vagrant/src/github.com/kubernetes/helm" chgrp vagrant -R /home/vagrant/src chown vagrant -R /home/vagrant/src su vagrant -c "tar -vxz -C /home/vagrant/bin --strip=1 -f glide-#{GLIDE_VERSION}-linux-amd64.tar.gz" @@ -40,10 +40,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| vb.customize ["modifyvm", :id, "--memory", "2048"] end - config.vm.synced_folder "../", "/home/vagrant/src/github.com/kubernetes/deployment-manager" + config.vm.synced_folder "../", "/home/vagrant/src/github.com/kubernetes/helm" config.vm.synced_folder ".", "/vagrant", disabled: true - config.vm.provision :shell, inline: $bootstrap + config.vm.provision :shell, inline: $bootstrap config.vm.provision :shell, inline: $helm end diff --git a/hack/dm-push.sh b/hack/dm-push.sh index 8484f7fe0..3c095568d 100755 --- a/hack/dm-push.sh +++ b/hack/dm-push.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Run this from deployment-manager root to build and push the dm client plus +# Run this from helm root to build and push the dm client plus # kubernetes install config into the publicly readable GCS bucket gs://get-dm. # # Must have EDIT permissions on the dm-k8s-prod GCP project. diff --git a/pkg/chart/chart.go b/pkg/chart/chart.go index 98ccd2c0a..21df43408 100644 --- a/pkg/chart/chart.go +++ b/pkg/chart/chart.go @@ -28,7 +28,7 @@ import ( "path/filepath" "strings" - "github.com/kubernetes/deployment-manager/pkg/log" + "github.com/kubernetes/helm/pkg/log" ) // ChartfileName is the default Chart file name. diff --git a/pkg/chart/chart_test.go b/pkg/chart/chart_test.go index 8ef4bf682..36ac856d2 100644 --- a/pkg/chart/chart_test.go +++ b/pkg/chart/chart_test.go @@ -21,7 +21,7 @@ import ( "path/filepath" "testing" - "github.com/kubernetes/deployment-manager/pkg/log" + "github.com/kubernetes/helm/pkg/log" ) const ( diff --git a/pkg/chart/save.go b/pkg/chart/save.go index 8bc815fd6..62b36a678 100644 --- a/pkg/chart/save.go +++ b/pkg/chart/save.go @@ -24,7 +24,7 @@ import ( "os" "path/filepath" - "github.com/kubernetes/deployment-manager/pkg/log" + "github.com/kubernetes/helm/pkg/log" ) // Save creates an archived chart to the given directory. diff --git a/pkg/client/client.go b/pkg/client/client.go index ac8bc487c..b2f971837 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -31,7 +31,7 @@ import ( "time" "github.com/ghodss/yaml" - "github.com/kubernetes/deployment-manager/pkg/common" + "github.com/kubernetes/helm/pkg/common" ) // DefaultHTTPTimeout is the default HTTP timeout. diff --git a/pkg/client/client_test.go b/pkg/client/client_test.go index 91e6e5357..b58d8c1b5 100644 --- a/pkg/client/client_test.go +++ b/pkg/client/client_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - "github.com/kubernetes/deployment-manager/pkg/common" + "github.com/kubernetes/helm/pkg/common" ) func TestDefaultServerURL(t *testing.T) { diff --git a/pkg/client/install.go b/pkg/client/install.go index 4bd67ae52..ad14c9882 100644 --- a/pkg/client/install.go +++ b/pkg/client/install.go @@ -21,8 +21,8 @@ import ( "text/template" "github.com/Masterminds/sprig" - "github.com/kubernetes/deployment-manager/pkg/format" - "github.com/kubernetes/deployment-manager/pkg/kubectl" + "github.com/kubernetes/helm/pkg/format" + "github.com/kubernetes/helm/pkg/kubectl" ) // Installer is capable of installing DM into Kubernetes. diff --git a/pkg/client/uninstall.go b/pkg/client/uninstall.go index 475c37c49..81e3c6373 100644 --- a/pkg/client/uninstall.go +++ b/pkg/client/uninstall.go @@ -17,7 +17,7 @@ limitations under the License. package client import ( - "github.com/kubernetes/deployment-manager/pkg/kubectl" + "github.com/kubernetes/helm/pkg/kubectl" ) // Uninstall uses kubectl to uninstall the base DM. diff --git a/pkg/registry/filebased_credential_provider.go b/pkg/registry/filebased_credential_provider.go index 62e436594..3c42fcbcc 100644 --- a/pkg/registry/filebased_credential_provider.go +++ b/pkg/registry/filebased_credential_provider.go @@ -22,7 +22,7 @@ import ( "log" "github.com/ghodss/yaml" - "github.com/kubernetes/deployment-manager/pkg/common" + "github.com/kubernetes/helm/pkg/common" ) // FilebasedCredentialProvider provides credentials for registries. diff --git a/pkg/registry/filebased_credential_provider_test.go b/pkg/registry/filebased_credential_provider_test.go index 595463e58..4cc1a2edd 100644 --- a/pkg/registry/filebased_credential_provider_test.go +++ b/pkg/registry/filebased_credential_provider_test.go @@ -19,7 +19,7 @@ package registry import ( "testing" - "github.com/kubernetes/deployment-manager/pkg/common" + "github.com/kubernetes/helm/pkg/common" ) var filename = "./test/test_credentials_file.yaml" diff --git a/pkg/registry/gcs_registry.go b/pkg/registry/gcs_registry.go index 471e016ed..edd40907a 100644 --- a/pkg/registry/gcs_registry.go +++ b/pkg/registry/gcs_registry.go @@ -17,8 +17,8 @@ limitations under the License. package registry import ( - "github.com/kubernetes/deployment-manager/pkg/common" - "github.com/kubernetes/deployment-manager/pkg/util" + "github.com/kubernetes/helm/pkg/common" + "github.com/kubernetes/helm/pkg/util" // "golang.org/x/net/context" // "golang.org/x/oauth2/google" diff --git a/pkg/registry/github_package_registry.go b/pkg/registry/github_package_registry.go index f79e489c6..e55144d1f 100644 --- a/pkg/registry/github_package_registry.go +++ b/pkg/registry/github_package_registry.go @@ -18,7 +18,7 @@ package registry import ( "github.com/google/go-github/github" - "github.com/kubernetes/deployment-manager/pkg/common" + "github.com/kubernetes/helm/pkg/common" "fmt" "log" diff --git a/pkg/registry/github_registry.go b/pkg/registry/github_registry.go index 2e56cd87a..844ca11ea 100644 --- a/pkg/registry/github_registry.go +++ b/pkg/registry/github_registry.go @@ -18,8 +18,8 @@ package registry import ( "github.com/google/go-github/github" - "github.com/kubernetes/deployment-manager/pkg/common" - "github.com/kubernetes/deployment-manager/pkg/util" + "github.com/kubernetes/helm/pkg/common" + "github.com/kubernetes/helm/pkg/util" "fmt" "net/http" diff --git a/pkg/registry/github_template_registry.go b/pkg/registry/github_template_registry.go index 1e89efced..e7b7f7c7c 100644 --- a/pkg/registry/github_template_registry.go +++ b/pkg/registry/github_template_registry.go @@ -18,7 +18,7 @@ package registry import ( "github.com/google/go-github/github" - "github.com/kubernetes/deployment-manager/pkg/common" + "github.com/kubernetes/helm/pkg/common" "fmt" "log" diff --git a/pkg/registry/inmem_credential_provider.go b/pkg/registry/inmem_credential_provider.go index 843d31231..e1004c08a 100644 --- a/pkg/registry/inmem_credential_provider.go +++ b/pkg/registry/inmem_credential_provider.go @@ -17,7 +17,7 @@ limitations under the License. package registry import ( - "github.com/kubernetes/deployment-manager/pkg/common" + "github.com/kubernetes/helm/pkg/common" "fmt" ) diff --git a/pkg/registry/inmem_credential_provider_test.go b/pkg/registry/inmem_credential_provider_test.go index 422021128..ecbbeddae 100644 --- a/pkg/registry/inmem_credential_provider_test.go +++ b/pkg/registry/inmem_credential_provider_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/kubernetes/deployment-manager/pkg/common" + "github.com/kubernetes/helm/pkg/common" ) type testCase struct { diff --git a/pkg/registry/inmem_registry_service.go b/pkg/registry/inmem_registry_service.go index 6b9a37ff1..cd3c92242 100644 --- a/pkg/registry/inmem_registry_service.go +++ b/pkg/registry/inmem_registry_service.go @@ -17,8 +17,8 @@ limitations under the License. package registry import ( - "github.com/kubernetes/deployment-manager/pkg/common" - "github.com/kubernetes/deployment-manager/pkg/util" + "github.com/kubernetes/helm/pkg/common" + "github.com/kubernetes/helm/pkg/util" "fmt" "strings" diff --git a/pkg/registry/registry.go b/pkg/registry/registry.go index 2c7358abb..27e94a5ff 100644 --- a/pkg/registry/registry.go +++ b/pkg/registry/registry.go @@ -17,8 +17,8 @@ limitations under the License. package registry import ( - "github.com/kubernetes/deployment-manager/pkg/common" - "github.com/kubernetes/deployment-manager/pkg/util" + "github.com/kubernetes/helm/pkg/common" + "github.com/kubernetes/helm/pkg/util" "fmt" "net/url" diff --git a/pkg/registry/registryprovider.go b/pkg/registry/registryprovider.go index dbd871d2f..19c08d68e 100644 --- a/pkg/registry/registryprovider.go +++ b/pkg/registry/registryprovider.go @@ -18,8 +18,8 @@ package registry import ( "github.com/google/go-github/github" - "github.com/kubernetes/deployment-manager/pkg/common" - "github.com/kubernetes/deployment-manager/pkg/util" + "github.com/kubernetes/helm/pkg/common" + "github.com/kubernetes/helm/pkg/util" "golang.org/x/oauth2" "golang.org/x/oauth2/google" storage "google.golang.org/api/storage/v1" diff --git a/pkg/registry/secrets_credential_provider.go b/pkg/registry/secrets_credential_provider.go index 54668c529..03c217417 100644 --- a/pkg/registry/secrets_credential_provider.go +++ b/pkg/registry/secrets_credential_provider.go @@ -24,8 +24,8 @@ import ( "log" "github.com/ghodss/yaml" - "github.com/kubernetes/deployment-manager/pkg/common" - "github.com/kubernetes/deployment-manager/pkg/util" + "github.com/kubernetes/helm/pkg/common" + "github.com/kubernetes/helm/pkg/util" ) var ( diff --git a/pkg/registry/testhelper.go b/pkg/registry/testhelper.go index 76a6e6393..30e76e386 100644 --- a/pkg/registry/testhelper.go +++ b/pkg/registry/testhelper.go @@ -22,8 +22,8 @@ import ( "bytes" "io/ioutil" - "github.com/kubernetes/deployment-manager/pkg/common" - "github.com/kubernetes/deployment-manager/pkg/util" + "github.com/kubernetes/helm/pkg/common" + "github.com/kubernetes/helm/pkg/util" "fmt" "net/http" diff --git a/pkg/util/kubernetesutil.go b/pkg/util/kubernetesutil.go index cbf653217..581bd97a2 100644 --- a/pkg/util/kubernetesutil.go +++ b/pkg/util/kubernetesutil.go @@ -21,7 +21,7 @@ import ( "time" "github.com/ghodss/yaml" - "github.com/kubernetes/deployment-manager/pkg/common" + "github.com/kubernetes/helm/pkg/common" ) // ParseKubernetesObject parses a Kubernetes API object in YAML format. diff --git a/pkg/util/kubernetesutil_test.go b/pkg/util/kubernetesutil_test.go index 0f1513135..87991f6c4 100644 --- a/pkg/util/kubernetesutil_test.go +++ b/pkg/util/kubernetesutil_test.go @@ -23,7 +23,7 @@ import ( "github.com/ghodss/yaml" - "github.com/kubernetes/deployment-manager/pkg/common" + "github.com/kubernetes/helm/pkg/common" ) var serviceInput = ` diff --git a/pkg/util/templateutil.go b/pkg/util/templateutil.go index 69d4f04d3..ea111448c 100644 --- a/pkg/util/templateutil.go +++ b/pkg/util/templateutil.go @@ -26,7 +26,7 @@ import ( "path/filepath" "github.com/ghodss/yaml" - "github.com/kubernetes/deployment-manager/pkg/common" + "github.com/kubernetes/helm/pkg/common" ) // NewTemplateFromType creates and returns a new template whose content diff --git a/scripts/build-go.sh b/scripts/build-go.sh index 6d38579b8..644762b02 100755 --- a/scripts/build-go.sh +++ b/scripts/build-go.sh @@ -18,7 +18,7 @@ set -o pipefail [[ "$TRACE" ]] && set -x -readonly REPO=github.com/kubernetes/deployment-manager +readonly REPO=github.com/kubernetes/helm readonly DIR="${GOPATH}/src/${REPO}" source "${DIR}/scripts/common.sh"