diff --git a/cmd/helm/helm.go b/cmd/helm/helm.go
index 4c7ca92909c0d536031ed1317267a95c14b69aa3..be3ced3761142e6db3c3101dcfa28165f5e04411 100644
--- a/cmd/helm/helm.go
+++ b/cmd/helm/helm.go
@@ -169,7 +169,7 @@ func markDeprecated(cmd *cobra.Command, notice string) *cobra.Command {
func setupConnection() error {
if settings.TillerHost == "" {
- config, client, err := getKubeClient(settings.KubeContext)
+ config, client, err := getKubeClient(settings.KubeContext, settings.KubeConfig)
if err != nil {
return err
}
@@ -223,8 +223,8 @@ func prettyError(err error) error {
}
// configForContext creates a Kubernetes REST client configuration for a given kubeconfig context.
-func configForContext(context string) (*rest.Config, error) {
- config, err := kube.GetConfig(context).ClientConfig()
+func configForContext(context string, kubeconfig string) (*rest.Config, error) {
+ config, err := kube.GetConfig(context, kubeconfig).ClientConfig()
if err != nil {
return nil, fmt.Errorf("could not get Kubernetes config for context %q: %s", context, err)
}
@@ -232,8 +232,8 @@ func configForContext(context string) (*rest.Config, error) {
}
// getKubeClient creates a Kubernetes config and client for a given kubeconfig context.
-func getKubeClient(context string) (*rest.Config, kubernetes.Interface, error) {
- config, err := configForContext(context)
+func getKubeClient(context string, kubeconfig string) (*rest.Config, kubernetes.Interface, error) {
+ config, err := configForContext(context, kubeconfig)
if err != nil {
return nil, nil, err
}
@@ -247,8 +247,8 @@ func getKubeClient(context string) (*rest.Config, kubernetes.Interface, error) {
// getInternalKubeClient creates a Kubernetes config and an "internal" client for a given kubeconfig context.
//
// Prefer the similar getKubeClient if you don't need to use such an internal client.
-func getInternalKubeClient(context string) (internalclientset.Interface, error) {
- config, err := configForContext(context)
+func getInternalKubeClient(context string, kubeconfig string) (internalclientset.Interface, error) {
+ config, err := configForContext(context, kubeconfig)
if err != nil {
return nil, err
}
diff --git a/cmd/helm/init.go b/cmd/helm/init.go
index 92f4c37949616e6fa96bbd706c62b043dd91a4d2..93073b9c1448db8e70e0205876b7002c48de00a3 100644
--- a/cmd/helm/init.go
+++ b/cmd/helm/init.go
@@ -289,7 +289,7 @@ func (i *initCmd) run() error {
if !i.clientOnly {
if i.kubeClient == nil {
- _, c, err := getKubeClient(settings.KubeContext)
+ _, c, err := getKubeClient(settings.KubeContext, settings.KubeConfig)
if err != nil {
return fmt.Errorf("could not get kubernetes client: %s", err)
}
@@ -332,7 +332,7 @@ func (i *initCmd) run() error {
func (i *initCmd) ping() error {
if i.wait {
- _, kubeClient, err := getKubeClient(settings.KubeContext)
+ _, kubeClient, err := getKubeClient(settings.KubeContext, settings.KubeConfig)
if err != nil {
return err
}
diff --git a/cmd/helm/install.go b/cmd/helm/install.go
index ee4e76a2b5aab022ea8d1fc29336fe1ecbe8b6f1..a6a8758ede3726f5b5f8c27ec4e1862f4997410d 100644
--- a/cmd/helm/install.go
+++ b/cmd/helm/install.go
@@ -491,7 +491,7 @@ func generateName(nameTemplate string) (string, error) {
}
func defaultNamespace() string {
- if ns, _, err := kube.GetConfig(settings.KubeContext).Namespace(); err == nil {
+ if ns, _, err := kube.GetConfig(settings.KubeContext, settings.KubeConfig).Namespace(); err == nil {
return ns
}
return "default"
diff --git a/cmd/helm/reset.go b/cmd/helm/reset.go
index 9d3e17e03cdd88f6f213085e3ae3556f1ed106ea..1fe0ce39f23a610a9fe44eec535ea5b034235ecc 100644
--- a/cmd/helm/reset.go
+++ b/cmd/helm/reset.go
@@ -86,7 +86,7 @@ func newResetCmd(client helm.Interface, out io.Writer) *cobra.Command {
// runReset uninstalls tiller from Kubernetes Cluster and deletes local config
func (d *resetCmd) run() error {
if d.kubeClient == nil {
- c, err := getInternalKubeClient(settings.KubeContext)
+ c, err := getInternalKubeClient(settings.KubeContext, settings.KubeConfig)
if err != nil {
return fmt.Errorf("could not get kubernetes client: %s", err)
}
diff --git a/cmd/helm/version.go b/cmd/helm/version.go
index d541067a01007d911351a97fc027f3016285684c..407c2bf43b5516934dcb0937e53801e1c4e8683f 100644
--- a/cmd/helm/version.go
+++ b/cmd/helm/version.go
@@ -76,7 +76,10 @@ func newVersionCmd(c helm.Interface, out io.Writer) *cobra.Command {
if version.showServer {
// We do this manually instead of in PreRun because we only
// need a tunnel if server version is requested.
- setupConnection()
+ err := setupConnection()
+ if err != nil {
+ return err
+ }
}
version.client = ensureHelmClient(version.client)
return version.run()
@@ -115,7 +118,6 @@ func (v *versionCmd) run() error {
}
fmt.Fprintf(v.out, "Kubernetes: %#v\n", k8sVersion)
}
-
resp, err := v.client.GetVersion()
if err != nil {
if grpc.Code(err) == codes.Unimplemented {
@@ -135,7 +137,7 @@ func (v *versionCmd) run() error {
func getK8sVersion() (*apiVersion.Info, error) {
var v *apiVersion.Info
- _, client, err := getKubeClient(settings.KubeContext)
+ _, client, err := getKubeClient(settings.KubeContext, settings.KubeConfig)
if err != nil {
return v, err
}
diff --git a/docs/helm/helm.md b/docs/helm/helm.md
index 8592cad7c60d93dee33b6cccec48c62b691497f1..ae27de401129ee3f7b14e9c096f0ce4ec6c9568b 100644
--- a/docs/helm/helm.md
+++ b/docs/helm/helm.md
@@ -36,6 +36,7 @@ Environment:
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -68,4 +69,4 @@ Environment:
* [helm verify](helm_verify.md) - verify that a chart at the given path has been signed and is valid
* [helm version](helm_version.md) - print the client/server version information
-###### Auto generated by spf13/cobra on 14-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_completion.md b/docs/helm/helm_completion.md
index 994205d881ece1b5a048bc836855fd68e8f8edf5..64a6056f829291430da0ed0516745ccbe619119f 100644
--- a/docs/helm/helm_completion.md
+++ b/docs/helm/helm_completion.md
@@ -28,6 +28,7 @@ helm completion SHELL
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -35,4 +36,4 @@ helm completion SHELL
### SEE ALSO
* [helm](helm.md) - The Helm package manager for Kubernetes.
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_create.md b/docs/helm/helm_create.md
index 6e0f3de78b315a3edd780a787889f7ca62f86bdb..7ae947ed724a36ae5531df26ad82ea9f8d45e20b 100644
--- a/docs/helm/helm_create.md
+++ b/docs/helm/helm_create.md
@@ -47,6 +47,7 @@ helm create NAME
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -54,4 +55,4 @@ helm create NAME
### SEE ALSO
* [helm](helm.md) - The Helm package manager for Kubernetes.
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_delete.md b/docs/helm/helm_delete.md
index 9eee6e8ec97e2169a083ed602e524b33233f79b7..e181f439e7ec70c767758dfaf25d0978bac93b66 100644
--- a/docs/helm/helm_delete.md
+++ b/docs/helm/helm_delete.md
@@ -39,6 +39,7 @@ helm delete [flags] RELEASE_NAME [...]
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -46,4 +47,4 @@ helm delete [flags] RELEASE_NAME [...]
### SEE ALSO
* [helm](helm.md) - The Helm package manager for Kubernetes.
-###### Auto generated by spf13/cobra on 13-Apr-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_dependency.md b/docs/helm/helm_dependency.md
index 34d49e20a09d7af147808cfce61967447809ebf7..b0085c6c738e6b5fb2b5e7c707fe9c9e45e5315f 100644
--- a/docs/helm/helm_dependency.md
+++ b/docs/helm/helm_dependency.md
@@ -61,6 +61,7 @@ for this case.
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -71,4 +72,4 @@ for this case.
* [helm dependency list](helm_dependency_list.md) - list the dependencies for the given chart
* [helm dependency update](helm_dependency_update.md) - update charts/ based on the contents of requirements.yaml
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_dependency_build.md b/docs/helm/helm_dependency_build.md
index 0413a9a85318db0445e722293b9266e1a00b904a..eea2fa02c5b0413f589e959d87acbfddb121e9bc 100644
--- a/docs/helm/helm_dependency_build.md
+++ b/docs/helm/helm_dependency_build.md
@@ -34,6 +34,7 @@ helm dependency build [flags] CHART
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -41,4 +42,4 @@ helm dependency build [flags] CHART
### SEE ALSO
* [helm dependency](helm_dependency.md) - manage a chart's dependencies
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_dependency_list.md b/docs/helm/helm_dependency_list.md
index b4343081c3a19c0a6127ee86790d10e2934ab79c..d6bc0175a4c54879036ebaa02d12fa5a7d5ffa06 100644
--- a/docs/helm/helm_dependency_list.md
+++ b/docs/helm/helm_dependency_list.md
@@ -26,6 +26,7 @@ helm dependency list [flags] CHART
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -33,4 +34,4 @@ helm dependency list [flags] CHART
### SEE ALSO
* [helm dependency](helm_dependency.md) - manage a chart's dependencies
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_dependency_update.md b/docs/helm/helm_dependency_update.md
index 3c90ff779755c9cc61d969f1cdc101b9c9b4e013..90b81ecea253a3c0f6b1598351ea6068d6cfe744 100644
--- a/docs/helm/helm_dependency_update.md
+++ b/docs/helm/helm_dependency_update.md
@@ -39,6 +39,7 @@ helm dependency update [flags] CHART
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -46,4 +47,4 @@ helm dependency update [flags] CHART
### SEE ALSO
* [helm dependency](helm_dependency.md) - manage a chart's dependencies
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_fetch.md b/docs/helm/helm_fetch.md
index 1ddef65fa0725f373c87fc29926768c2d8dd870b..c347d162059c4973da8b2b6374f6752c2fb8805f 100644
--- a/docs/helm/helm_fetch.md
+++ b/docs/helm/helm_fetch.md
@@ -50,9 +50,12 @@ helm fetch [flags] [chart URL | repo/chartname] [...]
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
### SEE ALSO
* [helm](helm.md) - The Helm package manager for Kubernetes.
+
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_get.md b/docs/helm/helm_get.md
index 9cd70e520207be51bc2f7dc2ae8acb9f5de0080f..f233cd2a75cb54666c0b5dca24c96cad441bf138 100644
--- a/docs/helm/helm_get.md
+++ b/docs/helm/helm_get.md
@@ -40,6 +40,7 @@ helm get [flags] RELEASE_NAME
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -50,4 +51,4 @@ helm get [flags] RELEASE_NAME
* [helm get manifest](helm_get_manifest.md) - download the manifest for a named release
* [helm get values](helm_get_values.md) - download the values file for a named release
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_get_hooks.md b/docs/helm/helm_get_hooks.md
index 85fa5d04ba6e7c9ccac285bdba644fdd1addb59c..4f9fa1887b9e44db031b281a0f30e9f2f7e2c70d 100644
--- a/docs/helm/helm_get_hooks.md
+++ b/docs/helm/helm_get_hooks.md
@@ -33,6 +33,7 @@ helm get hooks [flags] RELEASE_NAME
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -40,4 +41,4 @@ helm get hooks [flags] RELEASE_NAME
### SEE ALSO
* [helm get](helm_get.md) - download a named release
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_get_manifest.md b/docs/helm/helm_get_manifest.md
index a00c1be568a92a8b997c42b548224d721adce031..3ae55ef3e7076ff82be1d4b7e395ed27348e2d54 100644
--- a/docs/helm/helm_get_manifest.md
+++ b/docs/helm/helm_get_manifest.md
@@ -35,6 +35,7 @@ helm get manifest [flags] RELEASE_NAME
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -42,4 +43,4 @@ helm get manifest [flags] RELEASE_NAME
### SEE ALSO
* [helm get](helm_get.md) - download a named release
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_get_values.md b/docs/helm/helm_get_values.md
index d8944b4757b7cffcaabaa0f46ff9951b8f213db2..12d9731227f0a75c1473395e5b01813470644bfe 100644
--- a/docs/helm/helm_get_values.md
+++ b/docs/helm/helm_get_values.md
@@ -32,6 +32,7 @@ helm get values [flags] RELEASE_NAME
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -39,4 +40,4 @@ helm get values [flags] RELEASE_NAME
### SEE ALSO
* [helm get](helm_get.md) - download a named release
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_history.md b/docs/helm/helm_history.md
index ac51a8994509bad198b7bbc69544b3c07f0c1432..437e70f0320bcc97d31301eec29b1bdb0b13ac5b 100755
--- a/docs/helm/helm_history.md
+++ b/docs/helm/helm_history.md
@@ -45,6 +45,7 @@ helm history [flags] RELEASE_NAME
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -52,4 +53,4 @@ helm history [flags] RELEASE_NAME
### SEE ALSO
* [helm](helm.md) - The Helm package manager for Kubernetes.
-###### Auto generated by spf13/cobra on 14-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_home.md b/docs/helm/helm_home.md
index bdccd756f4d986a47b2164d7062f60619fc38fa4..9af12c91a3cbf144d05b53c6454942f765b23ae9 100644
--- a/docs/helm/helm_home.md
+++ b/docs/helm/helm_home.md
@@ -21,6 +21,7 @@ helm home
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -28,4 +29,4 @@ helm home
### SEE ALSO
* [helm](helm.md) - The Helm package manager for Kubernetes.
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_init.md b/docs/helm/helm_init.md
index 5374488af69bfb69ba36118119a9fc33d16d36a8..ec775520a1fc0cc3284a46b7e9e7d4374880a21b 100644
--- a/docs/helm/helm_init.md
+++ b/docs/helm/helm_init.md
@@ -64,6 +64,7 @@ helm init
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -71,4 +72,4 @@ helm init
### SEE ALSO
* [helm](helm.md) - The Helm package manager for Kubernetes.
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_inspect.md b/docs/helm/helm_inspect.md
index e46b3dbf45eb91f9ae8c282380aba3efbc7c04b1..4bc904f63d1afde13874c75a741f7680268daa30 100644
--- a/docs/helm/helm_inspect.md
+++ b/docs/helm/helm_inspect.md
@@ -37,6 +37,7 @@ helm inspect [CHART]
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -47,4 +48,4 @@ helm inspect [CHART]
* [helm inspect readme](helm_inspect_readme.md) - shows inspect readme
* [helm inspect values](helm_inspect_values.md) - shows inspect values
-###### Auto generated by spf13/cobra on 14-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_inspect_chart.md b/docs/helm/helm_inspect_chart.md
index cd1328b594dbdf28c7e87e6b23dc9d8579612d54..257f26051bb05709b7ac1101bc8374edd68b5f40 100644
--- a/docs/helm/helm_inspect_chart.md
+++ b/docs/helm/helm_inspect_chart.md
@@ -35,6 +35,7 @@ helm inspect chart [CHART]
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -42,4 +43,4 @@ helm inspect chart [CHART]
### SEE ALSO
* [helm inspect](helm_inspect.md) - inspect a chart
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_inspect_readme.md b/docs/helm/helm_inspect_readme.md
index 9dd9ebd43b83ddd499cf10ca3afdb8f28e0a17dc..8ff7d892e4c3c8a94dd78c249c3640eddda7715c 100644
--- a/docs/helm/helm_inspect_readme.md
+++ b/docs/helm/helm_inspect_readme.md
@@ -33,6 +33,7 @@ helm inspect readme [CHART]
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -40,4 +41,4 @@ helm inspect readme [CHART]
### SEE ALSO
* [helm inspect](helm_inspect.md) - inspect a chart
-###### Auto generated by spf13/cobra on 14-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_inspect_values.md b/docs/helm/helm_inspect_values.md
index 6a907cc7dd7e2e5cacc12ef56a82a7e61a024af3..50ff6ac244bb133356d53164dcae42689fd40287 100644
--- a/docs/helm/helm_inspect_values.md
+++ b/docs/helm/helm_inspect_values.md
@@ -35,6 +35,7 @@ helm inspect values [CHART]
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -42,4 +43,4 @@ helm inspect values [CHART]
### SEE ALSO
* [helm inspect](helm_inspect.md) - inspect a chart
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_install.md b/docs/helm/helm_install.md
index 62d02cc38b277a8dba32659273ad4a095d941bf4..dbb0879640754818a17109c8e6c48c3f2b12646d 100644
--- a/docs/helm/helm_install.md
+++ b/docs/helm/helm_install.md
@@ -112,6 +112,7 @@ helm install [CHART]
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -119,4 +120,4 @@ helm install [CHART]
### SEE ALSO
* [helm](helm.md) - The Helm package manager for Kubernetes.
-###### Auto generated by spf13/cobra on 5-Jun-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_lint.md b/docs/helm/helm_lint.md
index c10322efd4db118eb46cff6b0c1ce63fa5ebe62c..319939bcfdaff21e76fdf3ecdac4d1299d521d2d 100644
--- a/docs/helm/helm_lint.md
+++ b/docs/helm/helm_lint.md
@@ -35,6 +35,7 @@ helm lint [flags] PATH
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -42,4 +43,4 @@ helm lint [flags] PATH
### SEE ALSO
* [helm](helm.md) - The Helm package manager for Kubernetes.
-###### Auto generated by spf13/cobra on 20-May-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_list.md b/docs/helm/helm_list.md
index 99872a413904962e30865cad63f50b2e58e1d330..c7e99e40349c8bc93d1772aa2c6ef440fd264d28 100755
--- a/docs/helm/helm_list.md
+++ b/docs/helm/helm_list.md
@@ -67,6 +67,7 @@ helm list [flags] [FILTER]
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -74,4 +75,4 @@ helm list [flags] [FILTER]
### SEE ALSO
* [helm](helm.md) - The Helm package manager for Kubernetes.
-###### Auto generated by spf13/cobra on 17-Apr-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_package.md b/docs/helm/helm_package.md
index 21090fa45803ad58ac2e54261f4da6147bcdd780..30d06fcf05e52ffe084a74be14903ddb70ebbd8d 100644
--- a/docs/helm/helm_package.md
+++ b/docs/helm/helm_package.md
@@ -40,6 +40,7 @@ helm package [flags] [CHART_PATH] [...]
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -47,4 +48,4 @@ helm package [flags] [CHART_PATH] [...]
### SEE ALSO
* [helm](helm.md) - The Helm package manager for Kubernetes.
-###### Auto generated by spf13/cobra on 16-Apr-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_plugin.md b/docs/helm/helm_plugin.md
index cc42aa4dcae03ebee62df1a0c51ec17d5c874b77..bb0498d87822922af975c0c5516aa5ee646651f2 100644
--- a/docs/helm/helm_plugin.md
+++ b/docs/helm/helm_plugin.md
@@ -16,6 +16,7 @@ Manage client-side Helm plugins.
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -27,4 +28,4 @@ Manage client-side Helm plugins.
* [helm plugin remove](helm_plugin_remove.md) - remove one or more Helm plugins
* [helm plugin update](helm_plugin_update.md) - update one or more Helm plugins
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_plugin_install.md b/docs/helm/helm_plugin_install.md
index 196ca97dda541f78a009fb1495e31b45f5168e02..ab45850bf2acb5beedac37e78e5449cfb7861713 100644
--- a/docs/helm/helm_plugin_install.md
+++ b/docs/helm/helm_plugin_install.md
@@ -29,6 +29,7 @@ helm plugin install [options] <path|url>...
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -36,4 +37,4 @@ helm plugin install [options] <path|url>...
### SEE ALSO
* [helm plugin](helm_plugin.md) - add, list, or remove Helm plugins
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_plugin_list.md b/docs/helm/helm_plugin_list.md
index ddfd04ee610654fdcf2ac28b10f12ef79622d01e..dc13cdf7af974c2bd2918da981e6ba6d4a0cb572 100644
--- a/docs/helm/helm_plugin_list.md
+++ b/docs/helm/helm_plugin_list.md
@@ -18,6 +18,7 @@ helm plugin list
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -25,4 +26,4 @@ helm plugin list
### SEE ALSO
* [helm plugin](helm_plugin.md) - add, list, or remove Helm plugins
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_plugin_remove.md b/docs/helm/helm_plugin_remove.md
index 8543a367a99d187a7145eff5f5c2a614758628c9..2ef833217d2f4e83d48a8f8fd1a18c5635fdbb41 100644
--- a/docs/helm/helm_plugin_remove.md
+++ b/docs/helm/helm_plugin_remove.md
@@ -18,6 +18,7 @@ helm plugin remove <plugin>...
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -25,4 +26,4 @@ helm plugin remove <plugin>...
### SEE ALSO
* [helm plugin](helm_plugin.md) - add, list, or remove Helm plugins
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_plugin_update.md b/docs/helm/helm_plugin_update.md
index 9e5e205f090a072349eb915edadff6c988230ebd..93bc3e764502b27202c1fc80544856c8d9fdd07c 100644
--- a/docs/helm/helm_plugin_update.md
+++ b/docs/helm/helm_plugin_update.md
@@ -18,6 +18,7 @@ helm plugin update <plugin>...
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -25,4 +26,4 @@ helm plugin update <plugin>...
### SEE ALSO
* [helm plugin](helm_plugin.md) - add, list, or remove Helm plugins
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_repo.md b/docs/helm/helm_repo.md
index 4109ceca4381691f9c8a53e278e19cd1ec694470..32e9d02b256e196436d35ba26273b70a304e378d 100644
--- a/docs/helm/helm_repo.md
+++ b/docs/helm/helm_repo.md
@@ -20,6 +20,7 @@ Example usage:
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -32,4 +33,4 @@ Example usage:
* [helm repo remove](helm_repo_remove.md) - remove a chart repository
* [helm repo update](helm_repo_update.md) - update information of available charts locally from chart repositories
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_repo_add.md b/docs/helm/helm_repo_add.md
index 456ffa27ebd463410f36749a8b62bdb011d58274..1deb0cb5cc3f4a1bb04222adbc260681365aa1cb 100644
--- a/docs/helm/helm_repo_add.md
+++ b/docs/helm/helm_repo_add.md
@@ -29,6 +29,7 @@ helm repo add [flags] [NAME] [URL]
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -36,4 +37,4 @@ helm repo add [flags] [NAME] [URL]
### SEE ALSO
* [helm repo](helm_repo.md) - add, list, remove, update, and index chart repositories
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_repo_index.md b/docs/helm/helm_repo_index.md
index 14b412b291883fac5a47984a4212bd18d87bdfaa..baa1291de4951660594939222ca07039f47aeb72 100644
--- a/docs/helm/helm_repo_index.md
+++ b/docs/helm/helm_repo_index.md
@@ -34,6 +34,7 @@ helm repo index [flags] [DIR]
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -41,4 +42,4 @@ helm repo index [flags] [DIR]
### SEE ALSO
* [helm repo](helm_repo.md) - add, list, remove, update, and index chart repositories
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_repo_list.md b/docs/helm/helm_repo_list.md
index 858ef957f7ee5dad8732337cb997fe3abc0957c3..00221ed248c5158923f4377dd2da18cb9d93e34a 100644
--- a/docs/helm/helm_repo_list.md
+++ b/docs/helm/helm_repo_list.md
@@ -18,6 +18,7 @@ helm repo list [flags]
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -25,4 +26,4 @@ helm repo list [flags]
### SEE ALSO
* [helm repo](helm_repo.md) - add, list, remove, update, and index chart repositories
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_repo_remove.md b/docs/helm/helm_repo_remove.md
index 801bc3c3fea178ba3ce404cd8e7df9c0d75d81fa..272ecea47f1709aa7389465f68ef9ecb3bb0ca3f 100644
--- a/docs/helm/helm_repo_remove.md
+++ b/docs/helm/helm_repo_remove.md
@@ -18,6 +18,7 @@ helm repo remove [flags] [NAME]
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -25,4 +26,4 @@ helm repo remove [flags] [NAME]
### SEE ALSO
* [helm repo](helm_repo.md) - add, list, remove, update, and index chart repositories
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_repo_update.md b/docs/helm/helm_repo_update.md
index 897ed24b7f3d348f7e8eb2222f02fdfb495be60d..f0215da487bba4aa778c946b94d7b79b6eee8d79 100644
--- a/docs/helm/helm_repo_update.md
+++ b/docs/helm/helm_repo_update.md
@@ -24,6 +24,7 @@ helm repo update
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -31,4 +32,4 @@ helm repo update
### SEE ALSO
* [helm repo](helm_repo.md) - add, list, remove, update, and index chart repositories
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_reset.md b/docs/helm/helm_reset.md
index ed68b1b84767d61eed64c45ad3c242c13b02f96d..507a94bfdfaf38dcd5f9c9f460448ba58f281bf4 100644
--- a/docs/helm/helm_reset.md
+++ b/docs/helm/helm_reset.md
@@ -34,6 +34,7 @@ helm reset
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -41,4 +42,4 @@ helm reset
### SEE ALSO
* [helm](helm.md) - The Helm package manager for Kubernetes.
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_rollback.md b/docs/helm/helm_rollback.md
index ae64a0a26eca0baf61f2d9e8885ca20f84b16e81..b40fb883adad9300268fbb23b5968642d1e99354 100644
--- a/docs/helm/helm_rollback.md
+++ b/docs/helm/helm_rollback.md
@@ -41,6 +41,7 @@ helm rollback [flags] [RELEASE] [REVISION]
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -48,4 +49,4 @@ helm rollback [flags] [RELEASE] [REVISION]
### SEE ALSO
* [helm](helm.md) - The Helm package manager for Kubernetes.
-###### Auto generated by spf13/cobra on 13-Apr-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_search.md b/docs/helm/helm_search.md
index 1ed04e880548617d6a49f8a0c05e4e4386f2e5e7..ffee22ce4bda7614a3b309a1be2fcc95815e847b 100644
--- a/docs/helm/helm_search.md
+++ b/docs/helm/helm_search.md
@@ -32,6 +32,7 @@ helm search [keyword]
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -39,4 +40,4 @@ helm search [keyword]
### SEE ALSO
* [helm](helm.md) - The Helm package manager for Kubernetes.
-###### Auto generated by spf13/cobra on 23-Apr-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_serve.md b/docs/helm/helm_serve.md
index 90ebb6da9aa457b26a803f6e22983f58a4cce040..e300ee633040df2cd260c67a80f5b0ee600b1f10 100644
--- a/docs/helm/helm_serve.md
+++ b/docs/helm/helm_serve.md
@@ -39,6 +39,7 @@ helm serve
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -46,4 +47,4 @@ helm serve
### SEE ALSO
* [helm](helm.md) - The Helm package manager for Kubernetes.
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_status.md b/docs/helm/helm_status.md
index 02ec0ad665034d662734eb3198aa472717954d6a..5317875e6371dc3286011a95fff11837a1ee2995 100644
--- a/docs/helm/helm_status.md
+++ b/docs/helm/helm_status.md
@@ -39,6 +39,7 @@ helm status [flags] RELEASE_NAME
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -46,4 +47,4 @@ helm status [flags] RELEASE_NAME
### SEE ALSO
* [helm](helm.md) - The Helm package manager for Kubernetes.
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_template.md b/docs/helm/helm_template.md
index cdc8a84a6cc065f92973ae6aeee938da8c9f24e4..81c7fa00ef0611c90b795bc3117e0a66c8cd19d5 100644
--- a/docs/helm/helm_template.md
+++ b/docs/helm/helm_template.md
@@ -45,6 +45,7 @@ helm template [flags] CHART
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -52,4 +53,4 @@ helm template [flags] CHART
### SEE ALSO
* [helm](helm.md) - The Helm package manager for Kubernetes.
-###### Auto generated by spf13/cobra on 22-May-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_test.md b/docs/helm/helm_test.md
index 062244e73e4ab34a98040a7580725862dacae7fe..688b67a3404f7faddce5b0eb1e76fd0b94e5b16b 100644
--- a/docs/helm/helm_test.md
+++ b/docs/helm/helm_test.md
@@ -35,6 +35,7 @@ helm test [RELEASE]
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -42,4 +43,4 @@ helm test [RELEASE]
### SEE ALSO
* [helm](helm.md) - The Helm package manager for Kubernetes.
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_upgrade.md b/docs/helm/helm_upgrade.md
index b952624a52f2cdb34a1218b112afa43323ddf26f..d83231fcb8231372bfc000d37f74ae70e0e26f11 100644
--- a/docs/helm/helm_upgrade.md
+++ b/docs/helm/helm_upgrade.md
@@ -75,6 +75,7 @@ helm upgrade [RELEASE] [CHART]
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -82,4 +83,4 @@ helm upgrade [RELEASE] [CHART]
### SEE ALSO
* [helm](helm.md) - The Helm package manager for Kubernetes.
-###### Auto generated by spf13/cobra on 4-Apr-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_verify.md b/docs/helm/helm_verify.md
index bc53439377ea4b27c9861edb59eada41d1e85d41..866b3fbd80870dce5f135199af6d1599b3de6d2f 100644
--- a/docs/helm/helm_verify.md
+++ b/docs/helm/helm_verify.md
@@ -33,6 +33,7 @@ helm verify [flags] PATH
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -40,4 +41,4 @@ helm verify [flags] PATH
### SEE ALSO
* [helm](helm.md) - The Helm package manager for Kubernetes.
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/docs/helm/helm_version.md b/docs/helm/helm_version.md
index 1f48cceba5f7c2a6cf6b236db740a01f490b6f81..61636c4042f20ef0fde274700452d984ab66040c 100644
--- a/docs/helm/helm_version.md
+++ b/docs/helm/helm_version.md
@@ -48,6 +48,7 @@ helm version
--home string location of your Helm config. Overrides $HELM_HOME (default "~/.helm")
--host string address of Tiller. Overrides $HELM_HOST
--kube-context string name of the kubeconfig context to use
+ --kubeconfig string absolute path to the kubeconfig file to use
--tiller-connection-timeout int the duration (in seconds) Helm will wait to establish a connection to tiller (default 300)
--tiller-namespace string namespace of Tiller (default "kube-system")
```
@@ -55,4 +56,4 @@ helm version
### SEE ALSO
* [helm](helm.md) - The Helm package manager for Kubernetes.
-###### Auto generated by spf13/cobra on 8-Mar-2018
+###### Auto generated by spf13/cobra on 17-Jun-2018
diff --git a/pkg/helm/environment/environment.go b/pkg/helm/environment/environment.go
index 2980e6dc9c95faf8b8fc987ba33aa3543a1e4f6e..9b0acce4c730235631dca04c3e2d230d0b34b91d 100644
--- a/pkg/helm/environment/environment.go
+++ b/pkg/helm/environment/environment.go
@@ -49,6 +49,8 @@ type EnvSettings struct {
Debug bool
// KubeContext is the name of the kubeconfig context.
KubeContext string
+ // KubeConfig is the path to an explicit kubeconfig file. This overwrites the value in $KUBECONFIG
+ KubeConfig string
}
// AddFlags binds flags to the given flagset.
@@ -56,6 +58,7 @@ func (s *EnvSettings) AddFlags(fs *pflag.FlagSet) {
fs.StringVar((*string)(&s.Home), "home", DefaultHelmHome, "location of your Helm config. Overrides $HELM_HOME")
fs.StringVar(&s.TillerHost, "host", "", "address of Tiller. Overrides $HELM_HOST")
fs.StringVar(&s.KubeContext, "kube-context", "", "name of the kubeconfig context to use")
+ fs.StringVar(&s.KubeConfig, "kubeconfig", "", "absolute path to the kubeconfig file to use")
fs.BoolVar(&s.Debug, "debug", false, "enable verbose output")
fs.StringVar(&s.TillerNamespace, "tiller-namespace", "kube-system", "namespace of Tiller")
fs.Int64Var(&s.TillerConnectionTimeout, "tiller-connection-timeout", int64(300), "the duration (in seconds) Helm will wait to establish a connection to tiller")
diff --git a/pkg/helm/environment/environment_test.go b/pkg/helm/environment/environment_test.go
index 8f0caa388a5213183a179ba39293afbb6ea41762..c7d65cd5a930446e28154f50074800b9d4de0289 100644
--- a/pkg/helm/environment/environment_test.go
+++ b/pkg/helm/environment/environment_test.go
@@ -35,8 +35,8 @@ func TestEnvSettings(t *testing.T) {
envars map[string]string
// expected values
- home, host, ns, kcontext, plugins string
- debug bool
+ home, host, ns, kcontext, kconfig, plugins string
+ debug bool
}{
{
name: "defaults",
@@ -47,11 +47,12 @@ func TestEnvSettings(t *testing.T) {
},
{
name: "with flags set",
- args: []string{"--home", "/foo", "--host=here", "--debug", "--tiller-namespace=myns"},
+ args: []string{"--home", "/foo", "--host=here", "--debug", "--tiller-namespace=myns", "--kubeconfig", "/bar"},
home: "/foo",
plugins: helmpath.Home("/foo").Plugins(),
host: "here",
ns: "myns",
+ kconfig: "/bar",
debug: true,
},
{
@@ -111,6 +112,9 @@ func TestEnvSettings(t *testing.T) {
if settings.KubeContext != tt.kcontext {
t.Errorf("expected kube-context %q, got %q", tt.kcontext, settings.KubeContext)
}
+ if settings.KubeConfig != tt.kconfig {
+ t.Errorf("expected kubeconfig %q, got %q", tt.kconfig, settings.KubeConfig)
+ }
cleanup()
})
diff --git a/pkg/kube/config.go b/pkg/kube/config.go
index b6560486ef80a5a3dbd234c77634d3997aa9479c..ac0a9015d650fb36544ade33cbbe6e1dc14c1afe 100644
--- a/pkg/kube/config.go
+++ b/pkg/kube/config.go
@@ -16,10 +16,12 @@ limitations under the License.
package kube // import "k8s.io/helm/pkg/kube"
-import "k8s.io/client-go/tools/clientcmd"
+import (
+ "k8s.io/client-go/tools/clientcmd"
+)
// GetConfig returns a Kubernetes client config for a given context.
-func GetConfig(context string) clientcmd.ClientConfig {
+func GetConfig(context string, kubeconfig string) clientcmd.ClientConfig {
rules := clientcmd.NewDefaultClientConfigLoadingRules()
rules.DefaultClientConfig = &clientcmd.DefaultClientConfig
@@ -28,5 +30,10 @@ func GetConfig(context string) clientcmd.ClientConfig {
if context != "" {
overrides.CurrentContext = context
}
+
+ if kubeconfig != "" {
+ rules.ExplicitPath = kubeconfig
+ }
+
return clientcmd.NewNonInteractiveDeferredLoadingClientConfig(rules, overrides)
}