Merge pull request #791 from adamreese/chore/import-path

chore(*): use k8s.io as the import path

Makefile

@@ -18,7 +18,7 @@ all: build
 
 .PHONY: build
 build:
-	GOBIN=$(BINDIR) $(GO) install $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' github.com/kubernetes/helm/cmd/...
+	GOBIN=$(BINDIR) $(GO) install $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' k8s.io/helm/cmd/...
 
 .PHONY: check-docker
 check-docker:
@@ -31,7 +31,7 @@ check-docker:
 docker-binary: BINDIR = ./rootfs
 docker-binary: GOFLAGS += -a -installsuffix cgo
 docker-binary:
-	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 $(GO) build -o $(BINDIR)/tiller $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' github.com/kubernetes/helm/cmd/tiller
+	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 $(GO) build -o $(BINDIR)/tiller $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' k8s.io/helm/cmd/tiller
 
 .PHONY: docker-build
 docker-build: check-docker docker-binary

README.md

@@ -40,7 +40,7 @@ Make sure you have the prerequisites:
 - [Glide](https://glide.sh/) 0.10 or greater with both git and mercurial installed.
 
 1. [Properly set your $GOPATH](https://golang.org/doc/code.html)
-2. Clone (or otherwise download) this repository into $GOPATH/src/github.com/kubernetes/helm
+2. Clone (or otherwise download) this repository into $GOPATH/src/k8s.io/helm
 3. Run `make bootstrap build`
 
 You will now have two binaries built:

_proto/Makefile

@@ -2,7 +2,7 @@ space := $(empty) $(empty)
 comma := ,
 empty :=
 
-import_path = github.com/kubernetes/helm/pkg/proto/hapi
+import_path = k8s.io/helm/pkg/proto/hapi
 
 dst 	= ../pkg/proto
 target  = go

_proto/hapi/chart/metadata.proto

@@ -15,7 +15,7 @@ message Maintainer {
 
 //	Metadata for a Chart file. This models the structure of a Chart.yaml file.
 //
-// 	Spec: https://github.com/kubernetes/helm/blob/master/docs/design/chart_format.md#the-chart-file
+// 	Spec: https://k8s.io/helm/blob/master/docs/design/chart_format.md#the-chart-file
 message Metadata {
 	// The name of the chart
 	string name = 1;

circle.yml

@@ -4,7 +4,7 @@ machine:
     GO15VENDOREXPERIMENT: 1
     GOPATH: /usr/local/go_workspace
     HOME: /home/ubuntu
-    IMPORT_PATH: "github.com/kubernetes/helm"
+    IMPORT_PATH: "k8s.io/helm"
     PATH: $HOME/go/bin:$PATH
     GOROOT: $HOME/go
 

cmd/helm/create.go

@@ -4,8 +4,9 @@ import (
 	"errors"
 	"path/filepath"
 
-	"github.com/kubernetes/helm/pkg/chart"
 	"github.com/spf13/cobra"
+
+	"k8s.io/helm/pkg/chart"
 )
 
 const createDesc = `

cmd/helm/delete.go

@@ -3,8 +3,9 @@ package main
 import (
 	"errors"
 
-	"github.com/kubernetes/helm/pkg/helm"
 	"github.com/spf13/cobra"
+
+	"k8s.io/helm/pkg/helm"
 )
 
 const deleteDesc = `

cmd/helm/fetch.go

@@ -8,9 +8,10 @@ import (
 	"os"
 	"strings"
 
-	"github.com/kubernetes/helm/pkg/chart"
-	"github.com/kubernetes/helm/pkg/repo"
 	"github.com/spf13/cobra"
+
+	"k8s.io/helm/pkg/chart"
+	"k8s.io/helm/pkg/repo"
 )
 
 var untarFile bool

cmd/helm/get.go

@@ -6,9 +6,10 @@ import (
 	"os"
 	"time"
 
-	"github.com/kubernetes/helm/pkg/helm"
-	"github.com/kubernetes/helm/pkg/timeconv"
 	"github.com/spf13/cobra"
+
+	"k8s.io/helm/pkg/helm"
+	"k8s.io/helm/pkg/timeconv"
 )
 
 var getHelp = `

cmd/helm/helm.go

@@ -6,9 +6,10 @@ import (
 	"os"
 	"strings"
 
-	"github.com/kubernetes/helm/pkg/helm"
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc"
+
+	"k8s.io/helm/pkg/helm"
 )
 
 const (

cmd/helm/init.go

@@ -5,8 +5,9 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/kubernetes/helm/pkg/client"
 	"github.com/spf13/cobra"
+
+	"k8s.io/helm/pkg/client"
 )
 
 const initDesc = `

cmd/helm/install.go

@@ -9,9 +9,9 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/kubernetes/helm/pkg/helm"
+	"k8s.io/helm/pkg/helm"
-	"github.com/kubernetes/helm/pkg/proto/hapi/release"
+	"k8s.io/helm/pkg/proto/hapi/release"
-	"github.com/kubernetes/helm/pkg/timeconv"
+	"k8s.io/helm/pkg/timeconv"
 )
 
 const installDesc = `

cmd/helm/lint.go

@@ -6,8 +6,9 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/kubernetes/helm/pkg/lint"
 	"github.com/spf13/cobra"
+
+	"k8s.io/helm/pkg/lint"
 )
 
 var longLintHelp = `

cmd/helm/list.go

@@ -5,11 +5,12 @@ import (
 	"strings"
 
 	"github.com/gosuri/uitable"
-	"github.com/kubernetes/helm/pkg/helm"
-	"github.com/kubernetes/helm/pkg/proto/hapi/release"
-	"github.com/kubernetes/helm/pkg/proto/hapi/services"
-	"github.com/kubernetes/helm/pkg/timeconv"
 	"github.com/spf13/cobra"
+
+	"k8s.io/helm/pkg/helm"
+	"k8s.io/helm/pkg/proto/hapi/release"
+	"k8s.io/helm/pkg/proto/hapi/services"
+	"k8s.io/helm/pkg/timeconv"
 )
 
 var listHelp = `

cmd/helm/package.go

@@ -5,9 +5,10 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/kubernetes/helm/pkg/chart"
-	"github.com/kubernetes/helm/pkg/repo"
 	"github.com/spf13/cobra"
+
+	"k8s.io/helm/pkg/chart"
+	"k8s.io/helm/pkg/repo"
 )
 
 const packageDesc = `

cmd/helm/repo.go

@@ -7,9 +7,10 @@ import (
 	"path/filepath"
 
 	"github.com/gosuri/uitable"
-	"github.com/kubernetes/helm/pkg/repo"
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
+
+	"k8s.io/helm/pkg/repo"
 )
 
 func init() {

cmd/helm/repo_test.go

@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/kubernetes/helm/pkg/repo"
+	"k8s.io/helm/pkg/repo"
 )
 
 var (

cmd/helm/search.go

@@ -7,8 +7,9 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/kubernetes/helm/pkg/repo"
 	"github.com/spf13/cobra"
+
+	"k8s.io/helm/pkg/repo"
 )
 
 func init() {

cmd/helm/search_test.go

@@ -3,7 +3,7 @@ package main
 import (
 	"testing"
 
-	"github.com/kubernetes/helm/pkg/repo"
+	"k8s.io/helm/pkg/repo"
 )
 
 const testDir = "testdata/"

cmd/helm/serve.go

@@ -1,8 +1,9 @@
 package main
 
 import (
-	"github.com/kubernetes/helm/pkg/repo"
 	"github.com/spf13/cobra"
+
+	"k8s.io/helm/pkg/repo"
 )
 
 var serveDesc = `This command starts a local chart repository server that serves the charts saved in your $HELM_HOME/local/ directory.`

cmd/helm/status.go

@@ -3,9 +3,10 @@ package main
 import (
 	"fmt"
 
-	"github.com/kubernetes/helm/pkg/helm"
-	"github.com/kubernetes/helm/pkg/timeconv"
 	"github.com/spf13/cobra"
+
+	"k8s.io/helm/pkg/helm"
+	"k8s.io/helm/pkg/timeconv"
 )
 
 var statusHelp = `

cmd/helm/tunnel.go

@@ -6,7 +6,7 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/labels"
 
-	"github.com/kubernetes/helm/pkg/kube"
+	"k8s.io/helm/pkg/kube"
 )
 
 // TODO refactor out this global var

cmd/helm/update.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/kubernetes/helm/pkg/repo"
+	"k8s.io/helm/pkg/repo"
 )
 
 var verboseUpdate bool

cmd/helm/version.go

@@ -3,9 +3,9 @@ package main
 import (
 	"fmt"
 
-	"github.com/kubernetes/helm/pkg/version"
-
 	"github.com/spf13/cobra"
+
+	"k8s.io/helm/pkg/version"
 )
 
 func init() {

cmd/tiller/environment/environment.go

@@ -9,11 +9,11 @@ package environment
 import (
 	"io"
 
-	"github.com/kubernetes/helm/pkg/engine"
+	"k8s.io/helm/pkg/engine"
-	"github.com/kubernetes/helm/pkg/kube"
+	"k8s.io/helm/pkg/kube"
-	"github.com/kubernetes/helm/pkg/proto/hapi/chart"
+	"k8s.io/helm/pkg/proto/hapi/chart"
-	"github.com/kubernetes/helm/pkg/proto/hapi/release"
+	"k8s.io/helm/pkg/proto/hapi/release"
-	"github.com/kubernetes/helm/pkg/storage"
+	"k8s.io/helm/pkg/storage"
 )
 
 // GoTplEngine is the name of the Go template engine, as registered in the EngineYard.

cmd/tiller/environment/environment_test.go

@@ -5,8 +5,8 @@ import (
 	"io"
 	"testing"
 
-	"github.com/kubernetes/helm/pkg/proto/hapi/chart"
+	"k8s.io/helm/pkg/proto/hapi/chart"
-	"github.com/kubernetes/helm/pkg/proto/hapi/release"
+	"k8s.io/helm/pkg/proto/hapi/release"
 )
 
 type mockEngine struct {

cmd/tiller/release_server.go

@@ -8,13 +8,14 @@ import (
 	"regexp"
 	"sort"
 
-	"github.com/kubernetes/helm/cmd/tiller/environment"
-	"github.com/kubernetes/helm/pkg/proto/hapi/release"
-	"github.com/kubernetes/helm/pkg/proto/hapi/services"
-	"github.com/kubernetes/helm/pkg/storage"
-	"github.com/kubernetes/helm/pkg/timeconv"
 	"github.com/technosophos/moniker"
 	ctx "golang.org/x/net/context"
+
+	"k8s.io/helm/cmd/tiller/environment"
+	"k8s.io/helm/pkg/proto/hapi/release"
+	"k8s.io/helm/pkg/proto/hapi/services"
+	"k8s.io/helm/pkg/storage"
+	"k8s.io/helm/pkg/timeconv"
 )
 
 var srv *releaseServer

cmd/tiller/release_server_test.go

@@ -7,14 +7,15 @@ import (
 	"testing"
 
 	"github.com/golang/protobuf/ptypes/timestamp"
-	"github.com/kubernetes/helm/cmd/tiller/environment"
-	"github.com/kubernetes/helm/pkg/proto/hapi/chart"
-	"github.com/kubernetes/helm/pkg/proto/hapi/release"
-	"github.com/kubernetes/helm/pkg/proto/hapi/services"
-	"github.com/kubernetes/helm/pkg/storage"
-	"github.com/kubernetes/helm/pkg/timeconv"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/metadata"
+
+	"k8s.io/helm/cmd/tiller/environment"
+	"k8s.io/helm/pkg/proto/hapi/chart"
+	"k8s.io/helm/pkg/proto/hapi/release"
+	"k8s.io/helm/pkg/proto/hapi/services"
+	"k8s.io/helm/pkg/storage"
+	"k8s.io/helm/pkg/timeconv"
 )
 
 func rsFixture() *releaseServer {

cmd/tiller/tiller.go

@@ -6,9 +6,10 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/kubernetes/helm/cmd/tiller/environment"
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc"
+
+	"k8s.io/helm/cmd/tiller/environment"
 )
 
 // rootServer is the root gRPC server.

cmd/tiller/tiller_test.go

@@ -3,9 +3,9 @@ package main
 import (
 	"testing"
 
-	"github.com/kubernetes/helm/cmd/tiller/environment"
+	"k8s.io/helm/cmd/tiller/environment"
-	"github.com/kubernetes/helm/pkg/engine"
+	"k8s.io/helm/pkg/engine"
-	"github.com/kubernetes/helm/pkg/storage"
+	"k8s.io/helm/pkg/storage"
 )
 
 // These are canary tests to make sure that the default server actually

docs/developers.md

@@ -73,7 +73,7 @@ elegant and high-quality open source code so that our users will benefit.
 
 Make sure you have read and understood the main CONTRIBUTING guide:
 
-https://github.com/kubernetes/helm/blob/master/CONTRIBUTING.md
+https://k8s.io/helm/blob/master/CONTRIBUTING.md
 
 We follow the coding standards and guidelines outlined by the Deis
 project:

docs/examples/alpine/Chart.yaml

@@ -1,4 +1,4 @@
 name: alpine
 description: Deploy a basic Alpine Linux pod
 version: 0.1.0
-home: https://github.com/kubernetes/helm
+home: https://k8s.io/helm

glide.yaml

@@ -1,4 +1,4 @@
-package: github.com/kubernetes/helm
+package: k8s.io/helm
 import:
 - package: golang.org/x/net
   version: fb93926129b8ec0056f2f458b1f519654814edf0

pkg/chartutil/chartfile.go

@@ -4,7 +4,8 @@ import (
 	"io/ioutil"
 
 	"github.com/ghodss/yaml"
-	"github.com/kubernetes/helm/pkg/proto/hapi/chart"
+
+	"k8s.io/helm/pkg/proto/hapi/chart"
 )
 
 // UnmarshalChartfile takes raw Chart.yaml data and unmarshals it.

pkg/chartutil/chartfile_test.go

@@ -3,7 +3,7 @@ package chartutil
 import (
 	"testing"
 
-	"github.com/kubernetes/helm/pkg/proto/hapi/chart"
+	"k8s.io/helm/pkg/proto/hapi/chart"
 )
 
 const testfile = "testdata/chartfiletest.yaml"

pkg/chartutil/doc.go

@@ -22,7 +22,7 @@ For accepting raw compressed tar file data from an io.Reader, the
 'chartutil.LoadArchive()' will read in the data, uncompress it, and unpack it
 into a Chart.
 
-When creating charts in memory, use the 'github.com/kubernetes/helm/pkg/proto/happy/chart'
+When creating charts in memory, use the 'k8s.io/helm/pkg/proto/happy/chart'
 package directly.
 */
 package chartutil

pkg/chartutil/load.go

@@ -13,7 +13,8 @@ import (
 	"strings"
 
 	"github.com/golang/protobuf/ptypes/any"
-	"github.com/kubernetes/helm/pkg/proto/hapi/chart"
+
+	"k8s.io/helm/pkg/proto/hapi/chart"
 )
 
 // Load takes a string name, tries to resolve it to a file or directory, and then loads it.

pkg/chartutil/load_test.go

@@ -3,7 +3,7 @@ package chartutil
 import (
 	"testing"
 
-	"github.com/kubernetes/helm/pkg/proto/hapi/chart"
+	"k8s.io/helm/pkg/proto/hapi/chart"
 )
 
 func TestLoadDir(t *testing.T) {

pkg/chartutil/save.go

@@ -9,7 +9,8 @@ import (
 	"path/filepath"
 
 	"github.com/ghodss/yaml"
-	"github.com/kubernetes/helm/pkg/proto/hapi/chart"
+
+	"k8s.io/helm/pkg/proto/hapi/chart"
 )
 
 var headerBytes = []byte("+aHR0cHM6Ly95b3V0dS5iZS96OVV6MWljandyTQo=")

pkg/chartutil/save_test.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/kubernetes/helm/pkg/proto/hapi/chart"
+	"k8s.io/helm/pkg/proto/hapi/chart"
 )
 
 func TestSave(t *testing.T) {

pkg/chartutil/testdata/frobnitz/charts/alpine/Chart.yaml

@@ -1,4 +1,4 @@
 name: alpine
 description: Deploy a basic Alpine Linux pod
 version: 0.1.0
-home: https://github.com/kubernetes/helm
+home: https://k8s.io/helm

pkg/client/install.go

@@ -6,7 +6,8 @@ import (
 	"text/template"
 
 	"github.com/Masterminds/sprig"
-	"github.com/kubernetes/helm/pkg/kube"
+
+	"k8s.io/helm/pkg/kube"
 )
 
 // Installer installs tiller into Kubernetes

pkg/engine/engine.go

@@ -7,8 +7,9 @@ import (
 	"text/template"
 
 	"github.com/Masterminds/sprig"
-	chartutil "github.com/kubernetes/helm/pkg/chart"
+
-	"github.com/kubernetes/helm/pkg/proto/hapi/chart"
+	chartutil "k8s.io/helm/pkg/chart"
+	"k8s.io/helm/pkg/proto/hapi/chart"
 )
 
 // Engine is an implementation of 'cmd/tiller/environment'.Engine that uses Go templates.

pkg/engine/engine_test.go

@@ -5,8 +5,8 @@ import (
 	"sync"
 	"testing"
 
-	chartutil "github.com/kubernetes/helm/pkg/chart"
+	chartutil "k8s.io/helm/pkg/chart"
-	"github.com/kubernetes/helm/pkg/proto/hapi/chart"
+	"k8s.io/helm/pkg/proto/hapi/chart"
 )
 
 func TestEngine(t *testing.T) {

pkg/helm/client.go

@@ -4,7 +4,7 @@ import (
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 
-	"github.com/kubernetes/helm/pkg/proto/hapi/services"
+	"k8s.io/helm/pkg/proto/hapi/services"
 )
 
 type client struct {

pkg/helm/convert.go

@@ -3,8 +3,8 @@ package helm
 import (
 	"bytes"
 
-	chartutil "github.com/kubernetes/helm/pkg/chart"
+	chartutil "k8s.io/helm/pkg/chart"
-	chartpbs "github.com/kubernetes/helm/pkg/proto/hapi/chart"
+	chartpbs "k8s.io/helm/pkg/proto/hapi/chart"
 )
 
 // ChartToProto converts a chart to its Protobuf struct representation.

pkg/helm/convert_test.go

@@ -3,8 +3,9 @@ package helm
 import (
 	"testing"
 
-	chartutil "github.com/kubernetes/helm/pkg/chart"
 	"gopkg.in/yaml.v2"
+
+	chartutil "k8s.io/helm/pkg/chart"
 )
 
 func TestInstallReleaseOverrides(t *testing.T) {

pkg/helm/helm.go

@@ -1,9 +1,10 @@
 package helm
 
 import (
-	chartutil "github.com/kubernetes/helm/pkg/chart"
-	"github.com/kubernetes/helm/pkg/proto/hapi/services"
 	"golang.org/x/net/context"
+
+	chartutil "k8s.io/helm/pkg/chart"
+	"k8s.io/helm/pkg/proto/hapi/services"
 )
 
 // Config defines a gRPC client's configuration.

pkg/helm/testdata/albatross/Chart.yaml

@@ -1,4 +1,4 @@
 name: albatross
 description: testing chart
 version: 0.1.0
-home: "https://github.com/kubernetes/helm"
+home: "https://k8s.io/helm"

pkg/helm/traverse.go

@@ -1,7 +1,7 @@
 package helm
 
 import (
-	chartutil "github.com/kubernetes/helm/pkg/chart"
+	chartutil "k8s.io/helm/pkg/chart"
 )
 
 //

pkg/lint/chartfile.go

@@ -4,7 +4,7 @@ import (
 	"os"
 	"path/filepath"
 
-	chartutil "github.com/kubernetes/helm/pkg/chart"
+	chartutil "k8s.io/helm/pkg/chart"
 )
 
 // Chartfile checks the Chart.yaml file for errors and warnings.

pkg/lint/values.go

@@ -2,9 +2,9 @@ package lint
 
 import (
 	"os"
-
-	"github.com/kubernetes/helm/pkg/chart"
 	"path/filepath"
+
+	"k8s.io/helm/pkg/chart"
 )
 
 // Values lints a chart's values.toml file.

pkg/proto/hapi/chart/metadata.pb.go

@@ -28,7 +28,7 @@ func (*Maintainer) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{
 
 // 	Metadata for a Chart file. This models the structure of a Chart.yaml file.
 //
-// 	Spec: https://github.com/kubernetes/helm/blob/master/docs/design/chart_format.md#the-chart-file
+// 	Spec: https://k8s.io/helm/blob/master/docs/design/chart_format.md#the-chart-file
 type Metadata struct {
 	// The name of the chart
 	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`

pkg/proto/hapi/release/release.pb.go

@@ -7,8 +7,8 @@ package release
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import hapi_chart "github.com/kubernetes/helm/pkg/proto/hapi/chart"
+import hapi_chart "k8s.io/helm/pkg/proto/hapi/chart"
-import hapi_chart3 "github.com/kubernetes/helm/pkg/proto/hapi/chart"
+import hapi_chart3 "k8s.io/helm/pkg/proto/hapi/chart"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal

pkg/proto/hapi/services/tiller.pb.go

@@ -28,10 +28,10 @@ package services
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import hapi_chart3 "github.com/kubernetes/helm/pkg/proto/hapi/chart"
+import hapi_chart3 "k8s.io/helm/pkg/proto/hapi/chart"
-import hapi_chart "github.com/kubernetes/helm/pkg/proto/hapi/chart"
+import hapi_chart "k8s.io/helm/pkg/proto/hapi/chart"
-import hapi_release2 "github.com/kubernetes/helm/pkg/proto/hapi/release"
+import hapi_release2 "k8s.io/helm/pkg/proto/hapi/release"
-import hapi_release1 "github.com/kubernetes/helm/pkg/proto/hapi/release"
+import hapi_release1 "k8s.io/helm/pkg/proto/hapi/release"
 
 import (
 	context "golang.org/x/net/context"

pkg/repo/index.go

@@ -7,7 +7,7 @@ import (
 
 	"gopkg.in/yaml.v2"
 
-	"github.com/kubernetes/helm/pkg/chart"
+	"k8s.io/helm/pkg/chart"
 )
 
 var indexPath = "index.yaml"

pkg/repo/local.go

@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/kubernetes/helm/pkg/chart"
+	"k8s.io/helm/pkg/chart"
 )
 
 var localRepoPath string

pkg/repo/repo.go

@@ -13,7 +13,7 @@ import (
 
 	"gopkg.in/yaml.v2"
 
-	"github.com/kubernetes/helm/pkg/chart"
+	"k8s.io/helm/pkg/chart"
 )
 
 // ChartRepository represents a chart repository

pkg/storage/memory.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"sync"
 
-	"github.com/kubernetes/helm/pkg/proto/hapi/release"
+	"k8s.io/helm/pkg/proto/hapi/release"
 )
 
 // Memory is an in-memory ReleaseStorage implementation.

pkg/storage/memory_test.go

@@ -3,7 +3,7 @@ package storage
 import (
 	"testing"
 
-	"github.com/kubernetes/helm/pkg/proto/hapi/release"
+	"k8s.io/helm/pkg/proto/hapi/release"
 )
 
 func TestCreate(t *testing.T) {

versioning.mk

@@ -14,7 +14,7 @@ BINARY_VERSION ?= ${GIT_TAG}+${GIT_SHA}
 IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${SHORT_NAME}:${DOCKER_VERSION}
 MUTABLE_IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${SHORT_NAME}:${MUTABLE_VERSION}
 
-LDFLAGS += -X github.com/kubernetes/helm/pkg/version.Version=${BINARY_VERSION}
+LDFLAGS += -X k8s.io/helm/pkg/version.Version=${BINARY_VERSION}
 
 DOCKER_PUSH = docker push
 ifeq ($(DOCKER_REGISTRY),gcr.io)