Fixes #1898: Proposal: move downloader and resolver package to /pkg

helm · Feb 10, 2017 · 17c9e22 · 17c9e22
1 parent e440a36
commit 17c9e22
Show file tree

Hide file tree

Showing 32 changed files with 6 additions and 6 deletions.
diff --git a/cmd/helm/dependency_build.go b/cmd/helm/dependency_build.go
@@ -20,8 +20,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"k8s.io/helm/cmd/helm/downloader"
 	"k8s.io/helm/cmd/helm/helmpath"
+	"k8s.io/helm/pkg/downloader"
 )
 
 const dependencyBuildDesc = `

diff --git a/cmd/helm/dependency_update.go b/cmd/helm/dependency_update.go
@@ -20,8 +20,8 @@ import (
 	"path/filepath"
 
 	"github.com/spf13/cobra"
-	"k8s.io/helm/cmd/helm/downloader"
 	"k8s.io/helm/cmd/helm/helmpath"
+	"k8s.io/helm/pkg/downloader"
 )
 
 const dependencyUpDesc = `

diff --git a/cmd/helm/fetch.go b/cmd/helm/fetch.go
@@ -24,9 +24,9 @@ import (
 	"path/filepath"
 
 	"github.com/spf13/cobra"
-	"k8s.io/helm/cmd/helm/downloader"
 	"k8s.io/helm/cmd/helm/helmpath"
 	"k8s.io/helm/pkg/chartutil"
+	"k8s.io/helm/pkg/downloader"
 )
 
 const fetchDesc = `

diff --git a/cmd/helm/install.go b/cmd/helm/install.go
@@ -32,9 +32,9 @@ import (
 	"github.com/ghodss/yaml"
 	"github.com/spf13/cobra"
 
-	"k8s.io/helm/cmd/helm/downloader"
 	"k8s.io/helm/cmd/helm/helmpath"
 	"k8s.io/helm/cmd/helm/strvals"
+	"k8s.io/helm/pkg/downloader"
 	"k8s.io/helm/pkg/helm"
 	"k8s.io/helm/pkg/kube"
 	"k8s.io/helm/pkg/proto/hapi/release"

diff --git a/cmd/helm/verify.go b/cmd/helm/verify.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"k8s.io/helm/cmd/helm/downloader"
+	"k8s.io/helm/pkg/downloader"
 )
 
 const verifyDesc = `

diff --git a/cmd/helm/downloader/chart_downloader.go → pkg/downloader/chart_downloader.go b/cmd/helm/downloader/chart_downloader.go → pkg/downloader/chart_downloader.go
diff --git a/cmd/helm/downloader/chart_downloader_test.go → pkg/downloader/chart_downloader_test.go b/cmd/helm/downloader/chart_downloader_test.go → pkg/downloader/chart_downloader_test.go
diff --git a/cmd/helm/downloader/doc.go → pkg/downloader/doc.go b/cmd/helm/downloader/doc.go → pkg/downloader/doc.go
diff --git a/cmd/helm/downloader/manager.go → pkg/downloader/manager.go b/cmd/helm/downloader/manager.go → pkg/downloader/manager.go
@@ -31,10 +31,10 @@ import (
 	"github.com/ghodss/yaml"
 
 	"k8s.io/helm/cmd/helm/helmpath"
-	"k8s.io/helm/cmd/helm/resolver"
 	"k8s.io/helm/pkg/chartutil"
 	"k8s.io/helm/pkg/proto/hapi/chart"
 	"k8s.io/helm/pkg/repo"
+	"k8s.io/helm/pkg/resolver"
 	"k8s.io/helm/pkg/urlutil"
 )
 

diff --git a/cmd/helm/downloader/manager_test.go → pkg/downloader/manager_test.go b/cmd/helm/downloader/manager_test.go → pkg/downloader/manager_test.go
diff --git a/...elm/downloader/testdata/helm-test-key.pub → pkg/downloader/testdata/helm-test-key.pub b/...elm/downloader/testdata/helm-test-key.pub → pkg/downloader/testdata/helm-test-key.pub
diff --git a/.../downloader/testdata/helm-test-key.secret → pkg/downloader/testdata/helm-test-key.secret b/.../downloader/testdata/helm-test-key.secret → pkg/downloader/testdata/helm-test-key.secret
diff --git a/...sitory/cache/kubernetes-charts-index.yaml → ...sitory/cache/kubernetes-charts-index.yaml b/...sitory/cache/kubernetes-charts-index.yaml → ...sitory/cache/kubernetes-charts-index.yaml
diff --git a/...elmhome/repository/cache/local-index.yaml → ...elmhome/repository/cache/local-index.yaml b/...elmhome/repository/cache/local-index.yaml → ...elmhome/repository/cache/local-index.yaml
diff --git a/...sitory/cache/testing-basicauth-index.yaml → ...sitory/cache/testing-basicauth-index.yaml b/...sitory/cache/testing-basicauth-index.yaml → ...sitory/cache/testing-basicauth-index.yaml
diff --git a/...repository/cache/testing-https-index.yaml → ...repository/cache/testing-https-index.yaml b/...repository/cache/testing-https-index.yaml → ...repository/cache/testing-https-index.yaml
diff --git a/...mhome/repository/cache/testing-index.yaml → ...mhome/repository/cache/testing-index.yaml b/...mhome/repository/cache/testing-index.yaml → ...mhome/repository/cache/testing-index.yaml
diff --git a/...data/helmhome/repository/local/index.yaml → ...data/helmhome/repository/local/index.yaml b/...data/helmhome/repository/local/index.yaml → ...data/helmhome/repository/local/index.yaml
diff --git a/...ata/helmhome/repository/repositories.yaml → ...ata/helmhome/repository/repositories.yaml b/...ata/helmhome/repository/repositories.yaml → ...ata/helmhome/repository/repositories.yaml
diff --git a/...lm/downloader/testdata/signtest-0.1.0.tgz → pkg/downloader/testdata/signtest-0.1.0.tgz b/...lm/downloader/testdata/signtest-0.1.0.tgz → pkg/downloader/testdata/signtest-0.1.0.tgz
diff --git a/...wnloader/testdata/signtest-0.1.0.tgz.prov → ...wnloader/testdata/signtest-0.1.0.tgz.prov b/...wnloader/testdata/signtest-0.1.0.tgz.prov → ...wnloader/testdata/signtest-0.1.0.tgz.prov
diff --git a/.../downloader/testdata/signtest/.helmignore → pkg/downloader/testdata/signtest/.helmignore b/.../downloader/testdata/signtest/.helmignore → pkg/downloader/testdata/signtest/.helmignore
diff --git a/...m/downloader/testdata/signtest/Chart.yaml → pkg/downloader/testdata/signtest/Chart.yaml b/...m/downloader/testdata/signtest/Chart.yaml → pkg/downloader/testdata/signtest/Chart.yaml
diff --git a/...oader/testdata/signtest/alpine/Chart.yaml → ...oader/testdata/signtest/alpine/Chart.yaml b/...oader/testdata/signtest/alpine/Chart.yaml → ...oader/testdata/signtest/alpine/Chart.yaml
diff --git a/...loader/testdata/signtest/alpine/README.md → ...loader/testdata/signtest/alpine/README.md b/...loader/testdata/signtest/alpine/README.md → ...loader/testdata/signtest/alpine/README.md
diff --git a/...signtest/alpine/templates/alpine-pod.yaml → ...signtest/alpine/templates/alpine-pod.yaml b/...signtest/alpine/templates/alpine-pod.yaml → ...signtest/alpine/templates/alpine-pod.yaml
diff --git a/...ader/testdata/signtest/alpine/values.yaml → ...ader/testdata/signtest/alpine/values.yaml b/...ader/testdata/signtest/alpine/values.yaml → ...ader/testdata/signtest/alpine/values.yaml
diff --git a/...ader/testdata/signtest/templates/pod.yaml → ...ader/testdata/signtest/templates/pod.yaml b/...ader/testdata/signtest/templates/pod.yaml → ...ader/testdata/signtest/templates/pod.yaml
diff --git a/.../downloader/testdata/signtest/values.yaml → pkg/downloader/testdata/signtest/values.yaml b/.../downloader/testdata/signtest/values.yaml → pkg/downloader/testdata/signtest/values.yaml
diff --git a/cmd/helm/resolver/resolver.go → pkg/resolver/resolver.go b/cmd/helm/resolver/resolver.go → pkg/resolver/resolver.go
diff --git a/cmd/helm/resolver/resolver_test.go → pkg/resolver/resolver_test.go b/cmd/helm/resolver/resolver_test.go → pkg/resolver/resolver_test.go
diff --git a/...sitory/cache/kubernetes-charts-index.yaml → ...sitory/cache/kubernetes-charts-index.yaml b/...sitory/cache/kubernetes-charts-index.yaml → ...sitory/cache/kubernetes-charts-index.yaml