Change default repositories for Helm v2 (#8901)

* switch to new repository URLs

Signed-off-by: Matt Butcher <matt.butcher@microsoft.com>

* added warning each time old repository is noticed

Signed-off-by: Matt Butcher <matt.butcher@microsoft.com>

Makefile

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

cmd/helm/helm.go

@@ -36,6 +36,7 @@ import (
 	helm_env "k8s.io/helm/pkg/helm/environment"
 	"k8s.io/helm/pkg/helm/portforwarder"
 	"k8s.io/helm/pkg/kube"
+	"k8s.io/helm/pkg/repo"
 	"k8s.io/helm/pkg/tlsutil"
 )
 
@@ -175,6 +176,52 @@ Environment:
 
 `
 
+func checkForExpiredRepos(repofile string) {
+
+	expiredRepos := []struct {
+		name string
+		old  string
+		new  string
+	}{
+		{
+			name: "stable",
+			old:  "kubernetes-charts.storage.googleapis.com",
+			new:  "https://charts.helm.sh/stable",
+		},
+		{
+			name: "incubator",
+			old:  "kubernetes-charts-incubator.storage.googleapis.com",
+			new:  "https://charts.helm.sh/incubator",
+		},
+	}
+
+	// parse repo file.
+	// Ignore the error because it is okay for a repo file to be unparseable at this
+	// stage. Later checks will trap the error and respond accordingly.
+	repoFile, err := repo.LoadRepositoriesFile(repofile)
+	if err != nil {
+		return
+	}
+
+	for _, exp := range expiredRepos {
+		r, ok := repoFile.Get(exp.name)
+		if !ok {
+			return
+		}
+
+		if url := r.URL; strings.Contains(url, exp.old) {
+			fmt.Fprintf(
+				os.Stderr,
+				"WARNING: %q is deprecated for %q and will be deleted Nov. 13, 2020.\nWARNING: You should switch to %q\n",
+				exp.old,
+				exp.name,
+				exp.new,
+			)
+		}
+	}
+
+}
+
 func newRootCmd(args []string) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:          "helm",
@@ -182,6 +229,7 @@ func newRootCmd(args []string) *cobra.Command {
 		Long:         globalUsage,
 		SilenceUsage: true,
 		PersistentPreRun: func(*cobra.Command, []string) {
+			checkForExpiredRepos(settings.Home.RepositoryFile())
 			if settings.TLSCaCertFile == helm_env.DefaultTLSCaCert || settings.TLSCaCertFile == "" {
 				settings.TLSCaCertFile = settings.Home.TLSCaCert()
 			} else {

cmd/helm/init.go

@@ -59,7 +59,8 @@ To dump a manifest containing the Tiller deployment YAML, combine the
 `
 
 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
 	// for Dockerized Helm: https://github.com/kubernetes/helm/issues/1410
 	localRepositoryURL = "http://127.0.0.1:8879/charts"
@@ -90,6 +91,7 @@ type initCmd struct {
 	maxHistory        int
 	replicas          int
 	wait              bool
+	useDeprecatedRepo bool
 }
 
 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.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
 	//
 	// 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)
 		}
 	} 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 {
 			return fmt.Errorf("error initializing: %s", err)
 		}

docs/helm/helm_init.md

@@ -48,7 +48,7 @@ helm init [flags]
       --service-account string             Name of service account
       --skip-refresh                       Do not refresh (download) the local repository cache
       --skip-repos                         Skip adding the stable and local repositories
-      --stable-repo-url string            URL for stable repository (default "https://kubernetes-charts.storage.googleapis.com")
+      --stable-repo-url string             URL for stable repository (default "https://charts.helm.sh/stable")
   -i, --tiller-image string                Override Tiller image
       --tiller-tls                         Install Tiller with TLS enabled
       --tiller-tls-cert string             Path to TLS certificate file to install with Tiller
@@ -57,6 +57,7 @@ helm init [flags]
       --tiller-tls-verify                  Install Tiller with TLS enabled and to verify remote certificates
       --tls-ca-cert string                 Path to CA root certificate
       --upgrade                            Upgrade if Tiller is already installed
+      --use-deprecated-stable-repository   Use the old (googleapis) repository URL even though that URL is being shutdown.
       --wait                               Block until Tiller is running and ready to receive requests
 ```
 
@@ -76,4 +77,4 @@ helm init [flags]
 
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 25-Jun-2020
+###### Auto generated by spf13/cobra on 15-Oct-2020

pkg/downloader/manager.go

@@ -457,7 +457,7 @@ func (m *Manager) getRepoNames(deps []*chartutil.Dependency) (map[string]string,
 		if containsNonURL {
 			errorMessage += `
 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').`
 		}
 		return nil, errors.New(errorMessage)

pkg/downloader/manager_test.go

@@ -82,7 +82,7 @@ func TestFindChartURL(t *testing.T) {
 	if err != nil {
 		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)
 	}
 	if username != "" {

pkg/downloader/testdata/helmhome/repository/cache/kubernetes-charts-index.yaml

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

pkg/downloader/testdata/helmhome/repository/cache/testing-index.yaml

@@ -17,7 +17,7 @@ entries:
     - name: alpine
       urls:
         - 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
       home: https://k8s.io/helm
       sources:

pkg/getter/testdata/repository/repositories.yaml

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

pkg/repo/chartrepo_test.go

@@ -225,7 +225,7 @@ func TestFindChartInRepoURL(t *testing.T) {
 	if err != nil {
 		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)
 	}
 
@@ -233,7 +233,7 @@ func TestFindChartInRepoURL(t *testing.T) {
 	if err != nil {
 		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)
 	}
 }
@@ -303,19 +303,19 @@ func TestResolveReferenceURL(t *testing.T) {
 		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 {
 		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)
 	}
 
-	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 {
 		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)
 	}
 }

pkg/repo/index_test.go

@@ -109,6 +109,7 @@ func TestLoadIndex(t *testing.T) {
 			Name:     "regular index file",
 			Filename: testfile,
 		},
+
 		{
 			Name:     "chartmuseum index file",
 			Filename: chartmuseumtestfile,
@@ -327,7 +328,7 @@ func verifyLocalIndex(t *testing.T, i *IndexFile) {
 				Home:        "https://github.com/something",
 			},
 			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",
 			},
 			Digest: "sha256:1234567890abcdef",
@@ -341,7 +342,7 @@ func verifyLocalIndex(t *testing.T, i *IndexFile) {
 				Home:        "https://github.com/something/else",
 			},
 			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",
 		},
@@ -354,7 +355,7 @@ func verifyLocalIndex(t *testing.T, i *IndexFile) {
 				Home:        "https://github.com/something",
 			},
 			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",
 		},

pkg/repo/testdata/chartmuseum-index.yaml

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

pkg/repo/testdata/local-index-unordered.yaml

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

pkg/repo/testdata/local-index.yaml

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

pkg/repo/testdata/server/index.yaml

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

pkg/resolver/testdata/helmhome/repository/cache/kubernetes-charts-index.yaml

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