Merge pull request #2273 from sushilkm/issues/2272

Exposes repository-URLs as flags on helm init command

cmd/helm/init.go

@@ -53,8 +53,11 @@ To dump a manifest containing the Tiller deployment YAML, combine the
 `
 
 const (
-	stableRepository    = "stable"
-	localRepository     = "local"
+	stableRepository = "stable"
+	localRepository  = "local"
+)
+
+var (
 	stableRepositoryURL = "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
@@ -108,6 +111,9 @@ func newInitCmd(out io.Writer) *cobra.Command {
 	f.StringVar(&tlsCertFile, "tiller-tls-cert", "", "path to TLS certificate file to install with tiller")
 	f.StringVar(&tlsCaCertFile, "tls-ca-cert", "", "path to CA root certificate")
 
+	f.StringVar(&stableRepositoryURL, "stable-repo-url", stableRepositoryURL, "URL for stable repository")
+	f.StringVar(&localRepositoryURL, "local-repo-url", localRepositoryURL, "URL for local repository")
+
 	return cmd
 }
 

docs/helm/helm_init.md

@@ -36,7 +36,9 @@ helm init
       --canary-image             use the canary tiller image
   -c, --client-only              if set does not install tiller
       --dry-run                  do not install local or remote
+      --local-repo-url string    URL for local repository (default "http://127.0.0.1:8879/charts")
       --skip-refresh             do not refresh (download) the local repository cache
+      --stable-repo-url string   URL for stable repository (default "https://kubernetes-charts.storage.googleapis.com")
   -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
@@ -59,4 +61,4 @@ helm init
 ### SEE ALSO
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 12-Apr-2017
+###### Auto generated by spf13/cobra on 13-Apr-2017

docs/man/man1/helm_init.1

@@ -52,10 +52,20 @@ To dump a manifest containing the Tiller deployment YAML, combine the
 \fB\-\-dry\-run\fP[=false]
     do not install local or remote
 
+.PP
+\fB\-\-local\-repo\-url\fP="
+\[la]http://127.0.0.1:8879/charts"\[ra]
+    URL for local repository
+
 .PP
 \fB\-\-skip\-refresh\fP[=false]
     do not refresh (download) the local repository cache
 
+.PP
+\fB\-\-stable\-repo\-url\fP="
+\[la]https://kubernetes-charts.storage.googleapis.com"\[ra]
+    URL for stable repository
+
 .PP
 \fB\-i\fP, \fB\-\-tiller\-image\fP=""
     override tiller image
@@ -114,4 +124,4 @@ To dump a manifest containing the Tiller deployment YAML, combine the
 
 .SH HISTORY
 .PP
-12\-Apr\-2017 Auto generated by spf13/cobra
+13\-Apr\-2017 Auto generated by spf13/cobra

scripts/completions.bash

@@ -634,8 +634,12 @@ _helm_init()
     local_nonpersistent_flags+=("--client-only")
     flags+=("--dry-run")
     local_nonpersistent_flags+=("--dry-run")
+    flags+=("--local-repo-url=")
+    local_nonpersistent_flags+=("--local-repo-url=")
     flags+=("--skip-refresh")
     local_nonpersistent_flags+=("--skip-refresh")
+    flags+=("--stable-repo-url=")
+    local_nonpersistent_flags+=("--stable-repo-url=")
     flags+=("--tiller-image=")
     two_word_flags+=("-i")
     local_nonpersistent_flags+=("--tiller-image=")