msb-public
/
helm
mirror of https://github.com/helm/helm
1
0
Code Issues Projects Releases Wiki Activity

switch to new repository URLs

Browse Source 
Signed-off-by: Matt Butcher <matt.butcher@microsoft.com>
pull/8901/head
Matt Butcher 5 years ago
parent d9977b86c6
commit 26c522edf3
No known key found for this signature in database
GPG Key ID: DCD5F5E5EF32C345
15 changed files with 449 additions and 439 deletions
Show Stats Download Patch File Download Diff File

2
Makefile
Unescape View File

@ -100,7 +100,7 @@ docker-build-experimental: check-docker docker-binary docker-binary-rudder
.PHONY: test .PHONY: test
test: build test: build
test: TESTFLAGS += -race -v test: TESTFLAGS += -v
test: test-style test: test-style
test: test-unit test: test-unit

47
cmd/helm/init.go
Unescape View File

@ -59,7 +59,8 @@ To dump a manifest containing the Tiller deployment YAML, combine the
` `
var ( var (
stableRepositoryURL = "https://kubernetes-charts.storage.googleapis.com" stableRepositoryURL = "https://charts.helm.sh/stable"
oldStableRepositoryURL = "https://kubernetes-charts.storage.googleapis.com"
// This is the IPv4 loopback, not localhost, because we have to force IPv4 // This is the IPv4 loopback, not localhost, because we have to force IPv4
// for Dockerized Helm: https://github.com/kubernetes/helm/issues/1410 // for Dockerized Helm: https://github.com/kubernetes/helm/issues/1410
localRepositoryURL = "http://127.0.0.1:8879/charts" localRepositoryURL = "http://127.0.0.1:8879/charts"
@ -72,24 +73,25 @@ var (
) )
type initCmd struct { type initCmd struct {
image string image string
clientOnly bool clientOnly bool
canary bool canary bool
upgrade bool upgrade bool
namespace string namespace string
dryRun bool dryRun bool
forceUpgrade bool forceUpgrade bool
skipRefresh bool skipRefresh bool
skipRepos bool skipRepos bool
out io.Writer out io.Writer
client helm.Interface client helm.Interface
home helmpath.Home home helmpath.Home
opts installer.Options opts installer.Options
kubeClient kubernetes.Interface kubeClient kubernetes.Interface
serviceAccount string serviceAccount string
maxHistory int maxHistory int
replicas int replicas int
wait bool wait bool
useDeprecatedRepo bool
} }
func newInitCmd(out io.Writer) *cobra.Command { func newInitCmd(out io.Writer) *cobra.Command {
@ -122,6 +124,8 @@ func newInitCmd(out io.Writer) *cobra.Command {
f.BoolVar(&i.skipRepos, "skip-repos", false, "Skip adding the stable and local repositories") f.BoolVar(&i.skipRepos, "skip-repos", false, "Skip adding the stable and local repositories")
f.BoolVar(&i.wait, "wait", false, "Block until Tiller is running and ready to receive requests") f.BoolVar(&i.wait, "wait", false, "Block until Tiller is running and ready to receive requests")
f.BoolVar(&i.useDeprecatedRepo, "use-deprecated-stable-repository", false, "Use the old (googleapis) repository URL even though that URL is being shutdown.")
// TODO: replace TLS flags with pkg/helm/environment.AddFlagsTLS() in Helm 3 // TODO: replace TLS flags with pkg/helm/environment.AddFlagsTLS() in Helm 3
// //
// NOTE (bacongobbler): we can't do this in Helm 2 because the flag names differ, and `helm init --tls-ca-cert` // NOTE (bacongobbler): we can't do this in Helm 2 because the flag names differ, and `helm init --tls-ca-cert`
@ -265,6 +269,11 @@ func (i *initCmd) run() error {
return fmt.Errorf("error initializing: %s", err) return fmt.Errorf("error initializing: %s", err)
} }
} else { } else {
// If this is set, override user config, default config, and set it to the old
// URL.
if i.useDeprecatedRepo {
stableRepositoryURL = oldStableRepositoryURL
}
if err := installer.Initialize(i.home, i.out, i.skipRefresh, settings, stableRepositoryURL, localRepositoryURL); err != nil { if err := installer.Initialize(i.home, i.out, i.skipRefresh, settings, stableRepositoryURL, localRepositoryURL); err != nil {
return fmt.Errorf("error initializing: %s", err) return fmt.Errorf("error initializing: %s", err)
} }

2
pkg/downloader/manager.go
Unescape View File

@ -457,7 +457,7 @@ func (m *Manager) getRepoNames(deps []*chartutil.Dependency) (map[string]string,
if containsNonURL { if containsNonURL {
errorMessage += ` errorMessage += `
Note that repositories must be URLs or aliases. For example, to refer to the stable Note that repositories must be URLs or aliases. For example, to refer to the stable
repository, use "https://kubernetes-charts.storage.googleapis.com/" or "@stable" instead of repository, use "https://charts.helm.sh/stable" or "@stable" instead of
"stable". Don't forget to add the repo, too ('helm repo add').` "stable". Don't forget to add the repo, too ('helm repo add').`
} }
return nil, errors.New(errorMessage) return nil, errors.New(errorMessage)

2
pkg/downloader/manager_test.go
Unescape View File

@ -82,7 +82,7 @@ func TestFindChartURL(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
if churl != "https://kubernetes-charts.storage.googleapis.com/alpine-0.1.0.tgz" { if churl != "https://charts.helm.sh/stable/alpine-0.1.0.tgz" {
t.Errorf("Unexpected URL %q", churl) t.Errorf("Unexpected URL %q", churl)
} }
if username != "" { if username != "" {

6
pkg/downloader/testdata/helmhome/repository/cache/kubernetes-charts-index.yaml vendored
Unescape View File

@ -3,7 +3,7 @@ entries:
alpine: alpine:
- name: alpine - name: alpine
urls: urls:
- https://kubernetes-charts.storage.googleapis.com/alpine-0.1.0.tgz - https://charts.helm.sh/stable/alpine-0.1.0.tgz
checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d
home: https://k8s.io/helm home: https://k8s.io/helm
sources: sources:
@ -16,7 +16,7 @@ entries:
icon: "" icon: ""
- name: alpine - name: alpine
urls: urls:
- https://kubernetes-charts.storage.googleapis.com/alpine-0.2.0.tgz - https://charts.helm.sh/stable/alpine-0.2.0.tgz
checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d
home: https://k8s.io/helm home: https://k8s.io/helm
sources: sources:
@ -30,7 +30,7 @@ entries:
mariadb: mariadb:
- name: mariadb - name: mariadb
urls: urls:
- https://kubernetes-charts.storage.googleapis.com/mariadb-0.3.0.tgz - https://charts.helm.sh/stable/mariadb-0.3.0.tgz
checksum: 65229f6de44a2be9f215d11dbff311673fc8ba56 checksum: 65229f6de44a2be9f215d11dbff311673fc8ba56
home: https://mariadb.org home: https://mariadb.org
sources: sources:

2
pkg/downloader/testdata/helmhome/repository/cache/testing-index.yaml vendored
Unescape View File

@ -17,7 +17,7 @@ entries:
- name: alpine - name: alpine
urls: urls:
- http://example.com/alpine-0.2.0.tgz - http://example.com/alpine-0.2.0.tgz
- https://kubernetes-charts.storage.googleapis.com/alpine-0.2.0.tgz - https://charts.helm.sh/stable/alpine-0.2.0.tgz
checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d
home: https://k8s.io/helm home: https://k8s.io/helm
sources: sources:

776
pkg/getter/testdata/repository/cache/stable-index.yaml vendored
View File

File diff suppressed because it is too large Load Diff

2
pkg/getter/testdata/repository/repositories.yaml vendored
Unescape View File

@ -6,7 +6,7 @@ repositories:
certFile: "" certFile: ""
keyFile: "" keyFile: ""
name: stable name: stable
url: https://kubernetes-charts.storage.googleapis.com url: https://charts.helm.sh/stable
- caFile: "" - caFile: ""
cache: repository/cache/local-index.yaml cache: repository/cache/local-index.yaml
certFile: "" certFile: ""

12
pkg/repo/chartrepo_test.go
Unescape View File

@ -225,7 +225,7 @@ func TestFindChartInRepoURL(t *testing.T) {
if err != nil { if err != nil {
t.Errorf("%s", err) t.Errorf("%s", err)
} }
if chartURL != "https://kubernetes-charts.storage.googleapis.com/nginx-0.2.0.tgz" { if chartURL != "https://charts.helm.sh/stable/nginx-0.2.0.tgz" {
t.Errorf("%s is not the valid URL", chartURL) t.Errorf("%s is not the valid URL", chartURL)
} }
@ -233,7 +233,7 @@ func TestFindChartInRepoURL(t *testing.T) {
if err != nil { if err != nil {
t.Errorf("%s", err) t.Errorf("%s", err)
} }
if chartURL != "https://kubernetes-charts.storage.googleapis.com/nginx-0.1.0.tgz" { if chartURL != "https://charts.helm.sh/stable/nginx-0.1.0.tgz" {
t.Errorf("%s is not the valid URL", chartURL) t.Errorf("%s is not the valid URL", chartURL)
} }
} }
@ -303,19 +303,19 @@ func TestResolveReferenceURL(t *testing.T) {
t.Errorf("%s does not contain the query string of the base URL", chartURL) t.Errorf("%s does not contain the query string of the base URL", chartURL)
} }
chartURL, err = ResolveReferenceURL("http://localhost:8123", "https://kubernetes-charts.storage.googleapis.com/nginx-0.2.0.tgz") chartURL, err = ResolveReferenceURL("http://localhost:8123", "https://charts.helm.sh/stable/nginx-0.2.0.tgz")
if err != nil { if err != nil {
t.Errorf("%s", err) t.Errorf("%s", err)
} }
if chartURL != "https://kubernetes-charts.storage.googleapis.com/nginx-0.2.0.tgz" { if chartURL != "https://charts.helm.sh/stable/nginx-0.2.0.tgz" {
t.Errorf("%s", chartURL) t.Errorf("%s", chartURL)
} }
chartURL, err = ResolveReferenceURL("http://localhost:8123/?querystring", "https://kubernetes-charts.storage.googleapis.com/nginx-0.2.0.tgz") chartURL, err = ResolveReferenceURL("http://localhost:8123/?querystring", "https://charts.helm.sh/stable/nginx-0.2.0.tgz")
if err != nil { if err != nil {
t.Errorf("%s", err) t.Errorf("%s", err)
} }
if chartURL != "https://kubernetes-charts.storage.googleapis.com/nginx-0.2.0.tgz" { if chartURL != "https://charts.helm.sh/stable/nginx-0.2.0.tgz" {
t.Errorf("%s contains query string from base URL when it shouldn't", chartURL) t.Errorf("%s contains query string from base URL when it shouldn't", chartURL)
} }
} }

7
pkg/repo/index_test.go
Unescape View File

@ -109,6 +109,7 @@ func TestLoadIndex(t *testing.T) {
Name: "regular index file", Name: "regular index file",
Filename: testfile, Filename: testfile,
}, },
{ {
Name: "chartmuseum index file", Name: "chartmuseum index file",
Filename: chartmuseumtestfile, Filename: chartmuseumtestfile,
@ -327,7 +328,7 @@ func verifyLocalIndex(t *testing.T, i *IndexFile) {
Home: "https://github.com/something", Home: "https://github.com/something",
}, },
URLs: []string{ URLs: []string{
"https://kubernetes-charts.storage.googleapis.com/alpine-1.0.0.tgz", "https://charts.helm.sh/stable/alpine-1.0.0.tgz",
"http://storage2.googleapis.com/kubernetes-charts/alpine-1.0.0.tgz", "http://storage2.googleapis.com/kubernetes-charts/alpine-1.0.0.tgz",
}, },
Digest: "sha256:1234567890abcdef", Digest: "sha256:1234567890abcdef",
@ -341,7 +342,7 @@ func verifyLocalIndex(t *testing.T, i *IndexFile) {
Home: "https://github.com/something/else", Home: "https://github.com/something/else",
}, },
URLs: []string{ URLs: []string{
"https://kubernetes-charts.storage.googleapis.com/nginx-0.2.0.tgz", "https://charts.helm.sh/stable/nginx-0.2.0.tgz",
}, },
Digest: "sha256:1234567890abcdef", Digest: "sha256:1234567890abcdef",
}, },
@ -354,7 +355,7 @@ func verifyLocalIndex(t *testing.T, i *IndexFile) {
Home: "https://github.com/something", Home: "https://github.com/something",
}, },
URLs: []string{ URLs: []string{
"https://kubernetes-charts.storage.googleapis.com/nginx-0.1.0.tgz", "https://charts.helm.sh/stable/nginx-0.1.0.tgz",
}, },
Digest: "sha256:1234567890abcdef", Digest: "sha256:1234567890abcdef",
}, },

6
pkg/repo/testdata/chartmuseum-index.yaml vendored
Unescape View File

@ -4,7 +4,7 @@ apiVersion: v1
entries: entries:
nginx: nginx:
- urls: - urls:
- https://kubernetes-charts.storage.googleapis.com/nginx-0.2.0.tgz - https://charts.helm.sh/stable/nginx-0.2.0.tgz
name: nginx name: nginx
description: string description: string
version: 0.2.0 version: 0.2.0
@ -15,7 +15,7 @@ entries:
- web server - web server
- proxy - proxy
- urls: - urls:
- https://kubernetes-charts.storage.googleapis.com/nginx-0.1.0.tgz - https://charts.helm.sh/stable/nginx-0.1.0.tgz
name: nginx name: nginx
description: string description: string
version: 0.1.0 version: 0.1.0
@ -27,7 +27,7 @@ entries:
- proxy - proxy
alpine: alpine:
- urls: - urls:
- https://kubernetes-charts.storage.googleapis.com/alpine-1.0.0.tgz - https://charts.helm.sh/stable/alpine-1.0.0.tgz
- http://storage2.googleapis.com/kubernetes-charts/alpine-1.0.0.tgz - http://storage2.googleapis.com/kubernetes-charts/alpine-1.0.0.tgz
name: alpine name: alpine
description: string description: string

6
pkg/repo/testdata/local-index-unordered.yaml vendored
Unescape View File

@ -2,7 +2,7 @@ apiVersion: v1
entries: entries:
nginx: nginx:
- urls: - urls:
- https://kubernetes-charts.storage.googleapis.com/nginx-0.1.0.tgz - https://charts.helm.sh/stable/nginx-0.1.0.tgz
name: nginx name: nginx
description: string description: string
version: 0.1.0 version: 0.1.0
@ -13,7 +13,7 @@ entries:
- web server - web server
- proxy - proxy
- urls: - urls:
- https://kubernetes-charts.storage.googleapis.com/nginx-0.2.0.tgz - https://charts.helm.sh/stable/nginx-0.2.0.tgz
name: nginx name: nginx
description: string description: string
version: 0.2.0 version: 0.2.0
@ -25,7 +25,7 @@ entries:
- proxy - proxy
alpine: alpine:
- urls: - urls:
- https://kubernetes-charts.storage.googleapis.com/alpine-1.0.0.tgz - https://charts.helm.sh/stable/alpine-1.0.0.tgz
- http://storage2.googleapis.com/kubernetes-charts/alpine-1.0.0.tgz - http://storage2.googleapis.com/kubernetes-charts/alpine-1.0.0.tgz
name: alpine name: alpine
description: string description: string

6
pkg/repo/testdata/local-index.yaml vendored
Unescape View File

@ -2,7 +2,7 @@ apiVersion: v1
entries: entries:
nginx: nginx:
- urls: - urls:
- https://kubernetes-charts.storage.googleapis.com/nginx-0.2.0.tgz - https://charts.helm.sh/stable/nginx-0.2.0.tgz
name: nginx name: nginx
description: string description: string
version: 0.2.0 version: 0.2.0
@ -13,7 +13,7 @@ entries:
- web server - web server
- proxy - proxy
- urls: - urls:
- https://kubernetes-charts.storage.googleapis.com/nginx-0.1.0.tgz - https://charts.helm.sh/stable/nginx-0.1.0.tgz
name: nginx name: nginx
description: string description: string
version: 0.1.0 version: 0.1.0
@ -25,7 +25,7 @@ entries:
- proxy - proxy
alpine: alpine:
- urls: - urls:
- https://kubernetes-charts.storage.googleapis.com/alpine-1.0.0.tgz - https://charts.helm.sh/stable/alpine-1.0.0.tgz
- http://storage2.googleapis.com/kubernetes-charts/alpine-1.0.0.tgz - http://storage2.googleapis.com/kubernetes-charts/alpine-1.0.0.tgz
name: alpine name: alpine
description: string description: string

6
pkg/repo/testdata/server/index.yaml vendored
Unescape View File

@ -2,7 +2,7 @@ apiVersion: v1
entries: entries:
nginx: nginx:
- urls: - urls:
- https://kubernetes-charts.storage.googleapis.com/nginx-0.1.0.tgz - https://charts.helm.sh/stable/nginx-0.1.0.tgz
name: nginx name: nginx
description: string description: string
version: 0.1.0 version: 0.1.0
@ -13,7 +13,7 @@ entries:
- web server - web server
- proxy - proxy
- urls: - urls:
- https://kubernetes-charts.storage.googleapis.com/nginx-0.2.0.tgz - https://charts.helm.sh/stable/nginx-0.2.0.tgz
name: nginx name: nginx
description: string description: string
version: 0.2.0 version: 0.2.0
@ -25,7 +25,7 @@ entries:
- proxy - proxy
alpine: alpine:
- urls: - urls:
- https://kubernetes-charts.storage.googleapis.com/alpine-1.0.0.tgz - https://charts.helm.sh/stable/alpine-1.0.0.tgz
- http://storage2.googleapis.com/kubernetes-charts/alpine-1.0.0.tgz - http://storage2.googleapis.com/kubernetes-charts/alpine-1.0.0.tgz
name: alpine name: alpine
description: string description: string

6
pkg/resolver/testdata/helmhome/repository/cache/kubernetes-charts-index.yaml vendored
Unescape View File

@ -3,7 +3,7 @@ entries:
alpine: alpine:
- name: alpine - name: alpine
urls: urls:
- https://kubernetes-charts.storage.googleapis.com/alpine-0.1.0.tgz - https://charts.helm.sh/stable/alpine-0.1.0.tgz
checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d
home: https://k8s.io/helm home: https://k8s.io/helm
sources: sources:
@ -16,7 +16,7 @@ entries:
icon: "" icon: ""
- name: alpine - name: alpine
urls: urls:
- https://kubernetes-charts.storage.googleapis.com/alpine-0.2.0.tgz - https://charts.helm.sh/stable/alpine-0.2.0.tgz
checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d
home: https://k8s.io/helm home: https://k8s.io/helm
sources: sources:
@ -30,7 +30,7 @@ entries:
mariadb: mariadb:
- name: mariadb - name: mariadb
urls: urls:
- https://kubernetes-charts.storage.googleapis.com/mariadb-0.3.0.tgz - https://charts.helm.sh/stable/mariadb-0.3.0.tgz
checksum: 65229f6de44a2be9f215d11dbff311673fc8ba56 checksum: 65229f6de44a2be9f215d11dbff311673fc8ba56
home: https://mariadb.org home: https://mariadb.org
sources: sources:

Write Preview
Loading…
Cancel
Save