Merge pull request #5440 from adamreese/v3/vanity

feat(*): use vanity import helm.sh/helm
pull/5457/head
Adam Reese 6 years ago committed by GitHub
commit 842bd0d2d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1,7 +1,7 @@
version: 2
jobs:
build:
working_directory: /go/src/k8s.io/helm
working_directory: /go/src/helm.sh/helm
parallelism: 3
docker:
- image: circleci/golang:1.12
@ -13,14 +13,14 @@ jobs:
- restore_cache:
key: gopkg-{{ .Branch }}-{{ checksum "Gopkg.lock" }}
paths:
- /go/src/k8s.io/helm/vendor
- /go/src/helm.sh/helm/vendor
- run:
name: install dependencies
command: .circleci/bootstrap.sh
- save_cache:
key: gopkg-{{ .Branch }}-{{ checksum "Gopkg.lock" }}
paths:
- /go/src/k8s.io/helm/vendor
- /go/src/helm.sh/helm/vendor
- restore_cache:
keys:
- build-cache-{{ .Branch }}-{{ .Environment.CIRCLE_PREVIOUS_BUILD_NUM }}

@ -22,6 +22,6 @@ linters-settings:
gofmt:
simplify: true
goimports:
local-prefixes: k8s.io/helm
local-prefixes: helm.sh/helm
dupl:
threshold: 400

@ -33,15 +33,15 @@ BINARY_VERSION ?= ${GIT_TAG}
# Only set Version if building a tag or VERSION is set
ifneq ($(BINARY_VERSION),)
LDFLAGS += -X k8s.io/helm/internal/version.version=${BINARY_VERSION}
LDFLAGS += -X helm.sh/helm/internal/version.version=${BINARY_VERSION}
endif
# Clear the "unreleased" string in BuildMetadata
ifneq ($(GIT_TAG),)
LDFLAGS += -X k8s.io/helm/internal/version.metadata=
LDFLAGS += -X helm.sh/helm/internal/version.metadata=
endif
LDFLAGS += -X k8s.io/helm/internal/version.gitCommit=${GIT_COMMIT}
LDFLAGS += -X k8s.io/helm/internal/version.gitTreeState=${GIT_DIRTY}
LDFLAGS += -X helm.sh/helm/internal/version.gitCommit=${GIT_COMMIT}
LDFLAGS += -X helm.sh/helm/internal/version.gitTreeState=${GIT_DIRTY}
.PHONY: all
all: build
@ -53,7 +53,7 @@ all: build
build: $(BINDIR)/$(BINNAME)
$(BINDIR)/$(BINNAME): $(SRC) vendor
go build $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' -o $(BINDIR)/$(BINNAME) k8s.io/helm/cmd/helm
go build $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' -o $(BINDIR)/$(BINNAME) helm.sh/helm/cmd/helm
# ------------------------------------------------------------------------------
# test
@ -85,7 +85,7 @@ coverage:
.PHONY: format
format: $(GOIMPORTS)
go list -f '{{.Dir}}' ./... | xargs $(GOIMPORTS) -w -local k8s.io/helm
go list -f '{{.Dir}}' ./... | xargs $(GOIMPORTS) -w -local helm.sh/helm
# ------------------------------------------------------------------------------
# dependencies
@ -122,7 +122,7 @@ Gopkg.toml: $(DEP)
build-cross: LDFLAGS += -extldflags "-static"
build-cross: vendor
build-cross: $(GOX)
CGO_ENABLED=0 $(GOX) -parallel=3 -output="_dist/{{.OS}}-{{.Arch}}/$(BINNAME)" -osarch='$(TARGETS)' $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' k8s.io/helm/cmd/helm
CGO_ENABLED=0 $(GOX) -parallel=3 -output="_dist/{{.OS}}-{{.Arch}}/$(BINNAME)" -osarch='$(TARGETS)' $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' helm.sh/helm/cmd/helm
.PHONY: dist
dist:

@ -2,7 +2,7 @@
[![CircleCI](https://circleci.com/gh/helm/helm.svg?style=shield)](https://circleci.com/gh/helm/helm)
[![Go Report Card](https://goreportcard.com/badge/github.com/helm/helm)](https://goreportcard.com/report/github.com/helm/helm)
[![GoDoc](https://godoc.org/k8s.io/helm?status.svg)](https://godoc.org/k8s.io/helm)
[![GoDoc](https://godoc.org/helm.sh/helm?status.svg)](https://godoc.org/helm.sh/helm)
Helm is a tool for managing Charts. Charts are packages of pre-configured Kubernetes resources.

@ -21,7 +21,7 @@ import (
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"k8s.io/helm/pkg/action"
"helm.sh/helm/pkg/action"
)
const chartHelp = `

@ -21,8 +21,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/pkg/action"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/action"
)
const chartExportDesc = `

@ -21,7 +21,7 @@ import (
"github.com/spf13/cobra"
"k8s.io/helm/pkg/action"
"helm.sh/helm/pkg/action"
)
const chartListDesc = `

@ -21,8 +21,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/pkg/action"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/action"
)
const chartPullDesc = `

@ -21,8 +21,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/pkg/action"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/action"
)
const chartPushDesc = `

@ -21,8 +21,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/pkg/action"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/action"
)
const chartRemoveDesc = `

@ -21,8 +21,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/pkg/action"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/action"
)
const chartSaveDesc = `

@ -23,9 +23,9 @@ import (
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/pkg/chart"
"k8s.io/helm/pkg/chartutil"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/chart"
"helm.sh/helm/pkg/chartutil"
)
const createDesc = `

@ -23,9 +23,9 @@ import (
"path/filepath"
"testing"
"k8s.io/helm/pkg/chart"
"k8s.io/helm/pkg/chart/loader"
"k8s.io/helm/pkg/chartutil"
"helm.sh/helm/pkg/chart"
"helm.sh/helm/pkg/chart/loader"
"helm.sh/helm/pkg/chartutil"
)
func TestCreateCmd(t *testing.T) {

@ -21,8 +21,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/pkg/action"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/action"
)
const dependencyDesc = `

@ -23,10 +23,10 @@ import (
"github.com/spf13/cobra"
"k8s.io/client-go/util/homedir"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/pkg/action"
"k8s.io/helm/pkg/downloader"
"k8s.io/helm/pkg/getter"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/action"
"helm.sh/helm/pkg/downloader"
"helm.sh/helm/pkg/getter"
)
const dependencyBuildDesc = `

@ -21,9 +21,9 @@ import (
"strings"
"testing"
"k8s.io/helm/pkg/provenance"
"k8s.io/helm/pkg/repo"
"k8s.io/helm/pkg/repo/repotest"
"helm.sh/helm/pkg/provenance"
"helm.sh/helm/pkg/repo"
"helm.sh/helm/pkg/repo/repotest"
)
func TestDependencyBuildCmd(t *testing.T) {

@ -21,10 +21,10 @@ import (
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/pkg/action"
"k8s.io/helm/pkg/downloader"
"k8s.io/helm/pkg/getter"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/action"
"helm.sh/helm/pkg/downloader"
"helm.sh/helm/pkg/getter"
)
const dependencyUpDesc = `

@ -23,11 +23,11 @@ import (
"strings"
"testing"
"k8s.io/helm/pkg/chart"
"k8s.io/helm/pkg/chartutil"
"k8s.io/helm/pkg/provenance"
"k8s.io/helm/pkg/repo"
"k8s.io/helm/pkg/repo/repotest"
"helm.sh/helm/pkg/chart"
"helm.sh/helm/pkg/chartutil"
"helm.sh/helm/pkg/provenance"
"helm.sh/helm/pkg/repo"
"helm.sh/helm/pkg/repo/repotest"
)
func TestDependencyUpdateCmd(t *testing.T) {

@ -23,7 +23,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/cobra/doc"
"k8s.io/helm/cmd/helm/require"
"helm.sh/helm/cmd/helm/require"
)
const docsDesc = `

@ -21,8 +21,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/pkg/action"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/action"
)
var getHelp = `

@ -22,8 +22,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/pkg/action"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/action"
)
const getHooksHelp = `

@ -19,7 +19,7 @@ package main
import (
"testing"
"k8s.io/helm/pkg/release"
"helm.sh/helm/pkg/release"
)
func TestGetHooks(t *testing.T) {

@ -22,8 +22,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/pkg/action"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/action"
)
var getManifestHelp = `

@ -19,7 +19,7 @@ package main
import (
"testing"
"k8s.io/helm/pkg/release"
"helm.sh/helm/pkg/release"
)
func TestGetManifest(t *testing.T) {

@ -19,7 +19,7 @@ package main
import (
"testing"
"k8s.io/helm/pkg/release"
"helm.sh/helm/pkg/release"
)
func TestGetCmd(t *testing.T) {

@ -22,8 +22,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/pkg/action"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/action"
)
var getValuesHelp = `

@ -19,7 +19,7 @@ package main
import (
"testing"
"k8s.io/helm/pkg/release"
"helm.sh/helm/pkg/release"
)
func TestGetValuesCmd(t *testing.T) {

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package main // import "k8s.io/helm/cmd/helm"
package main // import "helm.sh/helm/cmd/helm"
import (
"fmt"
@ -26,11 +26,11 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions"
_ "k8s.io/client-go/plugin/pkg/client/auth"
"k8s.io/helm/pkg/action"
"k8s.io/helm/pkg/cli"
"k8s.io/helm/pkg/kube"
"k8s.io/helm/pkg/storage"
"k8s.io/helm/pkg/storage/driver"
"helm.sh/helm/pkg/action"
"helm.sh/helm/pkg/cli"
"helm.sh/helm/pkg/kube"
"helm.sh/helm/pkg/storage"
"helm.sh/helm/pkg/storage/driver"
)
var (

@ -28,14 +28,14 @@ import (
"github.com/spf13/cobra"
"k8s.io/client-go/kubernetes/fake"
"k8s.io/helm/internal/test"
"k8s.io/helm/pkg/action"
"k8s.io/helm/pkg/helmpath"
"k8s.io/helm/pkg/kube"
"k8s.io/helm/pkg/release"
"k8s.io/helm/pkg/repo"
"k8s.io/helm/pkg/storage"
"k8s.io/helm/pkg/storage/driver"
"helm.sh/helm/internal/test"
"helm.sh/helm/pkg/action"
"helm.sh/helm/pkg/helmpath"
"helm.sh/helm/pkg/kube"
"helm.sh/helm/pkg/release"
"helm.sh/helm/pkg/repo"
"helm.sh/helm/pkg/storage"
"helm.sh/helm/pkg/storage/driver"
)
func testTimestamper() time.Time { return time.Unix(242085845, 0).UTC() }

@ -22,8 +22,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/pkg/action"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/action"
)
var historyHelp = `

@ -19,7 +19,7 @@ package main
import (
"testing"
"k8s.io/helm/pkg/release"
"helm.sh/helm/pkg/release"
)
func TestHistoryCmd(t *testing.T) {

@ -22,7 +22,7 @@ import (
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/require"
"helm.sh/helm/cmd/helm/require"
)
var longHomeHelp = `

@ -27,12 +27,12 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/pkg/getter"
"k8s.io/helm/pkg/helmpath"
"k8s.io/helm/pkg/plugin"
"k8s.io/helm/pkg/plugin/installer"
"k8s.io/helm/pkg/repo"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/getter"
"helm.sh/helm/pkg/helmpath"
"helm.sh/helm/pkg/plugin"
"helm.sh/helm/pkg/plugin/installer"
"helm.sh/helm/pkg/repo"
)
const initDesc = `

@ -21,7 +21,7 @@ import (
"os"
"testing"
"k8s.io/helm/pkg/helmpath"
"helm.sh/helm/pkg/helmpath"
)
const testPluginsFile = "testdata/plugins.yaml"

@ -19,17 +19,17 @@ package main
import (
"io"
"k8s.io/helm/pkg/release"
"helm.sh/helm/pkg/release"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/pkg/action"
"k8s.io/helm/pkg/chart/loader"
"k8s.io/helm/pkg/chartutil"
"k8s.io/helm/pkg/downloader"
"k8s.io/helm/pkg/getter"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/action"
"helm.sh/helm/pkg/chart/loader"
"helm.sh/helm/pkg/chartutil"
"helm.sh/helm/pkg/downloader"
"helm.sh/helm/pkg/getter"
)
const installDesc = `

@ -24,7 +24,7 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"k8s.io/helm/pkg/action"
"helm.sh/helm/pkg/action"
)
var longLintHelp = `

@ -22,8 +22,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/pkg/action"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/action"
)
var listHelp = `

@ -26,7 +26,7 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"k8s.io/helm/pkg/plugin"
"helm.sh/helm/pkg/plugin"
)
// loadPlugins loads plugins into the command list.

@ -22,13 +22,13 @@ import (
"io/ioutil"
"path/filepath"
"k8s.io/helm/pkg/action"
"helm.sh/helm/pkg/action"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"k8s.io/helm/pkg/downloader"
"k8s.io/helm/pkg/getter"
"helm.sh/helm/pkg/downloader"
"helm.sh/helm/pkg/getter"
)
const packageDesc = `

@ -28,10 +28,10 @@ import (
"github.com/spf13/cobra"
"k8s.io/helm/pkg/chart"
"k8s.io/helm/pkg/chart/loader"
"k8s.io/helm/pkg/chartutil"
"k8s.io/helm/pkg/helmpath"
"helm.sh/helm/pkg/chart"
"helm.sh/helm/pkg/chart/loader"
"helm.sh/helm/pkg/chartutil"
"helm.sh/helm/pkg/helmpath"
)
func TestPackage(t *testing.T) {

@ -23,7 +23,7 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"k8s.io/helm/pkg/plugin"
"helm.sh/helm/pkg/plugin"
)
const pluginHelp = `

@ -21,10 +21,10 @@ import (
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/pkg/helmpath"
"k8s.io/helm/pkg/plugin"
"k8s.io/helm/pkg/plugin/installer"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/helmpath"
"helm.sh/helm/pkg/plugin"
"helm.sh/helm/pkg/plugin/installer"
)
type pluginInstallOptions struct {

@ -22,7 +22,7 @@ import (
"github.com/gosuri/uitable"
"github.com/spf13/cobra"
"k8s.io/helm/pkg/helmpath"
"helm.sh/helm/pkg/helmpath"
)
type pluginListOptions struct {

@ -24,8 +24,8 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"k8s.io/helm/pkg/helmpath"
"k8s.io/helm/pkg/plugin"
"helm.sh/helm/pkg/helmpath"
"helm.sh/helm/pkg/plugin"
)
type pluginRemoveOptions struct {

@ -25,8 +25,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/helm/pkg/helmpath"
"k8s.io/helm/pkg/plugin"
"helm.sh/helm/pkg/helmpath"
"helm.sh/helm/pkg/plugin"
)
func TestManuallyProcessArgs(t *testing.T) {

@ -24,9 +24,9 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"k8s.io/helm/pkg/helmpath"
"k8s.io/helm/pkg/plugin"
"k8s.io/helm/pkg/plugin/installer"
"helm.sh/helm/pkg/helmpath"
"helm.sh/helm/pkg/plugin"
"helm.sh/helm/pkg/plugin/installer"
)
type pluginUpdateOptions struct {

@ -23,8 +23,8 @@ import (
"github.com/ghodss/yaml"
"k8s.io/helm/pkg/chartutil"
"k8s.io/helm/pkg/release"
"helm.sh/helm/pkg/chartutil"
"helm.sh/helm/pkg/release"
)
var printReleaseTemplate = `REVISION: {{.Release.Version}}

@ -22,8 +22,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/pkg/action"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/action"
)
const pullDesc = `

@ -24,7 +24,7 @@ import (
"strings"
"testing"
"k8s.io/helm/pkg/repo/repotest"
"helm.sh/helm/pkg/repo/repotest"
)
func TestPullCmd(t *testing.T) {

@ -23,9 +23,9 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/pkg/action"
"k8s.io/helm/pkg/release"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/action"
"helm.sh/helm/pkg/release"
)
const releaseTestDesc = `

@ -20,7 +20,7 @@ import (
"testing"
"time"
"k8s.io/helm/pkg/release"
"helm.sh/helm/pkg/release"
)
func TestReleaseTesting(t *testing.T) {

@ -21,7 +21,7 @@ import (
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/require"
"helm.sh/helm/cmd/helm/require"
)
var repoHelm = `

@ -23,10 +23,10 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/pkg/getter"
"k8s.io/helm/pkg/helmpath"
"k8s.io/helm/pkg/repo"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/getter"
"helm.sh/helm/pkg/helmpath"
"helm.sh/helm/pkg/repo"
)
type repoAddOptions struct {

@ -21,8 +21,8 @@ import (
"os"
"testing"
"k8s.io/helm/pkg/repo"
"k8s.io/helm/pkg/repo/repotest"
"helm.sh/helm/pkg/repo"
"helm.sh/helm/pkg/repo/repotest"
)
func TestRepoAddCmd(t *testing.T) {

@ -24,8 +24,8 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/pkg/repo"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/repo"
)
const repoIndexDesc = `

@ -23,7 +23,7 @@ import (
"path/filepath"
"testing"
"k8s.io/helm/pkg/repo"
"helm.sh/helm/pkg/repo"
)
func TestRepoIndexCmd(t *testing.T) {

@ -24,9 +24,9 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/pkg/helmpath"
"k8s.io/helm/pkg/repo"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/helmpath"
"helm.sh/helm/pkg/repo"
)
type repoListOptions struct {

@ -24,9 +24,9 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/pkg/helmpath"
"k8s.io/helm/pkg/repo"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/helmpath"
"helm.sh/helm/pkg/repo"
)
type repoRemoveOptions struct {

@ -22,8 +22,8 @@ import (
"strings"
"testing"
"k8s.io/helm/pkg/repo"
"k8s.io/helm/pkg/repo/repotest"
"helm.sh/helm/pkg/repo"
"helm.sh/helm/pkg/repo/repotest"
)
func TestRepoRemove(t *testing.T) {

@ -24,10 +24,10 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/pkg/getter"
"k8s.io/helm/pkg/helmpath"
"k8s.io/helm/pkg/repo"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/getter"
"helm.sh/helm/pkg/helmpath"
"helm.sh/helm/pkg/repo"
)
const updateDesc = `

@ -23,10 +23,10 @@ import (
"strings"
"testing"
"k8s.io/helm/pkg/getter"
"k8s.io/helm/pkg/helmpath"
"k8s.io/helm/pkg/repo"
"k8s.io/helm/pkg/repo/repotest"
"helm.sh/helm/pkg/getter"
"helm.sh/helm/pkg/helmpath"
"helm.sh/helm/pkg/repo"
"helm.sh/helm/pkg/repo/repotest"
)
func TestUpdateCmd(t *testing.T) {

@ -22,8 +22,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/pkg/action"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/action"
)
const rollbackDesc = `

@ -19,8 +19,8 @@ package main
import (
"testing"
"k8s.io/helm/pkg/chart"
"k8s.io/helm/pkg/release"
"helm.sh/helm/pkg/chart"
"helm.sh/helm/pkg/release"
)
func TestRollbackCmd(t *testing.T) {

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package main // import "k8s.io/helm/cmd/helm"
package main // import "helm.sh/helm/cmd/helm"
import (
"io"
@ -22,9 +22,9 @@ import (
"github.com/containerd/containerd/remotes/docker"
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/pkg/action"
"k8s.io/helm/pkg/registry"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/action"
"helm.sh/helm/pkg/registry"
)
var globalUsage = `The Kubernetes package manager

@ -26,9 +26,9 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/search"
"k8s.io/helm/pkg/helmpath"
"k8s.io/helm/pkg/repo"
"helm.sh/helm/cmd/helm/search"
"helm.sh/helm/pkg/helmpath"
"helm.sh/helm/pkg/repo"
)
const searchDesc = `

@ -31,7 +31,7 @@ import (
"github.com/Masterminds/semver"
"github.com/pkg/errors"
"k8s.io/helm/pkg/repo"
"helm.sh/helm/pkg/repo"
)
// Result is a search result.

@ -20,8 +20,8 @@ import (
"strings"
"testing"
"k8s.io/helm/pkg/chart"
"k8s.io/helm/pkg/repo"
"helm.sh/helm/pkg/chart"
"helm.sh/helm/pkg/repo"
)
func TestSortScore(t *testing.T) {

@ -22,8 +22,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/pkg/action"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/action"
)
const showDesc = `

@ -24,8 +24,8 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/pkg/action"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/action"
)
var statusHelp = `

@ -20,9 +20,9 @@ import (
"testing"
"time"
"k8s.io/helm/pkg/chart"
"helm.sh/helm/pkg/chart"
"k8s.io/helm/pkg/release"
"helm.sh/helm/pkg/release"
)
func TestStatusCmd(t *testing.T) {

@ -25,11 +25,11 @@ import (
"github.com/spf13/cobra"
"k8s.io/client-go/kubernetes/fake"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/pkg/action"
"k8s.io/helm/pkg/kube"
"k8s.io/helm/pkg/storage"
"k8s.io/helm/pkg/storage/driver"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/action"
"helm.sh/helm/pkg/kube"
"helm.sh/helm/pkg/storage"
"helm.sh/helm/pkg/storage/driver"
)
const templateDesc = `

@ -4,7 +4,7 @@ entries:
- name: alpine
url: https://kubernetes-charts.storage.googleapis.com/alpine-0.1.0.tgz
checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d
home: https://k8s.io/helm
home: https://helm.sh/helm
sources:
- https://github.com/helm/helm
version: 0.1.0
@ -16,7 +16,7 @@ entries:
- name: alpine
url: https://kubernetes-charts.storage.googleapis.com/alpine-0.2.0.tgz
checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d
home: https://k8s.io/helm
home: https://helm.sh/helm
sources:
- https://github.com/helm/helm
version: 0.2.0

@ -1,5 +1,5 @@
description: Deploy a basic Alpine Linux pod
home: https://k8s.io/helm
home: https://helm.sh/helm
name: alpine
sources:
- https://github.com/helm/helm

@ -1,5 +1,5 @@
description: Deploy a basic Alpine Linux pod
home: https://k8s.io/helm
home: https://helm.sh/helm
name: chart-bad-type
sources:
- https://github.com/helm/helm

@ -1,5 +1,5 @@
description: Empty testing chart
home: https://k8s.io/helm
home: https://helm.sh/helm
name: empty
sources:
- https://github.com/helm/helm

@ -1,5 +1,5 @@
description: Deploy a basic Alpine Linux pod
home: https://k8s.io/helm
home: https://helm.sh/helm
name: alpine
sources:
- https://github.com/helm/helm

@ -1,5 +1,5 @@
description: Deploy a basic Alpine Linux pod
home: https://k8s.io/helm
home: https://helm.sh/helm
name: novals
sources:
- https://github.com/helm/helm

@ -1,5 +1,5 @@
description: Deploy a basic Alpine Linux pod
home: https://k8s.io/helm
home: https://helm.sh/helm
name: alpine
sources:
- https://github.com/helm/helm

@ -22,8 +22,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/pkg/action"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/action"
)
const uninstallDesc = `

@ -19,7 +19,7 @@ package main
import (
"testing"
"k8s.io/helm/pkg/release"
"helm.sh/helm/pkg/release"
)
func TestUninstall(t *testing.T) {

@ -23,10 +23,10 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/pkg/action"
"k8s.io/helm/pkg/chart/loader"
"k8s.io/helm/pkg/storage/driver"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/action"
"helm.sh/helm/pkg/chart/loader"
"helm.sh/helm/pkg/storage/driver"
)
const upgradeDesc = `

@ -20,10 +20,10 @@ import (
"fmt"
"testing"
"k8s.io/helm/pkg/chart"
"k8s.io/helm/pkg/chart/loader"
"k8s.io/helm/pkg/chartutil"
"k8s.io/helm/pkg/release"
"helm.sh/helm/pkg/chart"
"helm.sh/helm/pkg/chart/loader"
"helm.sh/helm/pkg/chartutil"
"helm.sh/helm/pkg/release"
)
func TestUpgradeCmd(t *testing.T) {

@ -20,8 +20,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/pkg/action"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/pkg/action"
)
const verifyDesc = `

@ -23,8 +23,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/helm/cmd/helm/require"
"k8s.io/helm/internal/version"
"helm.sh/helm/cmd/helm/require"
"helm.sh/helm/internal/version"
)
const versionDesc = `

@ -75,7 +75,7 @@ entries:
- created: 2016-10-06T16:23:20.499814565-06:00
description: Deploy a basic Alpine Linux pod
digest: 99c76e403d752c84ead610644d4b1c2f2b453a74b921f422b9dcb8a7c8b559cd
home: https://k8s.io/helm
home: https://helm.sh/helm
name: alpine
sources:
- https://github.com/helm/helm
@ -85,7 +85,7 @@ entries:
- created: 2016-10-06T16:23:20.499543808-06:00
description: Deploy a basic Alpine Linux pod
digest: 515c58e5f79d8b2913a10cb400ebb6fa9c77fe813287afbacf1a0b897cd78727
home: https://k8s.io/helm
home: https://helm.sh/helm
name: alpine
sources:
- https://github.com/helm/helm
@ -96,7 +96,7 @@ entries:
- created: 2016-10-06T16:23:20.499543808-06:00
description: Create a basic nginx HTTP server
digest: aaff4545f79d8b2913a10cb400ebb6fa9c77fe813287afbacf1a0b897cdffffff
home: https://k8s.io/helm
home: https://helm.sh/helm
name: nginx
sources:
- https://github.com/helm/charts

@ -29,7 +29,7 @@ Upload the contents of the directory to your GCS bucket by running `scripts/sync
For example:
```console
$ pwd
/Users/me/code/go/src/k8s.io/helm
/Users/me/code/go/src/helm.sh/helm
$ scripts/sync-repo.sh fantastic-charts/ fantastic-charts
Getting ready to sync your local directory (fantastic-charts/) to a remote repository at gs://fantastic-charts
Verifying Prerequisites....

@ -94,7 +94,7 @@ Initially, this looks good. But if we run it through the template engine, we'll
```console
$ helm install --dry-run --debug ./mychart
SERVER: "localhost:44134"
CHART PATH: /Users/mattbutcher/Code/Go/src/k8s.io/helm/_scratch/mychart
CHART PATH: /Users/mattbutcher/Code/Go/src/helm.sh/helm/_scratch/mychart
Error: YAML parse error on mychart/templates/configmap.yaml: error converting YAML to JSON: yaml: line 9: did not find expected key
```

@ -192,7 +192,7 @@ At this point, we've seen templates at their most basic: YAML files that have te
```console
$ helm install --debug --dry-run ./mychart
SERVER: "localhost:44134"
CHART PATH: /Users/mattbutcher/Code/Go/src/k8s.io/helm/_scratch/mychart
CHART PATH: /Users/mattbutcher/Code/Go/src/helm.sh/helm/_scratch/mychart
NAME: goodly-guppy
TARGET NAMESPACE: default
CHART: mychart 0.1.0

@ -48,7 +48,7 @@ Because every subchart is a _stand-alone chart_, we can test `mysubchart` on its
```console
$ helm install --dry-run --debug mychart/charts/mysubchart
SERVER: "localhost:44134"
CHART PATH: /Users/mattbutcher/Code/Go/src/k8s.io/helm/_scratch/mychart/charts/mysubchart
CHART PATH: /Users/mattbutcher/Code/Go/src/helm.sh/helm/_scratch/mychart/charts/mysubchart
NAME: newbie-elk
TARGET NAMESPACE: default
CHART: mysubchart 0.1.0

@ -36,7 +36,7 @@ Let's see how this renders.
```console
$ helm install --dry-run --debug ./mychart
SERVER: "localhost:44134"
CHART PATH: /Users/mattbutcher/Code/Go/src/k8s.io/helm/_scratch/mychart
CHART PATH: /Users/mattbutcher/Code/Go/src/helm.sh/helm/_scratch/mychart
NAME: geared-marsupi
TARGET NAMESPACE: default
CHART: mychart 0.1.0
@ -57,7 +57,7 @@ Because `favoriteDrink` is set in the default `values.yaml` file to `coffee`, th
```
helm install --dry-run --debug --set favoriteDrink=slurm ./mychart
SERVER: "localhost:44134"
CHART PATH: /Users/mattbutcher/Code/Go/src/k8s.io/helm/_scratch/mychart
CHART PATH: /Users/mattbutcher/Code/Go/src/helm.sh/helm/_scratch/mychart
NAME: solid-vulture
TARGET NAMESPACE: default
CHART: mychart 0.1.0

@ -18,7 +18,7 @@ We use Make to build our programs. The simplest way to get started is:
$ make bootstrap build
```
NOTE: This will fail if not running from the path `$GOPATH/src/k8s.io/helm`. The
NOTE: This will fail if not running from the path `$GOPATH/src/helm.sh/helm`. The
directory `k8s.io` should not be a symlink or `build` will not find the relevant
packages.
@ -41,7 +41,7 @@ To expose the Helm man pages to your `man` client, you can put the files in your
`$MANPATH`:
```
$ export MANPATH=$GOPATH/src/k8s.io/helm/docs/man:$MANPATH
$ export MANPATH=$GOPATH/src/helm.sh/helm/docs/man:$MANPATH
$ man helm
```
@ -101,7 +101,7 @@ workflow for doing this is as follows:
1. Go to your `$GOPATH/src/k8s.io` directory and `git clone` the
`github.com/helm/helm` repository.
2. Fork that repository into your GitHub account
3. Add your repository as a remote for `$GOPATH/src/k8s.io/helm`
3. Add your repository as a remote for `$GOPATH/src/helm.sh/helm`
4. Create a new working branch (`git checkout -b feat/my-feature`) and
do your work on that branch.
5. When you are ready for us to review, push your branch to GitHub, and

@ -92,7 +92,7 @@ simplest, it takes only one argument: The name of the chart.
```
$ helm install stable/mariadb
Fetched stable/mariadb-0.3.0 to /Users/mattbutcher/Code/Go/src/k8s.io/helm/mariadb-0.3.0.tgz
Fetched stable/mariadb-0.3.0 to /Users/mattbutcher/Code/Go/src/helm.sh/helm/mariadb-0.3.0.tgz
happy-panda
Last Deployed: Wed Sep 28 12:32:28 2016
Namespace: default
@ -180,7 +180,7 @@ values`:
```console
helm inspect values stable/mariadb
Fetched stable/mariadb-0.3.0.tgz to /Users/mattbutcher/Code/Go/src/k8s.io/helm/mariadb-0.3.0.tgz
Fetched stable/mariadb-0.3.0.tgz to /Users/mattbutcher/Code/Go/src/helm.sh/helm/mariadb-0.3.0.tgz
## Bitnami MariaDB image version
## ref: https://hub.docker.com/r/bitnami/mariadb/tags/
##
@ -325,7 +325,7 @@ update things that have changed since the last release.
```console
$ helm upgrade -f panda.yaml happy-panda stable/mariadb
Fetched stable/mariadb-0.3.0.tgz to /Users/mattbutcher/Code/Go/src/k8s.io/helm/mariadb-0.3.0.tgz
Fetched stable/mariadb-0.3.0.tgz to /Users/mattbutcher/Code/Go/src/helm.sh/helm/mariadb-0.3.0.tgz
happy-panda has been upgraded. Happy Helming!
Last Deployed: Wed Sep 28 12:47:54 2016
Namespace: default

@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package version // import "k8s.io/helm/internal/version"
package version // import "helm.sh/helm/internal/version"
import (
hversion "k8s.io/helm/pkg/version"
hversion "helm.sh/helm/pkg/version"
)
var (

@ -24,11 +24,11 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/discovery"
"k8s.io/helm/pkg/chartutil"
"k8s.io/helm/pkg/kube"
"k8s.io/helm/pkg/registry"
"k8s.io/helm/pkg/release"
"k8s.io/helm/pkg/storage"
"helm.sh/helm/pkg/chartutil"
"helm.sh/helm/pkg/kube"
"helm.sh/helm/pkg/registry"
"helm.sh/helm/pkg/release"
"helm.sh/helm/pkg/storage"
)
// Timestamper is a function capable of producing a timestamp.Timestamper.

@ -25,11 +25,11 @@ import (
"github.com/pkg/errors"
"k8s.io/client-go/kubernetes/fake"
"k8s.io/helm/pkg/chart"
"k8s.io/helm/pkg/kube"
"k8s.io/helm/pkg/release"
"k8s.io/helm/pkg/storage"
"k8s.io/helm/pkg/storage/driver"
"helm.sh/helm/pkg/chart"
"helm.sh/helm/pkg/kube"
"helm.sh/helm/pkg/release"
"helm.sh/helm/pkg/storage"
"helm.sh/helm/pkg/storage/driver"
)
var verbose = flag.Bool("test.log", false, "enable test logging")

@ -20,8 +20,8 @@ import (
"fmt"
"io"
"k8s.io/helm/pkg/chartutil"
"k8s.io/helm/pkg/registry"
"helm.sh/helm/pkg/chartutil"
"helm.sh/helm/pkg/registry"
)
// ChartExport performs a chart export operation.

@ -19,7 +19,7 @@ package action
import (
"io"
"k8s.io/helm/pkg/registry"
"helm.sh/helm/pkg/registry"
)
// ChartPull performs a chart pull operation.

@ -19,7 +19,7 @@ package action
import (
"io"
"k8s.io/helm/pkg/registry"
"helm.sh/helm/pkg/registry"
)
// ChartPush performs a chart push operation.

@ -19,7 +19,7 @@ package action
import (
"io"
"k8s.io/helm/pkg/registry"
"helm.sh/helm/pkg/registry"
)
// ChartRemove performs a chart remove operation.

@ -20,8 +20,8 @@ import (
"io"
"path/filepath"
"k8s.io/helm/pkg/chart/loader"
"k8s.io/helm/pkg/registry"
"helm.sh/helm/pkg/chart/loader"
"helm.sh/helm/pkg/registry"
)
// ChartSave performs a chart save operation.

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save