Skip to content

Commit

Permalink
feat(*): use vanity import helm.sh/helm
Browse files Browse the repository at this point in the history
Signed-off-by: Adam Reese <adam@reese.io>
  • Loading branch information
adamreese committed Mar 13, 2019
1 parent e509416 commit 895e919
Show file tree
Hide file tree
Showing 248 changed files with 522 additions and 522 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ linters-settings:
gofmt:
simplify: true
goimports:
local-prefixes: k8s.io/helm
local-prefixes: helm.sh/helm
dupl:
threshold: 400
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion cmd/helm/chart.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 = `
Expand Down
4 changes: 2 additions & 2 deletions cmd/helm/chart_export.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 = `
Expand Down
2 changes: 1 addition & 1 deletion cmd/helm/chart_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

"github.com/spf13/cobra"

"k8s.io/helm/pkg/action"
"helm.sh/helm/pkg/action"
)

const chartListDesc = `
Expand Down
4 changes: 2 additions & 2 deletions cmd/helm/chart_pull.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 = `
Expand Down
4 changes: 2 additions & 2 deletions cmd/helm/chart_push.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 = `
Expand Down
4 changes: 2 additions & 2 deletions cmd/helm/chart_remove.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 = `
Expand Down
4 changes: 2 additions & 2 deletions cmd/helm/chart_save.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 = `
Expand Down
6 changes: 3 additions & 3 deletions cmd/helm/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 = `
Expand Down
6 changes: 3 additions & 3 deletions cmd/helm/create_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/helm/dependency.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 = `
Expand Down
8 changes: 4 additions & 4 deletions cmd/helm/dependency_build.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 = `
Expand Down
6 changes: 3 additions & 3 deletions cmd/helm/dependency_build_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
8 changes: 4 additions & 4 deletions cmd/helm/dependency_update.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 = `
Expand Down
10 changes: 5 additions & 5 deletions cmd/helm/dependency_update_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/helm/docs.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 = `
Expand Down
4 changes: 2 additions & 2 deletions cmd/helm/get.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 = `
Expand Down
4 changes: 2 additions & 2 deletions cmd/helm/get_hooks.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 = `
Expand Down
2 changes: 1 addition & 1 deletion cmd/helm/get_hooks_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package main
import (
"testing"

"k8s.io/helm/pkg/release"
"helm.sh/helm/pkg/release"
)

func TestGetHooks(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/helm/get_manifest.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 = `
Expand Down
2 changes: 1 addition & 1 deletion cmd/helm/get_manifest_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package main
import (
"testing"

"k8s.io/helm/pkg/release"
"helm.sh/helm/pkg/release"
)

func TestGetManifest(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/helm/get_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package main
import (
"testing"

"k8s.io/helm/pkg/release"
"helm.sh/helm/pkg/release"
)

func TestGetCmd(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/helm/get_values.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 = `
Expand Down
2 changes: 1 addition & 1 deletion cmd/helm/get_values_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package main
import (
"testing"

"k8s.io/helm/pkg/release"
"helm.sh/helm/pkg/release"
)

func TestGetValuesCmd(t *testing.T) {
Expand Down
12 changes: 6 additions & 6 deletions cmd/helm/helm.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 (
Expand Down
16 changes: 8 additions & 8 deletions cmd/helm/helm_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() }
Expand Down
Loading

0 comments on commit 895e919

Please sign in to comment.