Commit 818c8787 authored by Adam Reese's avatar Adam Reese

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

parent 758a59c8
...@@ -18,7 +18,7 @@ all: build ...@@ -18,7 +18,7 @@ all: build
.PHONY: build .PHONY: build
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 .PHONY: check-docker
check-docker: check-docker:
...@@ -31,7 +31,7 @@ check-docker: ...@@ -31,7 +31,7 @@ check-docker:
docker-binary: BINDIR = ./rootfs docker-binary: BINDIR = ./rootfs
docker-binary: GOFLAGS += -a -installsuffix cgo docker-binary: GOFLAGS += -a -installsuffix cgo
docker-binary: 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 .PHONY: docker-build
docker-build: check-docker docker-binary docker-build: check-docker docker-binary
......
...@@ -40,7 +40,7 @@ Make sure you have the prerequisites: ...@@ -40,7 +40,7 @@ Make sure you have the prerequisites:
- [Glide](https://glide.sh/) 0.10 or greater with both git and mercurial installed. - [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) 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` 3. Run `make bootstrap build`
You will now have two binaries built: You will now have two binaries built:
......
...@@ -2,7 +2,7 @@ space := $(empty) $(empty) ...@@ -2,7 +2,7 @@ space := $(empty) $(empty)
comma := , comma := ,
empty := empty :=
import_path = github.com/kubernetes/helm/pkg/proto/hapi import_path = k8s.io/helm/pkg/proto/hapi
dst = ../pkg/proto dst = ../pkg/proto
target = go target = go
......
...@@ -15,7 +15,7 @@ message Maintainer { ...@@ -15,7 +15,7 @@ message Maintainer {
// Metadata for a Chart file. This models the structure of a Chart.yaml file. // 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 { message Metadata {
// The name of the chart // The name of the chart
string name = 1; string name = 1;
......
...@@ -4,7 +4,7 @@ machine: ...@@ -4,7 +4,7 @@ machine:
GO15VENDOREXPERIMENT: 1 GO15VENDOREXPERIMENT: 1
GOPATH: /usr/local/go_workspace GOPATH: /usr/local/go_workspace
HOME: /home/ubuntu HOME: /home/ubuntu
IMPORT_PATH: "github.com/kubernetes/helm" IMPORT_PATH: "k8s.io/helm"
PATH: $HOME/go/bin:$PATH PATH: $HOME/go/bin:$PATH
GOROOT: $HOME/go GOROOT: $HOME/go
......
...@@ -4,8 +4,9 @@ import ( ...@@ -4,8 +4,9 @@ import (
"errors" "errors"
"path/filepath" "path/filepath"
"github.com/kubernetes/helm/pkg/chart"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"k8s.io/helm/pkg/chart"
) )
const createDesc = ` const createDesc = `
......
...@@ -3,8 +3,9 @@ package main ...@@ -3,8 +3,9 @@ package main
import ( import (
"errors" "errors"
"github.com/kubernetes/helm/pkg/helm"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"k8s.io/helm/pkg/helm"
) )
const deleteDesc = ` const deleteDesc = `
......
...@@ -8,9 +8,10 @@ import ( ...@@ -8,9 +8,10 @@ import (
"os" "os"
"strings" "strings"
"github.com/kubernetes/helm/pkg/chart"
"github.com/kubernetes/helm/pkg/repo"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"k8s.io/helm/pkg/chart"
"k8s.io/helm/pkg/repo"
) )
var untarFile bool var untarFile bool
......
...@@ -6,9 +6,10 @@ import ( ...@@ -6,9 +6,10 @@ import (
"os" "os"
"time" "time"
"github.com/kubernetes/helm/pkg/helm"
"github.com/kubernetes/helm/pkg/timeconv"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"k8s.io/helm/pkg/helm"
"k8s.io/helm/pkg/timeconv"
) )
var getHelp = ` var getHelp = `
......
...@@ -6,9 +6,10 @@ import ( ...@@ -6,9 +6,10 @@ import (
"os" "os"
"strings" "strings"
"github.com/kubernetes/helm/pkg/helm"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"google.golang.org/grpc" "google.golang.org/grpc"
"k8s.io/helm/pkg/helm"
) )
const ( const (
......
...@@ -5,8 +5,9 @@ import ( ...@@ -5,8 +5,9 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/kubernetes/helm/pkg/client"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"k8s.io/helm/pkg/client"
) )
const initDesc = ` const initDesc = `
......
...@@ -9,9 +9,9 @@ import ( ...@@ -9,9 +9,9 @@ import (
"github.com/spf13/cobra" "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 = ` const installDesc = `
......
...@@ -6,8 +6,9 @@ import ( ...@@ -6,8 +6,9 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/kubernetes/helm/pkg/lint"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"k8s.io/helm/pkg/lint"
) )
var longLintHelp = ` var longLintHelp = `
......
...@@ -5,11 +5,12 @@ import ( ...@@ -5,11 +5,12 @@ import (
"strings" "strings"
"github.com/gosuri/uitable" "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" "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 = ` var listHelp = `
......
...@@ -5,9 +5,10 @@ import ( ...@@ -5,9 +5,10 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/kubernetes/helm/pkg/chart"
"github.com/kubernetes/helm/pkg/repo"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"k8s.io/helm/pkg/chart"
"k8s.io/helm/pkg/repo"
) )
const packageDesc = ` const packageDesc = `
......
...@@ -7,9 +7,10 @@ import ( ...@@ -7,9 +7,10 @@ import (
"path/filepath" "path/filepath"
"github.com/gosuri/uitable" "github.com/gosuri/uitable"
"github.com/kubernetes/helm/pkg/repo"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
"k8s.io/helm/pkg/repo"
) )
func init() { func init() {
......
...@@ -9,7 +9,7 @@ import ( ...@@ -9,7 +9,7 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
"github.com/kubernetes/helm/pkg/repo" "k8s.io/helm/pkg/repo"
) )
var ( var (
......
...@@ -7,8 +7,9 @@ import ( ...@@ -7,8 +7,9 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/kubernetes/helm/pkg/repo"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"k8s.io/helm/pkg/repo"
) )
func init() { func init() {
......
...@@ -3,7 +3,7 @@ package main ...@@ -3,7 +3,7 @@ package main
import ( import (
"testing" "testing"
"github.com/kubernetes/helm/pkg/repo" "k8s.io/helm/pkg/repo"
) )
const testDir = "testdata/" const testDir = "testdata/"
......
package main package main
import ( import (
"github.com/kubernetes/helm/pkg/repo"
"github.com/spf13/cobra" "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.` var serveDesc = `This command starts a local chart repository server that serves the charts saved in your $HELM_HOME/local/ directory.`
......
...@@ -3,9 +3,10 @@ package main ...@@ -3,9 +3,10 @@ package main
import ( import (
"fmt" "fmt"
"github.com/kubernetes/helm/pkg/helm"
"github.com/kubernetes/helm/pkg/timeconv"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"k8s.io/helm/pkg/helm"
"k8s.io/helm/pkg/timeconv"
) )
var statusHelp = ` var statusHelp = `
......
...@@ -6,7 +6,7 @@ import ( ...@@ -6,7 +6,7 @@ import (
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/labels"
"github.com/kubernetes/helm/pkg/kube" "k8s.io/helm/pkg/kube"
) )
// TODO refactor out this global var // TODO refactor out this global var
......
...@@ -7,7 +7,7 @@ import ( ...@@ -7,7 +7,7 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/kubernetes/helm/pkg/repo" "k8s.io/helm/pkg/repo"
) )
var verboseUpdate bool var verboseUpdate bool
......
...@@ -3,9 +3,9 @@ package main ...@@ -3,9 +3,9 @@ package main
import ( import (
"fmt" "fmt"
"github.com/kubernetes/helm/pkg/version"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"k8s.io/helm/pkg/version"
) )
func init() { func init() {
......
...@@ -9,11 +9,11 @@ package environment ...@@ -9,11 +9,11 @@ package environment
import ( import (
"io" "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. // GoTplEngine is the name of the Go template engine, as registered in the EngineYard.
......
...@@ -5,8 +5,8 @@ import ( ...@@ -5,8 +5,8 @@ import (
"io" "io"
"testing" "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 { type mockEngine struct {
......
...@@ -8,13 +8,14 @@ import ( ...@@ -8,13 +8,14 @@ import (
"regexp" "regexp"
"sort" "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" "github.com/technosophos/moniker"
ctx "golang.org/x/net/context" 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 var srv *releaseServer
......
...@@ -7,14 +7,15 @@ import ( ...@@ -7,14 +7,15 @@ import (
"testing" "testing"
"github.com/golang/protobuf/ptypes/timestamp" "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" "golang.org/x/net/context"
"google.golang.org/grpc/metadata" "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 { func rsFixture() *releaseServer {
......
...@@ -6,9 +6,10 @@ import ( ...@@ -6,9 +6,10 @@ import (
"net/http" "net/http"
"os" "os"
"github.com/kubernetes/helm/cmd/tiller/environment"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"google.golang.org/grpc" "google.golang.org/grpc"
"k8s.io/helm/cmd/tiller/environment"
) )
// rootServer is the root gRPC server. // rootServer is the root gRPC server.
......
...@@ -3,9 +3,9 @@ package main ...@@ -3,9 +3,9 @@ package main
import ( import (
"testing" "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 // These are canary tests to make sure that the default server actually
......
...@@ -73,7 +73,7 @@ elegant and high-quality open source code so that our users will benefit. ...@@ -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: 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 We follow the coding standards and guidelines outlined by the Deis
project: project:
......
name: alpine name: alpine
description: Deploy a basic Alpine Linux pod description: Deploy a basic Alpine Linux pod
version: 0.1.0 version: 0.1.0
home: https://github.com/kubernetes/helm home: https://k8s.io/helm
package: github.com/kubernetes/helm package: k8s.io/helm
import: import:
- package: golang.org/x/net - package: golang.org/x/net
version: fb93926129b8ec0056f2f458b1f519654814edf0 version: fb93926129b8ec0056f2f458b1f519654814edf0
......
...@@ -4,7 +4,8 @@ import ( ...@@ -4,7 +4,8 @@ import (
"io/ioutil" "io/ioutil"
"github.com/ghodss/yaml" "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. // UnmarshalChartfile takes raw Chart.yaml data and unmarshals it.
......
...@@ -3,7 +3,7 @@ package chartutil ...@@ -3,7 +3,7 @@ package chartutil
import ( import (
"testing" "testing"
"github.com/kubernetes/helm/pkg/proto/hapi/chart" "k8s.io/helm/pkg/proto/hapi/chart"
) )
const testfile = "testdata/chartfiletest.yaml" const testfile = "testdata/chartfiletest.yaml"
......
...@@ -22,7 +22,7 @@ For accepting raw compressed tar file data from an io.Reader, the ...@@ -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 'chartutil.LoadArchive()' will read in the data, uncompress it, and unpack it
into a Chart. 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 directly.
*/ */
package chartutil package chartutil
...@@ -13,7 +13,8 @@ import ( ...@@ -13,7 +13,8 @@ import (
"strings" "strings"
"github.com/golang/protobuf/ptypes/any" "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. // Load takes a string name, tries to resolve it to a file or directory, and then loads it.
......
...@@ -3,7 +3,7 @@ package chartutil ...@@ -3,7 +3,7 @@ package chartutil
import ( import (
"testing" "testing"
"github.com/kubernetes/helm/pkg/proto/hapi/chart" "k8s.io/helm/pkg/proto/hapi/chart"
) )
func TestLoadDir(t *testing.T) { func TestLoadDir(t *testing.T) {
......
...@@ -9,7 +9,8 @@ import ( ...@@ -9,7 +9,8 @@ import (
"path/filepath" "path/filepath"
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
"github.com/kubernetes/helm/pkg/proto/hapi/chart"
"k8s.io/helm/pkg/proto/hapi/chart"
) )
var headerBytes = []byte("+aHR0cHM6Ly95b3V0dS5iZS96OVV6MWljandyTQo=") var headerBytes = []byte("+aHR0cHM6Ly95b3V0dS5iZS96OVV6MWljandyTQo=")
......
...@@ -6,7 +6,7 @@ import ( ...@@ -6,7 +6,7 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/kubernetes/helm/pkg/proto/hapi/chart" "k8s.io/helm/pkg/proto/hapi/chart"
) )
func TestSave(t *testing.T) { func TestSave(t *testing.T) {
......
name: alpine name: alpine
description: Deploy a basic Alpine Linux pod description: Deploy a basic Alpine Linux pod
version: 0.1.0 version: 0.1.0
home: https://github.com/kubernetes/helm home: https://k8s.io/helm
...@@ -6,7 +6,8 @@ import ( ...@@ -6,7 +6,8 @@ import (
"text/template" "text/template"
"github.com/Masterminds/sprig" "github.com/Masterminds/sprig"
"github.com/kubernetes/helm/pkg/kube"
"k8s.io/helm/pkg/kube"
) )
// Installer installs tiller into Kubernetes // Installer installs tiller into Kubernetes
......
...@@ -7,8 +7,9 @@ import ( ...@@ -7,8 +7,9 @@ import (
"text/template" "text/template"
"github.com/Masterminds/sprig" "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. // Engine is an implementation of 'cmd/tiller/environment'.Engine that uses Go templates.
......
...@@ -5,8 +5,8 @@ import ( ...@@ -5,8 +5,8 @@ import (
"sync" "sync"
"testing" "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) { func TestEngine(t *testing.T) {
......
...@@ -4,7 +4,7 @@ import ( ...@@ -4,7 +4,7 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
"google.golang.org/grpc" "google.golang.org/grpc"
"github.com/kubernetes/helm/pkg/proto/hapi/services" "k8s.io/helm/pkg/proto/hapi/services"
) )
type client struct { type client struct {
......
...@@ -3,8 +3,8 @@ package helm ...@@ -3,8 +3,8 @@ package helm
import ( import (
"bytes" "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. // ChartToProto converts a chart to its Protobuf struct representation.
......
...@@ -3,8 +3,9 @@ package helm ...@@ -3,8 +3,9 @@ package helm
import ( import (
"testing" "testing"
chartutil "github.com/kubernetes/helm/pkg/chart"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
chartutil "k8s.io/helm/pkg/chart"
) )
func TestInstallReleaseOverrides(t *testing.T) { func TestInstallReleaseOverrides(t *testing.T) {
......
package helm package helm
import ( import (
chartutil "github.com/kubernetes/helm/pkg/chart"
"github.com/kubernetes/helm/pkg/proto/hapi/services"
"golang.org/x/net/context" "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. // Config defines a gRPC client's configuration.
......
name: albatross name: albatross
description: testing chart description: testing chart
version: 0.1.0 version: 0.1.0
home: "https://github.com/kubernetes/helm" home: "https://k8s.io/helm"
package helm package helm
import ( import (
chartutil "github.com/kubernetes/helm/pkg/chart" chartutil "k8s.io/helm/pkg/chart"
) )
// //
......
...@@ -4,7 +4,7 @@ import ( ...@@ -4,7 +4,7 @@ import (
"os" "os"
"path/filepath" "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. // Chartfile checks the Chart.yaml file for errors and warnings.
......
...@@ -2,9 +2,9 @@ package lint ...@@ -2,9 +2,9 @@ package lint
import ( import (
"os" "os"
"github.com/kubernetes/helm/pkg/chart"
"path/filepath" "path/filepath"
"k8s.io/helm/pkg/chart"
) )
// Values lints a chart's values.toml file. // Values lints a chart's values.toml file.
......
...@@ -28,7 +28,7 @@ func (*Maintainer) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{ ...@@ -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. // 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 { type Metadata struct {
// The name of the chart // The name of the chart
Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
......
...@@ -7,8 +7,8 @@ package release ...@@ -7,8 +7,8 @@ package release
import proto "github.com/golang/protobuf/proto" import proto "github.com/golang/protobuf/proto"
import fmt "fmt" import fmt "fmt"
import math "math" 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. // Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal var _ = proto.Marshal
......
...@@ -28,10 +28,10 @@ package services ...@@ -28,10 +28,10 @@ package services
import proto "github.com/golang/protobuf/proto" import proto "github.com/golang/protobuf/proto"
import fmt "fmt" import fmt "fmt"
import math "math" 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 ( import (
context "golang.org/x/net/context" context "golang.org/x/net/context"
......
...@@ -7,7 +7,7 @@ import ( ...@@ -7,7 +7,7 @@ import (
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
"github.com/kubernetes/helm/pkg/chart" "k8s.io/helm/pkg/chart"
) )
var indexPath = "index.yaml" var indexPath = "index.yaml"
......
...@@ -7,7 +7,7 @@ import ( ...@@ -7,7 +7,7 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/kubernetes/helm/pkg/chart" "k8s.io/helm/pkg/chart"
) )
var localRepoPath string var localRepoPath string
......
...@@ -13,7 +13,7 @@ import ( ...@@ -13,7 +13,7 @@ import (
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
"github.com/kubernetes/helm/pkg/chart" "k8s.io/helm/pkg/chart"
) )
// ChartRepository represents a chart repository // ChartRepository represents a chart repository
......
...@@ -4,7 +4,7 @@ import ( ...@@ -4,7 +4,7 @@ import (
"errors" "errors"
"sync" "sync"
"github.com/kubernetes/helm/pkg/proto/hapi/release" "k8s.io/helm/pkg/proto/hapi/release"
) )
// Memory is an in-memory ReleaseStorage implementation. // Memory is an in-memory ReleaseStorage implementation.
......
...@@ -3,7 +3,7 @@ package storage ...@@ -3,7 +3,7 @@ package storage
import ( import (
"testing" "testing"
"github.com/kubernetes/helm/pkg/proto/hapi/release" "k8s.io/helm/pkg/proto/hapi/release"
) )
func TestCreate(t *testing.T) { func TestCreate(t *testing.T) {
......
...@@ -14,7 +14,7 @@ BINARY_VERSION ?= ${GIT_TAG}+${GIT_SHA} ...@@ -14,7 +14,7 @@ BINARY_VERSION ?= ${GIT_TAG}+${GIT_SHA}
IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${SHORT_NAME}:${DOCKER_VERSION} IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${SHORT_NAME}:${DOCKER_VERSION}
MUTABLE_IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${SHORT_NAME}:${MUTABLE_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 DOCKER_PUSH = docker push
ifeq ($(DOCKER_REGISTRY),gcr.io) ifeq ($(DOCKER_REGISTRY),gcr.io)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment