diff --git a/cmd/helm/installer/uninstall.go b/cmd/helm/installer/uninstall.go
index 14735ea85..54e79bdf4 100644
--- a/cmd/helm/installer/uninstall.go
+++ b/cmd/helm/installer/uninstall.go
@@ -19,10 +19,8 @@ package installer // import "k8s.io/helm/cmd/helm/installer"
 import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion"
-	"k8s.io/kubernetes/pkg/kubectl"
 )
 
 const (
@@ -52,8 +50,7 @@ func deleteService(client coreclient.ServicesGetter, namespace string) error {
 // We need to use the reaper instead of the kube API because GC for deployment dependents
 // is not yet supported at the k8s server level (<= 1.5)
 func deleteDeployment(client internalclientset.Interface, namespace string) error {
-	reaper, _ := kubectl.ReaperFor(extensions.Kind("Deployment"), client)
-	err := reaper.Stop(namespace, deploymentName, 0, nil)
+	err := client.Extensions().Deployments(namespace).Delete(deploymentName, &metav1.DeleteOptions{})
 	return ingoreNotFound(err)
 }
 
diff --git a/cmd/helm/installer/uninstall_test.go b/cmd/helm/installer/uninstall_test.go
index 195b209bc..7e5be8aaa 100644
--- a/cmd/helm/installer/uninstall_test.go
+++ b/cmd/helm/installer/uninstall_test.go
@@ -34,8 +34,8 @@ func TestUninstall(t *testing.T) {
 		t.Errorf("unexpected error: %#+v", err)
 	}
 
-	if actions := fc.Actions(); len(actions) != 7 {
-		t.Errorf("unexpected actions: %v, expected 7 actions got %d", actions, len(actions))
+	if actions := fc.Actions(); len(actions) != 3 {
+		t.Errorf("unexpected actions: %v, expected 3 actions got %d", actions, len(actions))
 	}
 }
 
@@ -50,8 +50,8 @@ func TestUninstall_serviceNotFound(t *testing.T) {
 		t.Errorf("unexpected error: %#+v", err)
 	}
 
-	if actions := fc.Actions(); len(actions) != 7 {
-		t.Errorf("unexpected actions: %v, expected 7 actions got %d", actions, len(actions))
+	if actions := fc.Actions(); len(actions) != 3 {
+		t.Errorf("unexpected actions: %v, expected 3 actions got %d", actions, len(actions))
 	}
 }
 
@@ -66,8 +66,8 @@ func TestUninstall_deploymentNotFound(t *testing.T) {
 		t.Errorf("unexpected error: %#+v", err)
 	}
 
-	if actions := fc.Actions(); len(actions) != 7 {
-		t.Errorf("unexpected actions: %v, expected 7 actions got %d", actions, len(actions))
+	if actions := fc.Actions(); len(actions) != 3 {
+		t.Errorf("unexpected actions: %v, expected 3 actions got %d", actions, len(actions))
 	}
 }
 
@@ -82,7 +82,7 @@ func TestUninstall_secretNotFound(t *testing.T) {
 		t.Errorf("unexpected error: %#+v", err)
 	}
 
-	if actions := fc.Actions(); len(actions) != 7 {
-		t.Errorf("unexpected actions: %v, expect 7 actions got %d", actions, len(actions))
+	if actions := fc.Actions(); len(actions) != 3 {
+		t.Errorf("unexpected actions: %v, expect 3 actions got %d", actions, len(actions))
 	}
 }
diff --git a/docs/helm/helm.md b/docs/helm/helm.md
index ae27de401..67ac9a4a2 100644
--- a/docs/helm/helm.md
+++ b/docs/helm/helm.md
@@ -4,7 +4,6 @@ The Helm package manager for Kubernetes.
 
 ### Synopsis
 
-
 The Kubernetes package manager
 
 To begin working with Helm, run the 'helm init' command:
@@ -33,6 +32,7 @@ Environment:
 
 ```
       --debug                           enable verbose output
+  -h, --help                            help for helm
       --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
@@ -42,6 +42,7 @@ Environment:
 ```
 
 ### SEE ALSO
+
 * [helm completion](helm_completion.md)	 - Generate autocompletions script for the specified shell (bash or zsh)
 * [helm create](helm_create.md)	 - create a new chart with the given name
 * [helm delete](helm_delete.md)	 - given a release name, delete the release from Kubernetes
@@ -69,4 +70,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 17-Jun-2018
+###### Auto generated by spf13/cobra on 1-Aug-2018
diff --git a/docs/helm/helm_completion.md b/docs/helm/helm_completion.md
index 64a6056f8..440393076 100644
--- a/docs/helm/helm_completion.md
+++ b/docs/helm/helm_completion.md
@@ -5,7 +5,6 @@ Generate autocompletions script for the specified shell (bash or zsh)
 ### Synopsis
 
 
-
 Generate autocompletions script for Helm for the specified shell (bash or zsh).
 
 This command can generate shell autocompletions. e.g.
@@ -18,7 +17,13 @@ Can be sourced as such
 
 
 ```
-helm completion SHELL
+helm completion SHELL [flags]
+```
+
+### Options
+
+```
+  -h, --help   help for completion
 ```
 
 ### Options inherited from parent commands
@@ -34,6 +39,7 @@ helm completion SHELL
 ```
 
 ### SEE ALSO
+
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 17-Jun-2018
+###### Auto generated by spf13/cobra on 1-Aug-2018
diff --git a/docs/helm/helm_create.md b/docs/helm/helm_create.md
index 7ae947ed7..0e20d9860 100644
--- a/docs/helm/helm_create.md
+++ b/docs/helm/helm_create.md
@@ -5,7 +5,6 @@ create a new chart with the given name
 ### Synopsis
 
 
-
 This command creates a chart directory along with the common files and
 directories used in a chart.
 
@@ -31,12 +30,13 @@ will be overwritten, but other files will be left alone.
 
 
 ```
-helm create NAME
+helm create NAME [flags]
 ```
 
 ### Options
 
 ```
+  -h, --help             help for create
   -p, --starter string   the named Helm starter scaffold
 ```
 
@@ -53,6 +53,7 @@ helm create NAME
 ```
 
 ### SEE ALSO
+
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 17-Jun-2018
+###### Auto generated by spf13/cobra on 1-Aug-2018
diff --git a/docs/helm/helm_delete.md b/docs/helm/helm_delete.md
index 442e5e96c..3c6a46844 100644
--- a/docs/helm/helm_delete.md
+++ b/docs/helm/helm_delete.md
@@ -5,7 +5,6 @@ given a release name, delete the release from Kubernetes
 ### Synopsis
 
 
-
 This command takes a release name, and then deletes the release from Kubernetes.
 It removes all of the resources associated with the last release of the chart.
 
@@ -22,6 +21,7 @@ helm delete [flags] RELEASE_NAME [...]
 ```
       --description string    specify a description for the release
       --dry-run               simulate a delete
+  -h, --help                  help for delete
       --no-hooks              prevent hooks from running during deletion
       --purge                 remove the release from the store and make its name free for later use
       --timeout int           time in seconds to wait for any individual Kubernetes operation (like Jobs for hooks) (default 300)
@@ -46,6 +46,7 @@ helm delete [flags] RELEASE_NAME [...]
 ```
 
 ### SEE ALSO
+
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 7-Aug-2018
+###### Auto generated by spf13/cobra on 10-Aug-2018
diff --git a/docs/helm/helm_dependency.md b/docs/helm/helm_dependency.md
index b0085c6c7..317860bdb 100644
--- a/docs/helm/helm_dependency.md
+++ b/docs/helm/helm_dependency.md
@@ -5,7 +5,6 @@ manage a chart's dependencies
 ### Synopsis
 
 
-
 Manage the dependencies of a chart.
 
 Helm charts store their dependencies in 'charts/'. For chart developers, it is
@@ -54,6 +53,12 @@ repository added to helm by "helm add repo". Version matching is also supported
 for this case.
 
 
+### Options
+
+```
+  -h, --help   help for dependency
+```
+
 ### Options inherited from parent commands
 
 ```
@@ -67,9 +72,10 @@ for this case.
 ```
 
 ### SEE ALSO
+
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 * [helm dependency build](helm_dependency_build.md)	 - rebuild the charts/ directory based on the requirements.lock file
 * [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 17-Jun-2018
+###### Auto generated by spf13/cobra on 1-Aug-2018
diff --git a/docs/helm/helm_dependency_build.md b/docs/helm/helm_dependency_build.md
index eea2fa02c..fba70f2ec 100644
--- a/docs/helm/helm_dependency_build.md
+++ b/docs/helm/helm_dependency_build.md
@@ -5,7 +5,6 @@ rebuild the charts/ directory based on the requirements.lock file
 ### Synopsis
 
 
-
 Build out the charts/ directory from the requirements.lock file.
 
 Build is used to reconstruct a chart's dependencies to the state specified in
@@ -23,6 +22,7 @@ helm dependency build [flags] CHART
 ### Options
 
 ```
+  -h, --help             help for build
       --keyring string   keyring containing public keys (default "~/.gnupg/pubring.gpg")
       --verify           verify the packages against signatures
 ```
@@ -40,6 +40,7 @@ helm dependency build [flags] CHART
 ```
 
 ### SEE ALSO
+
 * [helm dependency](helm_dependency.md)	 - manage a chart's dependencies
 
-###### Auto generated by spf13/cobra on 17-Jun-2018
+###### Auto generated by spf13/cobra on 1-Aug-2018
diff --git a/docs/helm/helm_dependency_list.md b/docs/helm/helm_dependency_list.md
index d6bc0175a..da754c5d1 100644
--- a/docs/helm/helm_dependency_list.md
+++ b/docs/helm/helm_dependency_list.md
@@ -5,7 +5,6 @@ list the dependencies for the given chart
 ### Synopsis
 
 
-
 List all of the dependencies declared in a chart.
 
 This can take chart archives and chart directories as input. It will not alter
@@ -19,6 +18,12 @@ if it cannot find a requirements.yaml.
 helm dependency list [flags] CHART
 ```
 
+### Options
+
+```
+  -h, --help   help for list
+```
+
 ### Options inherited from parent commands
 
 ```
@@ -32,6 +37,7 @@ helm dependency list [flags] CHART
 ```
 
 ### SEE ALSO
+
 * [helm dependency](helm_dependency.md)	 - manage a chart's dependencies
 
-###### Auto generated by spf13/cobra on 17-Jun-2018
+###### Auto generated by spf13/cobra on 1-Aug-2018
diff --git a/docs/helm/helm_dependency_update.md b/docs/helm/helm_dependency_update.md
index 90b81ecea..88bf3fafd 100644
--- a/docs/helm/helm_dependency_update.md
+++ b/docs/helm/helm_dependency_update.md
@@ -5,7 +5,6 @@ update charts/ based on the contents of requirements.yaml
 ### Synopsis
 
 
-
 Update the on-disk dependencies to mirror the requirements.yaml file.
 
 This command verifies that the required charts, as expressed in 'requirements.yaml',
@@ -27,6 +26,7 @@ helm dependency update [flags] CHART
 ### Options
 
 ```
+  -h, --help             help for update
       --keyring string   keyring containing public keys (default "~/.gnupg/pubring.gpg")
       --skip-refresh     do not refresh the local repository cache
       --verify           verify the packages against signatures
@@ -45,6 +45,7 @@ helm dependency update [flags] CHART
 ```
 
 ### SEE ALSO
+
 * [helm dependency](helm_dependency.md)	 - manage a chart's dependencies
 
-###### Auto generated by spf13/cobra on 17-Jun-2018
+###### Auto generated by spf13/cobra on 1-Aug-2018
diff --git a/docs/helm/helm_fetch.md b/docs/helm/helm_fetch.md
index c347d1620..81c0a9596 100644
--- a/docs/helm/helm_fetch.md
+++ b/docs/helm/helm_fetch.md
@@ -5,7 +5,6 @@ download a chart from a repository and (optionally) unpack it in local directory
 ### Synopsis
 
 
-
 Retrieve a package from a package repository, and download it locally.
 
 This is useful for fetching packages to inspect, modify, or repackage. It can
@@ -31,6 +30,7 @@ helm fetch [flags] [chart URL | repo/chartname] [...]
       --cert-file string     identify HTTPS client using this SSL certificate file
   -d, --destination string   location to write the chart. If this and tardir are specified, tardir is appended to this (default ".")
       --devel                use development versions, too. Equivalent to version '>0.0.0-0'. If --version is set, this is ignored.
+  -h, --help                 help for fetch
       --key-file string      identify HTTPS client using this SSL key file
       --keyring string       keyring containing public keys (default "~/.gnupg/pubring.gpg")
       --password string      chart repository password
@@ -56,6 +56,7 @@ helm fetch [flags] [chart URL | repo/chartname] [...]
 ```
 
 ### SEE ALSO
+
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 17-Jun-2018
+###### Auto generated by spf13/cobra on 1-Aug-2018
diff --git a/docs/helm/helm_get.md b/docs/helm/helm_get.md
index 3a1b3d442..e7337b533 100644
--- a/docs/helm/helm_get.md
+++ b/docs/helm/helm_get.md
@@ -5,7 +5,6 @@ download a named release
 ### Synopsis
 
 
-
 This command shows the details of a named release.
 
 It can be used to get extended information about the release, including:
@@ -25,6 +24,7 @@ helm get [flags] RELEASE_NAME
 ### Options
 
 ```
+  -h, --help                  help for get
       --revision int32        get the named release with revision
       --tls                   enable TLS for request
       --tls-ca-cert string    path to TLS CA certificate file (default "$HELM_HOME/ca.pem")
@@ -47,9 +47,10 @@ helm get [flags] RELEASE_NAME
 ```
 
 ### SEE ALSO
+
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 * [helm get hooks](helm_get_hooks.md)	 - download all hooks for a named release
 * [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 7-Aug-2018
+###### Auto generated by spf13/cobra on 10-Aug-2018
diff --git a/docs/helm/helm_get_hooks.md b/docs/helm/helm_get_hooks.md
index 9f3d5b0b2..d7097fd59 100644
--- a/docs/helm/helm_get_hooks.md
+++ b/docs/helm/helm_get_hooks.md
@@ -5,7 +5,6 @@ download all hooks for a named release
 ### Synopsis
 
 
-
 This command downloads hooks for a given release.
 
 Hooks are formatted in YAML and separated by the YAML '---\n' separator.
@@ -18,6 +17,7 @@ helm get hooks [flags] RELEASE_NAME
 ### Options
 
 ```
+  -h, --help                  help for hooks
       --revision int32        get the named release with revision
       --tls                   enable TLS for request
       --tls-ca-cert string    path to TLS CA certificate file (default "$HELM_HOME/ca.pem")
@@ -40,6 +40,7 @@ helm get hooks [flags] RELEASE_NAME
 ```
 
 ### SEE ALSO
+
 * [helm get](helm_get.md)	 - download a named release
 
-###### Auto generated by spf13/cobra on 7-Aug-2018
+###### Auto generated by spf13/cobra on 10-Aug-2018
diff --git a/docs/helm/helm_get_manifest.md b/docs/helm/helm_get_manifest.md
index 6cae9001f..60bfeac0b 100644
--- a/docs/helm/helm_get_manifest.md
+++ b/docs/helm/helm_get_manifest.md
@@ -5,7 +5,6 @@ download the manifest for a named release
 ### Synopsis
 
 
-
 This command fetches the generated manifest for a given release.
 
 A manifest is a YAML-encoded representation of the Kubernetes resources that
@@ -20,6 +19,7 @@ helm get manifest [flags] RELEASE_NAME
 ### Options
 
 ```
+  -h, --help                  help for manifest
       --revision int32        get the named release with revision
       --tls                   enable TLS for request
       --tls-ca-cert string    path to TLS CA certificate file (default "$HELM_HOME/ca.pem")
@@ -42,6 +42,7 @@ helm get manifest [flags] RELEASE_NAME
 ```
 
 ### SEE ALSO
+
 * [helm get](helm_get.md)	 - download a named release
 
-###### Auto generated by spf13/cobra on 7-Aug-2018
+###### Auto generated by spf13/cobra on 10-Aug-2018
diff --git a/docs/helm/helm_get_values.md b/docs/helm/helm_get_values.md
index 01fee2cd2..7208d5885 100644
--- a/docs/helm/helm_get_values.md
+++ b/docs/helm/helm_get_values.md
@@ -5,7 +5,6 @@ download the values file for a named release
 ### Synopsis
 
 
-
 This command downloads a values file for a given release.
 
 
@@ -17,6 +16,7 @@ helm get values [flags] RELEASE_NAME
 
 ```
   -a, --all                   dump all (computed) values
+  -h, --help                  help for values
       --revision int32        get the named release with revision
       --tls                   enable TLS for request
       --tls-ca-cert string    path to TLS CA certificate file (default "$HELM_HOME/ca.pem")
@@ -39,6 +39,7 @@ helm get values [flags] RELEASE_NAME
 ```
 
 ### SEE ALSO
+
 * [helm get](helm_get.md)	 - download a named release
 
-###### Auto generated by spf13/cobra on 7-Aug-2018
+###### Auto generated by spf13/cobra on 10-Aug-2018
diff --git a/docs/helm/helm_history.md b/docs/helm/helm_history.md
index e5028f9cb..7f0a68928 100755
--- a/docs/helm/helm_history.md
+++ b/docs/helm/helm_history.md
@@ -5,7 +5,6 @@ fetch release history
 ### Synopsis
 
 
-
 History prints historical revisions for a given release.
 
 A default maximum of 256 revisions will be returned. Setting '--max'
@@ -29,6 +28,7 @@ helm history [flags] RELEASE_NAME
 
 ```
       --col-width uint        specifies the max column width of output (default 60)
+  -h, --help                  help for history
       --max int32             maximum number of revision to include in history (default 256)
   -o, --output string         prints the output in the specified format (json|table|yaml) (default "table")
       --tls                   enable TLS for request
@@ -52,6 +52,7 @@ helm history [flags] RELEASE_NAME
 ```
 
 ### SEE ALSO
+
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 7-Aug-2018
+###### Auto generated by spf13/cobra on 10-Aug-2018
diff --git a/docs/helm/helm_home.md b/docs/helm/helm_home.md
index 9af12c91a..192302424 100644
--- a/docs/helm/helm_home.md
+++ b/docs/helm/helm_home.md
@@ -5,13 +5,18 @@ displays the location of HELM_HOME
 ### Synopsis
 
 
-
 This command displays the location of HELM_HOME. This is where
 any helm configuration files live.
 
 
 ```
-helm home
+helm home [flags]
+```
+
+### Options
+
+```
+  -h, --help   help for home
 ```
 
 ### Options inherited from parent commands
@@ -27,6 +32,7 @@ helm home
 ```
 
 ### SEE ALSO
+
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 17-Jun-2018
+###### Auto generated by spf13/cobra on 1-Aug-2018
diff --git a/docs/helm/helm_init.md b/docs/helm/helm_init.md
index ec775520a..430cc3d0e 100644
--- a/docs/helm/helm_init.md
+++ b/docs/helm/helm_init.md
@@ -5,7 +5,6 @@ initialize Helm on both client and server
 ### Synopsis
 
 
-
 This command installs Tiller (the Helm server-side component) onto your
 Kubernetes Cluster and sets up local configuration in $HELM_HOME (default ~/.helm/).
 
@@ -27,7 +26,7 @@ To dump a manifest containing the Tiller deployment YAML, combine the
 
 
 ```
-helm init
+helm init [flags]
 ```
 
 ### Options
@@ -37,6 +36,7 @@ helm init
   -c, --client-only              if set does not install Tiller
       --dry-run                  do not install local or remote
       --force-upgrade            force upgrade of Tiller to the current helm version
+  -h, --help                     help for init
       --history-max int          limit the maximum number of revisions saved per release. Use 0 for no limit.
       --local-repo-url string    URL for local repository (default "http://127.0.0.1:8879/charts")
       --net-host                 install Tiller with net=host
@@ -70,6 +70,7 @@ helm init
 ```
 
 ### SEE ALSO
+
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 17-Jun-2018
+###### Auto generated by spf13/cobra on 1-Aug-2018
diff --git a/docs/helm/helm_inspect.md b/docs/helm/helm_inspect.md
index 4bc904f63..86689eeaa 100644
--- a/docs/helm/helm_inspect.md
+++ b/docs/helm/helm_inspect.md
@@ -5,7 +5,6 @@ inspect a chart
 ### Synopsis
 
 
-
 This command inspects a chart and displays information. It takes a chart reference
 ('stable/drupal'), a full path to a directory or packaged chart, or a URL.
 
@@ -13,7 +12,7 @@ Inspect prints the contents of the Chart.yaml file and the values.yaml file.
 
 
 ```
-helm inspect [CHART]
+helm inspect [CHART] [flags]
 ```
 
 ### Options
@@ -21,6 +20,7 @@ helm inspect [CHART]
 ```
       --ca-file string     chart repository url where to locate the requested chart
       --cert-file string   verify certificates of HTTPS-enabled servers using this CA bundle
+  -h, --help               help for inspect
       --key-file string    identify HTTPS client using this SSL key file
       --keyring string     path to the keyring containing public verification keys (default "~/.gnupg/pubring.gpg")
       --password string    chart repository password where to locate the requested chart
@@ -43,9 +43,10 @@ helm inspect [CHART]
 ```
 
 ### SEE ALSO
+
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 * [helm inspect chart](helm_inspect_chart.md)	 - shows 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 17-Jun-2018
+###### Auto generated by spf13/cobra on 1-Aug-2018
diff --git a/docs/helm/helm_inspect_chart.md b/docs/helm/helm_inspect_chart.md
index 257f26051..2b9adbb7e 100644
--- a/docs/helm/helm_inspect_chart.md
+++ b/docs/helm/helm_inspect_chart.md
@@ -5,13 +5,12 @@ shows inspect chart
 ### Synopsis
 
 
-
 This command inspects a chart (directory, file, or URL) and displays the contents
 of the Charts.yaml file
 
 
 ```
-helm inspect chart [CHART]
+helm inspect chart [CHART] [flags]
 ```
 
 ### Options
@@ -19,6 +18,7 @@ helm inspect chart [CHART]
 ```
       --ca-file string     chart repository url where to locate the requested chart
       --cert-file string   verify certificates of HTTPS-enabled servers using this CA bundle
+  -h, --help               help for chart
       --key-file string    identify HTTPS client using this SSL key file
       --keyring string     path to the keyring containing public verification keys (default "~/.gnupg/pubring.gpg")
       --password string    chart repository password where to locate the requested chart
@@ -41,6 +41,7 @@ helm inspect chart [CHART]
 ```
 
 ### SEE ALSO
+
 * [helm inspect](helm_inspect.md)	 - inspect a chart
 
-###### Auto generated by spf13/cobra on 17-Jun-2018
+###### Auto generated by spf13/cobra on 1-Aug-2018
diff --git a/docs/helm/helm_inspect_readme.md b/docs/helm/helm_inspect_readme.md
index 8ff7d892e..d222cd53a 100644
--- a/docs/helm/helm_inspect_readme.md
+++ b/docs/helm/helm_inspect_readme.md
@@ -5,13 +5,12 @@ shows inspect readme
 ### Synopsis
 
 
-
 This command inspects a chart (directory, file, or URL) and displays the contents
 of the README file
 
 
 ```
-helm inspect readme [CHART]
+helm inspect readme [CHART] [flags]
 ```
 
 ### Options
@@ -19,6 +18,7 @@ helm inspect readme [CHART]
 ```
       --ca-file string     chart repository url where to locate the requested chart
       --cert-file string   verify certificates of HTTPS-enabled servers using this CA bundle
+  -h, --help               help for readme
       --key-file string    identify HTTPS client using this SSL key file
       --keyring string     path to the keyring containing public verification keys (default "~/.gnupg/pubring.gpg")
       --repo string        chart repository url where to locate the requested chart
@@ -39,6 +39,7 @@ helm inspect readme [CHART]
 ```
 
 ### SEE ALSO
+
 * [helm inspect](helm_inspect.md)	 - inspect a chart
 
-###### Auto generated by spf13/cobra on 17-Jun-2018
+###### Auto generated by spf13/cobra on 1-Aug-2018
diff --git a/docs/helm/helm_inspect_values.md b/docs/helm/helm_inspect_values.md
index 50ff6ac24..9cca2fc32 100644
--- a/docs/helm/helm_inspect_values.md
+++ b/docs/helm/helm_inspect_values.md
@@ -5,13 +5,12 @@ shows inspect values
 ### Synopsis
 
 
-
 This command inspects a chart (directory, file, or URL) and displays the contents
 of the values.yaml file
 
 
 ```
-helm inspect values [CHART]
+helm inspect values [CHART] [flags]
 ```
 
 ### Options
@@ -19,6 +18,7 @@ helm inspect values [CHART]
 ```
       --ca-file string     chart repository url where to locate the requested chart
       --cert-file string   verify certificates of HTTPS-enabled servers using this CA bundle
+  -h, --help               help for values
       --key-file string    identify HTTPS client using this SSL key file
       --keyring string     path to the keyring containing public verification keys (default "~/.gnupg/pubring.gpg")
       --password string    chart repository password where to locate the requested chart
@@ -41,6 +41,7 @@ helm inspect values [CHART]
 ```
 
 ### SEE ALSO
+
 * [helm inspect](helm_inspect.md)	 - inspect a chart
 
-###### Auto generated by spf13/cobra on 17-Jun-2018
+###### Auto generated by spf13/cobra on 1-Aug-2018
diff --git a/docs/helm/helm_install.md b/docs/helm/helm_install.md
index 6e0948e8f..05cdf1e4a 100644
--- a/docs/helm/helm_install.md
+++ b/docs/helm/helm_install.md
@@ -5,7 +5,6 @@ install a chart archive
 ### Synopsis
 
 
-
 This command installs a chart archive.
 
 The install argument must be a chart reference, a path to a packaged chart,
@@ -73,7 +72,7 @@ charts in a repository, use 'helm search'.
 
 
 ```
-helm install [CHART]
+helm install [CHART] [flags]
 ```
 
 ### Options
@@ -85,6 +84,7 @@ helm install [CHART]
       --description string       specify a description for the release
       --devel                    use development versions, too. Equivalent to version '>0.0.0-0'. If --version is set, this is ignored.
       --dry-run                  simulate an install
+  -h, --help                     help for install
       --key-file string          identify HTTPS client using this SSL key file
       --keyring string           location of public keys used for verification (default "~/.gnupg/pubring.gpg")
   -n, --name string              release name. If unspecified, it will autogenerate one for you
@@ -125,6 +125,7 @@ helm install [CHART]
 ```
 
 ### SEE ALSO
+
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 7-Aug-2018
+###### Auto generated by spf13/cobra on 10-Aug-2018
diff --git a/docs/helm/helm_lint.md b/docs/helm/helm_lint.md
index 9c328a086..bf168184e 100644
--- a/docs/helm/helm_lint.md
+++ b/docs/helm/helm_lint.md
@@ -5,7 +5,6 @@ examines a chart for possible issues
 ### Synopsis
 
 
-
 This command takes a path to a chart and runs a series of tests to verify that
 the chart is well-formed.
 
@@ -21,6 +20,7 @@ helm lint [flags] PATH
 ### Options
 
 ```
+  -h, --help                     help for lint
       --namespace string         namespace to put the release into (default "default")
       --set stringArray          set values on the command line (can specify multiple or separate values with commas: key1=val1,key2=val2)
       --set-file stringArray     set values from respective files specified via the command line (can specify multiple or separate values with commas: key1=path1,key2=path2)
@@ -42,6 +42,7 @@ helm lint [flags] PATH
 ```
 
 ### SEE ALSO
+
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 25-Jul-2018
+###### Auto generated by spf13/cobra on 1-Aug-2018
diff --git a/docs/helm/helm_list.md b/docs/helm/helm_list.md
index 17b2573b8..bf740239d 100755
--- a/docs/helm/helm_list.md
+++ b/docs/helm/helm_list.md
@@ -5,7 +5,6 @@ list releases
 ### Synopsis
 
 
-
 This command lists all of the releases.
 
 By default, it lists only releases that are deployed or failed. Flags like
@@ -46,6 +45,7 @@ helm list [flags] [FILTER]
       --deleting              show releases that are currently being deleted
       --deployed              show deployed releases. If no other is specified, this will be automatically enabled
       --failed                show failed releases
+  -h, --help                  help for list
   -m, --max int               maximum number of releases to fetch (default 256)
       --namespace string      show releases within a specific namespace
   -o, --offset string         next release name in the list, used to offset from start value
@@ -74,6 +74,7 @@ helm list [flags] [FILTER]
 ```
 
 ### SEE ALSO
+
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 7-Aug-2018
+###### Auto generated by spf13/cobra on 10-Aug-2018
diff --git a/docs/helm/helm_package.md b/docs/helm/helm_package.md
index 30d06fcf0..b772fa70c 100644
--- a/docs/helm/helm_package.md
+++ b/docs/helm/helm_package.md
@@ -5,7 +5,6 @@ package a chart directory into a chart archive
 ### Synopsis
 
 
-
 This command packages a chart into a versioned chart archive file. If a path
 is given, this will look at that path for a chart (which must contain a
 Chart.yaml file) and then package that directory.
@@ -26,6 +25,7 @@ helm package [flags] [CHART_PATH] [...]
       --app-version string   set the appVersion on the chart to this version
   -u, --dependency-update    update dependencies from "requirements.yaml" to dir "charts/" before packaging
   -d, --destination string   location to write the chart. (default ".")
+  -h, --help                 help for package
       --key string           name of the key to use when signing. Used if --sign is true
       --keyring string       location of a public keyring (default "~/.gnupg/pubring.gpg")
       --save                 save packaged chart to local chart repository (default true)
@@ -46,6 +46,7 @@ helm package [flags] [CHART_PATH] [...]
 ```
 
 ### SEE ALSO
+
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 17-Jun-2018
+###### Auto generated by spf13/cobra on 1-Aug-2018
diff --git a/docs/helm/helm_plugin.md b/docs/helm/helm_plugin.md
index bb0498d87..5aa57b69c 100644
--- a/docs/helm/helm_plugin.md
+++ b/docs/helm/helm_plugin.md
@@ -5,10 +5,15 @@ add, list, or remove Helm plugins
 ### Synopsis
 
 
-
 Manage client-side Helm plugins.
 
 
+### Options
+
+```
+  -h, --help   help for plugin
+```
+
 ### Options inherited from parent commands
 
 ```
@@ -22,10 +27,11 @@ Manage client-side Helm plugins.
 ```
 
 ### SEE ALSO
+
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 * [helm plugin install](helm_plugin_install.md)	 - install one or more Helm plugins
 * [helm plugin list](helm_plugin_list.md)	 - list installed 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 17-Jun-2018
+###### Auto generated by spf13/cobra on 1-Aug-2018
diff --git a/docs/helm/helm_plugin_install.md b/docs/helm/helm_plugin_install.md
index ab45850bf..f30bfff55 100644
--- a/docs/helm/helm_plugin_install.md
+++ b/docs/helm/helm_plugin_install.md
@@ -5,7 +5,6 @@ install one or more Helm plugins
 ### Synopsis
 
 
-
 This command allows you to install a plugin from a url to a VCS repo or a local path.
 
 Example usage:
@@ -13,12 +12,13 @@ Example usage:
 
 
 ```
-helm plugin install [options] <path|url>...
+helm plugin install [options] <path|url>... [flags]
 ```
 
 ### Options
 
 ```
+  -h, --help             help for install
       --version string   specify a version constraint. If this is not specified, the latest version is installed
 ```
 
@@ -35,6 +35,7 @@ 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 17-Jun-2018
+###### Auto generated by spf13/cobra on 1-Aug-2018
diff --git a/docs/helm/helm_plugin_list.md b/docs/helm/helm_plugin_list.md
index dc13cdf7a..373462e2b 100644
--- a/docs/helm/helm_plugin_list.md
+++ b/docs/helm/helm_plugin_list.md
@@ -4,11 +4,16 @@ list installed Helm plugins
 
 ### Synopsis
 
-
 list installed Helm plugins
 
 ```
-helm plugin list
+helm plugin list [flags]
+```
+
+### Options
+
+```
+  -h, --help   help for list
 ```
 
 ### Options inherited from parent commands
@@ -24,6 +29,7 @@ helm plugin list
 ```
 
 ### SEE ALSO
+
 * [helm plugin](helm_plugin.md)	 - add, list, or remove Helm plugins
 
-###### Auto generated by spf13/cobra on 17-Jun-2018
+###### Auto generated by spf13/cobra on 1-Aug-2018
diff --git a/docs/helm/helm_plugin_remove.md b/docs/helm/helm_plugin_remove.md
index 2ef833217..30f222c9f 100644
--- a/docs/helm/helm_plugin_remove.md
+++ b/docs/helm/helm_plugin_remove.md
@@ -4,11 +4,16 @@ remove one or more Helm plugins
 
 ### Synopsis
 
-
 remove one or more Helm plugins
 
 ```
-helm plugin remove <plugin>...
+helm plugin remove <plugin>... [flags]
+```
+
+### Options
+
+```
+  -h, --help   help for remove
 ```
 
 ### Options inherited from parent commands
@@ -24,6 +29,7 @@ helm plugin remove <plugin>...
 ```
 
 ### SEE ALSO
+
 * [helm plugin](helm_plugin.md)	 - add, list, or remove Helm plugins
 
-###### Auto generated by spf13/cobra on 17-Jun-2018
+###### Auto generated by spf13/cobra on 1-Aug-2018
diff --git a/docs/helm/helm_plugin_update.md b/docs/helm/helm_plugin_update.md
index 93bc3e764..65b16cd9d 100644
--- a/docs/helm/helm_plugin_update.md
+++ b/docs/helm/helm_plugin_update.md
@@ -4,11 +4,16 @@ update one or more Helm plugins
 
 ### Synopsis
 
-
 update one or more Helm plugins
 
 ```
-helm plugin update <plugin>...
+helm plugin update <plugin>... [flags]
+```
+
+### Options
+
+```
+  -h, --help   help for update
 ```
 
 ### Options inherited from parent commands
@@ -24,6 +29,7 @@ helm plugin update <plugin>...
 ```
 
 ### SEE ALSO
+
 * [helm plugin](helm_plugin.md)	 - add, list, or remove Helm plugins
 
-###### Auto generated by spf13/cobra on 17-Jun-2018
+###### Auto generated by spf13/cobra on 1-Aug-2018
diff --git a/docs/helm/helm_repo.md b/docs/helm/helm_repo.md
index 32e9d02b2..0b73fbcd0 100644
--- a/docs/helm/helm_repo.md
+++ b/docs/helm/helm_repo.md
@@ -5,7 +5,6 @@ add, list, remove, update, and index chart repositories
 ### Synopsis
 
 
-
 This command consists of multiple subcommands to interact with chart repositories.
 
 It can be used to add, remove, list, and index chart repositories.
@@ -13,6 +12,12 @@ Example usage:
     $ helm repo add [NAME] [REPO_URL]
 
 
+### Options
+
+```
+  -h, --help   help for repo
+```
+
 ### Options inherited from parent commands
 
 ```
@@ -26,6 +31,7 @@ Example usage:
 ```
 
 ### SEE ALSO
+
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 * [helm repo add](helm_repo_add.md)	 - add a chart repository
 * [helm repo index](helm_repo_index.md)	 - generate an index file given a directory containing packaged charts
@@ -33,4 +39,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 17-Jun-2018
+###### Auto generated by spf13/cobra on 1-Aug-2018
diff --git a/docs/helm/helm_repo_add.md b/docs/helm/helm_repo_add.md
index 1deb0cb5c..29947147d 100644
--- a/docs/helm/helm_repo_add.md
+++ b/docs/helm/helm_repo_add.md
@@ -4,7 +4,6 @@ add a chart repository
 
 ### Synopsis
 
-
 add a chart repository
 
 ```
@@ -16,6 +15,7 @@ helm repo add [flags] [NAME] [URL]
 ```
       --ca-file string     verify certificates of HTTPS-enabled servers using this CA bundle
       --cert-file string   identify HTTPS client using this SSL certificate file
+  -h, --help               help for add
       --key-file string    identify HTTPS client using this SSL key file
       --no-update          raise error if repo is already registered
       --password string    chart repository password
@@ -35,6 +35,7 @@ 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 17-Jun-2018
+###### Auto generated by spf13/cobra on 1-Aug-2018
diff --git a/docs/helm/helm_repo_index.md b/docs/helm/helm_repo_index.md
index baa1291de..4660489f9 100644
--- a/docs/helm/helm_repo_index.md
+++ b/docs/helm/helm_repo_index.md
@@ -5,7 +5,6 @@ generate an index file given a directory containing packaged charts
 ### Synopsis
 
 
-
 Read the current directory and generate an index file based on the charts found.
 
 This tool is used for creating an 'index.yaml' file for a chart repository. To
@@ -23,6 +22,7 @@ helm repo index [flags] [DIR]
 ### Options
 
 ```
+  -h, --help           help for index
       --merge string   merge the generated index into the given index
       --url string     url of chart repository
 ```
@@ -40,6 +40,7 @@ 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 17-Jun-2018
+###### Auto generated by spf13/cobra on 1-Aug-2018
diff --git a/docs/helm/helm_repo_list.md b/docs/helm/helm_repo_list.md
index 00221ed24..bebaa6333 100644
--- a/docs/helm/helm_repo_list.md
+++ b/docs/helm/helm_repo_list.md
@@ -4,13 +4,18 @@ list chart repositories
 
 ### Synopsis
 
-
 list chart repositories
 
 ```
 helm repo list [flags]
 ```
 
+### Options
+
+```
+  -h, --help   help for list
+```
+
 ### Options inherited from parent commands
 
 ```
@@ -24,6 +29,7 @@ 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 17-Jun-2018
+###### Auto generated by spf13/cobra on 1-Aug-2018
diff --git a/docs/helm/helm_repo_remove.md b/docs/helm/helm_repo_remove.md
index 272ecea47..89f43a130 100644
--- a/docs/helm/helm_repo_remove.md
+++ b/docs/helm/helm_repo_remove.md
@@ -4,13 +4,18 @@ remove a chart repository
 
 ### Synopsis
 
-
 remove a chart repository
 
 ```
 helm repo remove [flags] [NAME]
 ```
 
+### Options
+
+```
+  -h, --help   help for remove
+```
+
 ### Options inherited from parent commands
 
 ```
@@ -24,6 +29,7 @@ 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 17-Jun-2018
+###### Auto generated by spf13/cobra on 1-Aug-2018
diff --git a/docs/helm/helm_repo_update.md b/docs/helm/helm_repo_update.md
index f0215da48..0d14f63ed 100644
--- a/docs/helm/helm_repo_update.md
+++ b/docs/helm/helm_repo_update.md
@@ -5,7 +5,6 @@ update information of available charts locally from chart repositories
 ### Synopsis
 
 
-
 Update gets the latest information about charts from the respective chart repositories.
 Information is cached locally, where it is used by commands like 'helm search'.
 
@@ -14,7 +13,13 @@ future releases.
 
 
 ```
-helm repo update
+helm repo update [flags]
+```
+
+### Options
+
+```
+  -h, --help   help for update
 ```
 
 ### Options inherited from parent commands
@@ -30,6 +35,7 @@ helm repo update
 ```
 
 ### SEE ALSO
+
 * [helm repo](helm_repo.md)	 - add, list, remove, update, and index chart repositories
 
-###### Auto generated by spf13/cobra on 17-Jun-2018
+###### Auto generated by spf13/cobra on 1-Aug-2018
diff --git a/docs/helm/helm_reset.md b/docs/helm/helm_reset.md
index 74d5ecc0e..772ac42c3 100644
--- a/docs/helm/helm_reset.md
+++ b/docs/helm/helm_reset.md
@@ -5,20 +5,20 @@ uninstalls Tiller from a cluster
 ### Synopsis
 
 
-
 This command uninstalls Tiller (the Helm server-side component) from your
 Kubernetes Cluster and optionally deletes local configuration in
 $HELM_HOME (default ~/.helm/)
 
 
 ```
-helm reset
+helm reset [flags]
 ```
 
 ### Options
 
 ```
   -f, --force                 forces Tiller uninstall even if there are releases installed, or if Tiller is not in ready state. Releases are not deleted.)
+  -h, --help                  help for reset
       --remove-helm-home      if set deletes $HELM_HOME
       --tls                   enable TLS for request
       --tls-ca-cert string    path to TLS CA certificate file (default "$HELM_HOME/ca.pem")
@@ -41,6 +41,7 @@ helm reset
 ```
 
 ### SEE ALSO
+
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 7-Aug-2018
+###### Auto generated by spf13/cobra on 10-Aug-2018
diff --git a/docs/helm/helm_rollback.md b/docs/helm/helm_rollback.md
index 40d3ad83b..5862b180a 100644
--- a/docs/helm/helm_rollback.md
+++ b/docs/helm/helm_rollback.md
@@ -5,7 +5,6 @@ roll back a release to a previous revision
 ### Synopsis
 
 
-
 This command rolls back a release to a previous revision.
 
 The first argument of the rollback command is the name of a release, and the
@@ -23,6 +22,7 @@ helm rollback [flags] [RELEASE] [REVISION]
       --description string    specify a description for the release
       --dry-run               simulate a rollback
       --force                 force resource update through delete/recreate if needed
+  -h, --help                  help for rollback
       --no-hooks              prevent hooks from running during rollback
       --recreate-pods         performs pods restart for the resource if applicable
       --timeout int           time in seconds to wait for any individual Kubernetes operation (like Jobs for hooks) (default 300)
@@ -48,6 +48,7 @@ helm rollback [flags] [RELEASE] [REVISION]
 ```
 
 ### SEE ALSO
+
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 7-Aug-2018
+###### Auto generated by spf13/cobra on 10-Aug-2018
diff --git a/docs/helm/helm_search.md b/docs/helm/helm_search.md
index ffee22ce4..c45a397e3 100644
--- a/docs/helm/helm_search.md
+++ b/docs/helm/helm_search.md
@@ -5,7 +5,6 @@ search for a keyword in charts
 ### Synopsis
 
 
-
 Search reads through all of the repositories configured on the system, and
 looks for matches.
 
@@ -13,13 +12,14 @@ Repositories are managed with 'helm repo' commands.
 
 
 ```
-helm search [keyword]
+helm search [keyword] [flags]
 ```
 
 ### Options
 
 ```
       --col-width uint   specifies the max column width of output (default 60)
+  -h, --help             help for search
   -r, --regexp           use regular expressions for searching
   -v, --version string   search using semantic versioning constraints
   -l, --versions         show the long listing, with each version of each chart on its own line
@@ -38,6 +38,7 @@ helm search [keyword]
 ```
 
 ### SEE ALSO
+
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 17-Jun-2018
+###### Auto generated by spf13/cobra on 1-Aug-2018
diff --git a/docs/helm/helm_serve.md b/docs/helm/helm_serve.md
index e300ee633..5e25f2a2f 100644
--- a/docs/helm/helm_serve.md
+++ b/docs/helm/helm_serve.md
@@ -5,7 +5,6 @@ start a local http web server
 ### Synopsis
 
 
-
 This command starts a local chart repository server that serves charts from a local directory.
 
 The new server will provide HTTP access to a repository. By default, it will
@@ -21,13 +20,14 @@ for more information on hosting chart repositories in a production setting.
 
 
 ```
-helm serve
+helm serve [flags]
 ```
 
 ### Options
 
 ```
       --address string     address to listen on (default "127.0.0.1:8879")
+  -h, --help               help for serve
       --repo-path string   local directory path from which to serve charts
       --url string         external URL of chart repository
 ```
@@ -45,6 +45,7 @@ helm serve
 ```
 
 ### SEE ALSO
+
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 17-Jun-2018
+###### Auto generated by spf13/cobra on 1-Aug-2018
diff --git a/docs/helm/helm_status.md b/docs/helm/helm_status.md
index 22b47c851..9dca005fd 100644
--- a/docs/helm/helm_status.md
+++ b/docs/helm/helm_status.md
@@ -5,7 +5,6 @@ displays the status of the named release
 ### Synopsis
 
 
-
 This command shows the status of a named release.
 The status consists of:
 - last deployment time
@@ -23,6 +22,7 @@ helm status [flags] RELEASE_NAME
 ### Options
 
 ```
+  -h, --help                  help for status
   -o, --output string         output the status in the specified format (json or yaml)
       --revision int32        if set, display the status of the named release with revision
       --tls                   enable TLS for request
@@ -46,6 +46,7 @@ helm status [flags] RELEASE_NAME
 ```
 
 ### SEE ALSO
+
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 7-Aug-2018
+###### Auto generated by spf13/cobra on 10-Aug-2018
diff --git a/docs/helm/helm_template.md b/docs/helm/helm_template.md
index f456f74be..d7770fb7f 100644
--- a/docs/helm/helm_template.md
+++ b/docs/helm/helm_template.md
@@ -5,7 +5,6 @@ locally render templates
 ### Synopsis
 
 
-
 Render chart templates locally and display the output.
 
 This does not require Tiller. However, any values that would normally be
@@ -26,6 +25,7 @@ helm template [flags] CHART
 
 ```
   -x, --execute stringArray      only execute the given templates
+  -h, --help                     help for template
       --is-upgrade               set .Release.IsUpgrade instead of .Release.IsInstall
       --kube-version string      kubernetes version used as Capabilities.KubeVersion.Major/Minor (default "1.9")
   -n, --name string              release name (default "RELEASE-NAME")
@@ -52,6 +52,7 @@ helm template [flags] CHART
 ```
 
 ### SEE ALSO
+
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 17-Jul-2018
+###### Auto generated by spf13/cobra on 1-Aug-2018
diff --git a/docs/helm/helm_test.md b/docs/helm/helm_test.md
index 5a84c3b18..e55c5df68 100644
--- a/docs/helm/helm_test.md
+++ b/docs/helm/helm_test.md
@@ -5,7 +5,6 @@ test a release
 ### Synopsis
 
 
-
 The test command runs the tests for a release.
 
 The argument this command takes is the name of a deployed release.
@@ -13,13 +12,14 @@ The tests to be run are defined in the chart that was installed.
 
 
 ```
-helm test [RELEASE]
+helm test [RELEASE] [flags]
 ```
 
 ### Options
 
 ```
       --cleanup               delete test pods upon completion
+  -h, --help                  help for test
       --timeout int           time in seconds to wait for any individual Kubernetes operation (like Jobs for hooks) (default 300)
       --tls                   enable TLS for request
       --tls-ca-cert string    path to TLS CA certificate file (default "$HELM_HOME/ca.pem")
@@ -42,6 +42,7 @@ helm test [RELEASE]
 ```
 
 ### SEE ALSO
+
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 7-Aug-2018
+###### Auto generated by spf13/cobra on 10-Aug-2018
diff --git a/docs/helm/helm_upgrade.md b/docs/helm/helm_upgrade.md
index 679070233..522464c6b 100644
--- a/docs/helm/helm_upgrade.md
+++ b/docs/helm/helm_upgrade.md
@@ -5,7 +5,6 @@ upgrade a release
 ### Synopsis
 
 
-
 This command upgrades a release to a new version of a chart.
 
 The upgrade arguments must be a release and chart. The chart
@@ -33,7 +32,7 @@ set for a key called 'foo', the 'newbar' value would take precedence:
 
 
 ```
-helm upgrade [RELEASE] [CHART]
+helm upgrade [RELEASE] [CHART] [flags]
 ```
 
 ### Options
@@ -45,6 +44,7 @@ helm upgrade [RELEASE] [CHART]
       --devel                    use development versions, too. Equivalent to version '>0.0.0-0'. If --version is set, this is ignored.
       --dry-run                  simulate an upgrade
       --force                    force resource update through delete/recreate if needed
+  -h, --help                     help for upgrade
   -i, --install                  if a release by this name doesn't already exist, run an install
       --key-file string          identify HTTPS client using this SSL key file
       --keyring string           path to the keyring that contains public signing keys (default "~/.gnupg/pubring.gpg")
@@ -85,6 +85,7 @@ helm upgrade [RELEASE] [CHART]
 ```
 
 ### SEE ALSO
+
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 7-Aug-2018
+###### Auto generated by spf13/cobra on 10-Aug-2018
diff --git a/docs/helm/helm_verify.md b/docs/helm/helm_verify.md
index 866b3fbd8..30ed43679 100644
--- a/docs/helm/helm_verify.md
+++ b/docs/helm/helm_verify.md
@@ -5,7 +5,6 @@ verify that a chart at the given path has been signed and is valid
 ### Synopsis
 
 
-
 Verify that the given chart has a valid provenance file.
 
 Provenance files provide crytographic verification that a chart has not been
@@ -23,6 +22,7 @@ helm verify [flags] PATH
 ### Options
 
 ```
+  -h, --help             help for verify
       --keyring string   keyring containing public keys (default "~/.gnupg/pubring.gpg")
 ```
 
@@ -39,6 +39,7 @@ helm verify [flags] PATH
 ```
 
 ### SEE ALSO
+
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 17-Jun-2018
+###### Auto generated by spf13/cobra on 1-Aug-2018
diff --git a/docs/helm/helm_version.md b/docs/helm/helm_version.md
index 3db529120..33d33cf12 100644
--- a/docs/helm/helm_version.md
+++ b/docs/helm/helm_version.md
@@ -5,7 +5,6 @@ print the client/server version information
 ### Synopsis
 
 
-
 Show the client and server versions for Helm and tiller.
 
 This will print a representation of the client and server versions of Helm and
@@ -24,13 +23,14 @@ use '--server'.
 
 
 ```
-helm version
+helm version [flags]
 ```
 
 ### Options
 
 ```
   -c, --client                client version only
+  -h, --help                  help for version
   -s, --server                server version only
       --short                 print the version number
       --template string       template for version string format
@@ -55,6 +55,7 @@ helm version
 ```
 
 ### SEE ALSO
+
 * [helm](helm.md)	 - The Helm package manager for Kubernetes.
 
-###### Auto generated by spf13/cobra on 7-Aug-2018
+###### Auto generated by spf13/cobra on 10-Aug-2018
diff --git a/glide.lock b/glide.lock
index eef256fd1..9a89616ef 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 41304a2eabc68608507c034304ce87cbf76924c90caaafbe42a9be16e6265868
-updated: 2018-06-19T14:50:56.238468981-05:00
+hash: 9d3eee153a34027ed93ccbcbfb4778baead73ed3f5bd4c665114e02aef747606
+updated: 2018-08-01T07:48:30.2009451Z
 imports:
 - name: cloud.google.com/go
   version: 3b1ae45394a234c385be014e9a488f2bb6eef821
@@ -15,7 +15,7 @@ imports:
   subpackages:
   - winterm
 - name: github.com/Azure/go-autorest
-  version: d4e6b95c12a08b4de2d48b45d5b4d594e5d32fab
+  version: 1ff28809256a84bb6966640ff3d0371af82ccba4
   subpackages:
   - autorest
   - autorest/adal
@@ -27,6 +27,13 @@ imports:
   - quantile
 - name: github.com/BurntSushi/toml
   version: b26d9c308763d68093482582cea63d69be07a0f0
+- name: github.com/chai2010/gettext-go
+  version: c6fed771bfd517099caf0f7a961671fa8ed08723
+  subpackages:
+  - gettext
+  - gettext/mo
+  - gettext/plural
+  - gettext/po
 - name: github.com/cpuguy83/go-md2man
   version: 71acacd42f85e5e82f70a55327789582a5200a90
   subpackages:
@@ -70,6 +77,7 @@ imports:
   - pkg/longpath
   - pkg/mount
   - pkg/parsers
+  - pkg/parsers/operatingsystem
   - pkg/stdcopy
   - pkg/sysinfo
   - pkg/system
@@ -146,7 +154,7 @@ imports:
   - compiler
   - extensions
 - name: github.com/gophercloud/gophercloud
-  version: 6da026c32e2d622cc242d32984259c77237aefe1
+  version: 781450b3c4fcb4f5182bcc5133adb4b2e4a09d1d
   subpackages:
   - openstack
   - openstack/identity/v2/tenants
@@ -169,8 +177,6 @@ imports:
   version: a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4
   subpackages:
   - simplelru
-- name: github.com/howeyc/gopass
-  version: bf9dde6d0d2c004a008c27aaee91170c786f6db8
 - name: github.com/huandu/xstrings
   version: 3959339b333561bf62a38b424fd41517c2c90f40
 - name: github.com/imdario/mergo
@@ -178,7 +184,7 @@ imports:
 - name: github.com/inconshreveable/mousetrap
   version: 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75
 - name: github.com/json-iterator/go
-  version: 13f86432b882000a51c6e610c620974462691a97
+  version: f2b4162afba35581b6d4a50d3b8f34e33c144682
 - name: github.com/mailru/easyjson
   version: 2f5df55504ebc322e4d52d34df6a1f5b503bf26d
   subpackages:
@@ -201,6 +207,10 @@ imports:
   - pbutil
 - name: github.com/mitchellh/go-wordwrap
   version: ad45545899c7b13c020ea92b2072220eefad42b8
+- name: github.com/modern-go/concurrent
+  version: bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94
+- name: github.com/modern-go/reflect2
+  version: 05fbef0ca5da472bbf96c9322b84a53edc03c9fd
 - name: github.com/opencontainers/go-digest
   version: a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb
 - name: github.com/opencontainers/image-spec
@@ -208,8 +218,6 @@ imports:
   subpackages:
   - specs-go
   - specs-go/v1
-- name: github.com/pborman/uuid
-  version: ca53cad383cad2479bbba7f7a1a05797ec1386e4
 - name: github.com/peterbourgon/diskv
   version: 5f041e8faa004a95c88a202771f4cc3e991971e6
 - name: github.com/pkg/errors
@@ -244,15 +252,15 @@ imports:
 - name: github.com/sirupsen/logrus
   version: 89742aefa4b206dcf400792f3bd35b542998eb3b
 - name: github.com/spf13/cobra
-  version: f62e98d28ab7ad31d707ba837a966378465c7b57
+  version: c439c4fa093711d42e1b01acb1235b52004753c1
   subpackages:
   - doc
 - name: github.com/spf13/pflag
-  version: 9ff6c6923cfffbcd502984b8e0c80539a94968b7
+  version: 583c0c0531f06d5278b7d917446061adc344b5cd
 - name: github.com/technosophos/moniker
   version: a5dbd03a2245d554160e3ae6bfdcf969fe58b431
 - name: golang.org/x/crypto
-  version: 81e90905daefcd6fd217b62423c0908922eadb30
+  version: 49796115aa4b964c318aad4f3084fdb41e9aa067
   subpackages:
   - cast5
   - ed25519
@@ -361,7 +369,7 @@ imports:
 - name: gopkg.in/yaml.v2
   version: 670d4cfef0544295bc27a114dbac37980d83185a
 - name: k8s.io/api
-  version: 8b7507fac302640dd5f1efbf9643199952cc58db
+  version: 2d6f90ab1293a1fb871cf149423ebb72aa7423aa
   subpackages:
   - admission/v1beta1
   - admissionregistration/v1alpha1
@@ -389,6 +397,7 @@ imports:
   - rbac/v1alpha1
   - rbac/v1beta1
   - scheduling/v1alpha1
+  - scheduling/v1beta1
   - settings/v1alpha1
   - storage/v1
   - storage/v1alpha1
@@ -398,19 +407,19 @@ imports:
   subpackages:
   - pkg/features
 - name: k8s.io/apimachinery
-  version: f6313580a4d36c7c74a3d845dda6e116642c4f90
+  version: 103fd098999dc9c0c88536f5c9ad2e5da39373ae
   subpackages:
   - pkg/api/equality
   - pkg/api/errors
   - pkg/api/meta
+  - pkg/api/meta/testrestmapper
   - pkg/api/resource
   - pkg/api/validation
-  - pkg/apimachinery
-  - pkg/apimachinery/announced
-  - pkg/apimachinery/registered
+  - pkg/api/validation/path
   - pkg/apis/meta/internalversion
   - pkg/apis/meta/v1
   - pkg/apis/meta/v1/unstructured
+  - pkg/apis/meta/v1/unstructured/unstructuredscheme
   - pkg/apis/meta/v1/validation
   - pkg/apis/meta/v1beta1
   - pkg/conversion
@@ -444,7 +453,6 @@ imports:
   - pkg/util/runtime
   - pkg/util/sets
   - pkg/util/strategicpatch
-  - pkg/util/uuid
   - pkg/util/validation
   - pkg/util/validation/field
   - pkg/util/wait
@@ -455,7 +463,7 @@ imports:
   - third_party/forked/golang/netutil
   - third_party/forked/golang/reflect
 - name: k8s.io/apiserver
-  version: f7914ed3085badf66a1b6f3a5218ada28f7bd084
+  version: 8b122ec9e3bbab91a262d17a39325e69349dc44d
   subpackages:
   - pkg/apis/audit
   - pkg/authentication/authenticator
@@ -464,53 +472,13 @@ imports:
   - pkg/endpoints/request
   - pkg/features
   - pkg/util/feature
-  - pkg/util/flag
 - name: k8s.io/client-go
-  version: 23781f4d6632d88e869066eaebb743857aa1ef9b
+  version: 59698c7d9724b0f95f9dc9e7f7dfdcc3dfeceb82
   subpackages:
   - discovery
   - discovery/fake
   - dynamic
-  - informers
-  - informers/admissionregistration
-  - informers/admissionregistration/v1alpha1
-  - informers/admissionregistration/v1beta1
-  - informers/apps
-  - informers/apps/v1
-  - informers/apps/v1beta1
-  - informers/apps/v1beta2
-  - informers/autoscaling
-  - informers/autoscaling/v1
-  - informers/autoscaling/v2beta1
-  - informers/batch
-  - informers/batch/v1
-  - informers/batch/v1beta1
-  - informers/batch/v2alpha1
-  - informers/certificates
-  - informers/certificates/v1beta1
-  - informers/core
-  - informers/core/v1
-  - informers/events
-  - informers/events/v1beta1
-  - informers/extensions
-  - informers/extensions/v1beta1
-  - informers/internalinterfaces
-  - informers/networking
-  - informers/networking/v1
-  - informers/policy
-  - informers/policy/v1beta1
-  - informers/rbac
-  - informers/rbac/v1
-  - informers/rbac/v1alpha1
-  - informers/rbac/v1beta1
-  - informers/scheduling
-  - informers/scheduling/v1alpha1
-  - informers/settings
-  - informers/settings/v1alpha1
-  - informers/storage
-  - informers/storage/v1
-  - informers/storage/v1alpha1
-  - informers/storage/v1beta1
+  - dynamic/fake
   - kubernetes
   - kubernetes/fake
   - kubernetes/scheme
@@ -562,6 +530,8 @@ imports:
   - kubernetes/typed/rbac/v1beta1/fake
   - kubernetes/typed/scheduling/v1alpha1
   - kubernetes/typed/scheduling/v1alpha1/fake
+  - kubernetes/typed/scheduling/v1beta1
+  - kubernetes/typed/scheduling/v1beta1/fake
   - kubernetes/typed/settings/v1alpha1
   - kubernetes/typed/settings/v1alpha1/fake
   - kubernetes/typed/storage/v1
@@ -570,32 +540,11 @@ imports:
   - kubernetes/typed/storage/v1alpha1/fake
   - kubernetes/typed/storage/v1beta1
   - kubernetes/typed/storage/v1beta1/fake
-  - listers/admissionregistration/v1alpha1
-  - listers/admissionregistration/v1beta1
   - listers/apps/v1
-  - listers/apps/v1beta1
-  - listers/apps/v1beta2
-  - listers/autoscaling/v1
-  - listers/autoscaling/v2beta1
-  - listers/batch/v1
-  - listers/batch/v1beta1
-  - listers/batch/v2alpha1
-  - listers/certificates/v1beta1
   - listers/core/v1
-  - listers/events/v1beta1
-  - listers/extensions/v1beta1
-  - listers/networking/v1
-  - listers/policy/v1beta1
-  - listers/rbac/v1
-  - listers/rbac/v1alpha1
-  - listers/rbac/v1beta1
-  - listers/scheduling/v1alpha1
-  - listers/settings/v1alpha1
-  - listers/storage/v1
-  - listers/storage/v1alpha1
-  - listers/storage/v1beta1
   - pkg/apis/clientauthentication
   - pkg/apis/clientauthentication/v1alpha1
+  - pkg/apis/clientauthentication/v1beta1
   - pkg/version
   - plugin/pkg/client/auth
   - plugin/pkg/client/auth/azure
@@ -606,6 +555,7 @@ imports:
   - rest
   - rest/fake
   - rest/watch
+  - restmapper
   - scale
   - scale/scheme
   - scale/scheme/appsint
@@ -632,20 +582,21 @@ imports:
   - transport/spdy
   - util/buffer
   - util/cert
+  - util/connrotation
   - util/exec
   - util/flowcontrol
   - util/homedir
   - util/integer
   - util/jsonpath
   - util/retry
-  - util/workqueue
 - name: k8s.io/kube-openapi
-  version: 39cb288412c48cb533ba4be5d6c28620b9a0c1b4
+  version: 91cfa479c814065e420cee7ed227db0f63a5854e
   subpackages:
   - pkg/util/proto
+  - pkg/util/proto/testing
   - pkg/util/proto/validation
 - name: k8s.io/kubernetes
-  version: 32ac1c9073b132b8ba18aa830f46b77dcceb0723
+  version: 8b3d76091fd500b7c59c83e113c9048ee612b205
   subpackages:
   - pkg/api/events
   - pkg/api/legacyscheme
@@ -697,7 +648,6 @@ imports:
   - pkg/apis/core/pods
   - pkg/apis/core/v1
   - pkg/apis/core/v1/helper
-  - pkg/apis/core/v1/helper/qos
   - pkg/apis/core/validation
   - pkg/apis/events
   - pkg/apis/events/install
@@ -722,6 +672,7 @@ imports:
   - pkg/apis/scheduling
   - pkg/apis/scheduling/install
   - pkg/apis/scheduling/v1alpha1
+  - pkg/apis/scheduling/v1beta1
   - pkg/apis/settings
   - pkg/apis/settings/install
   - pkg/apis/settings/v1alpha1
@@ -767,36 +718,30 @@ imports:
   - pkg/client/clientset_generated/internalclientset/typed/settings/internalversion/fake
   - pkg/client/clientset_generated/internalclientset/typed/storage/internalversion
   - pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake
-  - pkg/cloudprovider
   - pkg/controller
-  - pkg/controller/daemon
-  - pkg/controller/daemon/util
   - pkg/controller/deployment/util
-  - pkg/controller/history
-  - pkg/controller/statefulset
-  - pkg/controller/volume/events
-  - pkg/controller/volume/persistentvolume
-  - pkg/controller/volume/persistentvolume/metrics
   - pkg/credentialprovider
   - pkg/features
   - pkg/fieldpath
+  - pkg/generated
   - pkg/kubectl
   - pkg/kubectl/apps
-  - pkg/kubectl/categories
+  - pkg/kubectl/cmd/get
   - pkg/kubectl/cmd/templates
   - pkg/kubectl/cmd/testing
   - pkg/kubectl/cmd/util
   - pkg/kubectl/cmd/util/openapi
   - pkg/kubectl/cmd/util/openapi/testing
   - pkg/kubectl/cmd/util/openapi/validation
-  - pkg/kubectl/plugins
-  - pkg/kubectl/resource
+  - pkg/kubectl/genericclioptions
+  - pkg/kubectl/genericclioptions/printers
+  - pkg/kubectl/genericclioptions/resource
   - pkg/kubectl/scheme
   - pkg/kubectl/util
   - pkg/kubectl/util/hash
+  - pkg/kubectl/util/i18n
   - pkg/kubectl/util/slice
   - pkg/kubectl/util/term
-  - pkg/kubectl/util/transport
   - pkg/kubectl/validation
   - pkg/kubelet/apis
   - pkg/kubelet/types
@@ -805,38 +750,25 @@ imports:
   - pkg/printers/internalversion
   - pkg/registry/rbac/validation
   - pkg/scheduler/algorithm
-  - pkg/scheduler/algorithm/predicates
   - pkg/scheduler/algorithm/priorities/util
   - pkg/scheduler/api
-  - pkg/scheduler/schedulercache
+  - pkg/scheduler/cache
   - pkg/scheduler/util
-  - pkg/scheduler/volumebinder
   - pkg/security/apparmor
   - pkg/serviceaccount
   - pkg/util/file
-  - pkg/util/goroutinemap
-  - pkg/util/goroutinemap/exponentialbackoff
   - pkg/util/hash
   - pkg/util/interrupt
-  - pkg/util/io
   - pkg/util/labels
-  - pkg/util/metrics
-  - pkg/util/mount
   - pkg/util/net/sets
   - pkg/util/node
-  - pkg/util/nsenter
   - pkg/util/parsers
   - pkg/util/pointer
   - pkg/util/slice
   - pkg/util/taints
   - pkg/version
-  - pkg/volume
-  - pkg/volume/util
-  - pkg/volume/util/fs
-  - pkg/volume/util/recyclerclient
-  - pkg/volume/util/types
 - name: k8s.io/utils
-  version: aedf551cdb8b0119df3a19c65fde413a13b34997
+  version: 258e2a2fa64568210fbd6267cf1d8fd87c3cb86e
   subpackages:
   - clock
   - exec
diff --git a/glide.yaml b/glide.yaml
index a101a11ee..e32df1d4e 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -4,9 +4,9 @@ import:
   subpackages:
   - context
 - package: github.com/spf13/cobra
-  version: f62e98d28ab7ad31d707ba837a966378465c7b57
+  version: c439c4fa093711d42e1b01acb1235b52004753c1
 - package: github.com/spf13/pflag
-  version: 9ff6c6923cfffbcd502984b8e0c80539a94968b7
+  version: 583c0c0531f06d5278b7d917446061adc344b5cd
 - package: github.com/Masterminds/vcs
   version: ~1.11.0
   # Pin version of mergo that is compatible with both sprig and Kubernetes
@@ -49,15 +49,15 @@ import:
 - package: github.com/grpc-ecosystem/go-grpc-prometheus
 
 - package: k8s.io/kubernetes
-  version: release-1.10
+  version: release-1.11
 - package: k8s.io/client-go
-  version: kubernetes-1.10.0
+  version: kubernetes-1.11.1
 - package: k8s.io/api
-  version: release-1.10
+  version: kubernetes-1.11.1
 - package: k8s.io/apimachinery
-  version: release-1.10
+  version: kubernetes-1.11.1
 - package: k8s.io/apiserver
-  version: release-1.10
+  version: kubernetes-1.11.1
 - package: github.com/cyphar/filepath-securejoin
   version: ^0.2.1
 
diff --git a/pkg/kube/client.go b/pkg/kube/client.go
index 39187da42..167da9eef 100644
--- a/pkg/kube/client.go
+++ b/pkg/kube/client.go
@@ -42,14 +42,14 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/strategicpatch"
 	"k8s.io/apimachinery/pkg/watch"
-	"k8s.io/client-go/tools/clientcmd"
+	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	batchinternal "k8s.io/kubernetes/pkg/apis/batch"
 	"k8s.io/kubernetes/pkg/apis/core"
-	"k8s.io/kubernetes/pkg/kubectl"
+	"k8s.io/kubernetes/pkg/kubectl/cmd/get"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
-	"k8s.io/kubernetes/pkg/kubectl/resource"
+	"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
+	"k8s.io/kubernetes/pkg/kubectl/genericclioptions/resource"
 	"k8s.io/kubernetes/pkg/kubectl/validation"
-	"k8s.io/kubernetes/pkg/printers"
 )
 
 const (
@@ -63,18 +63,17 @@ var ErrNoObjectsVisited = goerrors.New("no objects visited")
 // Client represents a client capable of communicating with the Kubernetes API.
 type Client struct {
 	cmdutil.Factory
-	// SchemaCacheDir is the path for loading cached schema.
-	SchemaCacheDir string
-
 	Log func(string, ...interface{})
 }
 
 // New creates a new Client.
-func New(config clientcmd.ClientConfig) *Client {
+func New(getter genericclioptions.RESTClientGetter) *Client {
+	if getter == nil {
+		getter = genericclioptions.NewConfigFlags()
+	}
 	return &Client{
-		Factory:        cmdutil.NewFactory(config),
-		SchemaCacheDir: clientcmd.RecommendedSchemaFile,
-		Log:            nopLogger,
+		Factory: cmdutil.NewFactory(getter),
+		Log:     nopLogger,
 	}
 }
 
@@ -111,8 +110,8 @@ func (c *Client) Create(namespace string, reader io.Reader, timeout int64, shoul
 
 func (c *Client) newBuilder(namespace string, reader io.Reader) *resource.Result {
 	return c.NewBuilder().
-		Internal().
 		ContinueOnError().
+		WithScheme(legacyscheme.Scheme).
 		Schema(c.validator()).
 		NamespaceParam(namespace).
 		DefaultNamespace().
@@ -179,7 +178,7 @@ func (c *Client) Get(namespace string, reader io.Reader) (string, error) {
 		// versions per cluster, but this certainly won't hurt anything, so let's be safe.
 		gvk := info.ResourceMapping().GroupVersionKind
 		vk := gvk.Version + "/" + gvk.Kind
-		objs[vk] = append(objs[vk], info.AsInternal())
+		objs[vk] = append(objs[vk], asVersioned(info))
 
 		//Get the relation pods
 		objPods, err = c.getSelectRelationPod(info, objPods)
@@ -205,10 +204,7 @@ func (c *Client) Get(namespace string, reader io.Reader) (string, error) {
 	// an object type changes, so we can just rely on that. Problem is it doesn't seem to keep
 	// track of tab widths.
 	buf := new(bytes.Buffer)
-	p, err := cmdutil.PrinterForOptions(&printers.PrintOptions{})
-	if err != nil {
-		return "", err
-	}
+	p, _ := get.NewHumanPrintFlags().ToPrinter("")
 	for t, ot := range objs {
 		if _, err = buf.WriteString("==> " + t + "\n"); err != nil {
 			return "", err
@@ -297,7 +293,7 @@ func (c *Client) Update(namespace string, originalReader, targetReader io.Reader
 
 	for _, info := range original.Difference(target) {
 		c.Log("Deleting %q in %s...", info.Name, info.Namespace)
-		if err := deleteResource(c, info); err != nil {
+		if err := deleteResource(info); err != nil {
 			c.Log("Failed to delete %q, err: %s", info.Name, err)
 		}
 	}
@@ -317,7 +313,7 @@ func (c *Client) Delete(namespace string, reader io.Reader) error {
 	}
 	return perform(infos, func(info *resource.Info) error {
 		c.Log("Starting delete for %q %s", info.Name, info.Mapping.GroupVersionKind.Kind)
-		err := deleteResource(c, info)
+		err := deleteResource(info)
 		return c.skipIfNotFound(err)
 	})
 }
@@ -379,17 +375,11 @@ func createResource(info *resource.Info) error {
 	return info.Refresh(obj, true)
 }
 
-func deleteResource(c *Client, info *resource.Info) error {
-	reaper, err := c.Reaper(info.Mapping)
-	if err != nil {
-		// If there is no reaper for this resources, delete it.
-		if kubectl.IsNoSuchReaperError(err) {
-			return resource.NewHelper(info.Client, info.Mapping).Delete(info.Namespace, info.Name)
-		}
-		return err
-	}
-	c.Log("Using reaper for deleting %q", info.Name)
-	return reaper.Stop(info.Namespace, info.Name, 0, nil)
+func deleteResource(info *resource.Info) error {
+	policy := metav1.DeletePropagationBackground
+	opts := &metav1.DeleteOptions{PropagationPolicy: &policy}
+	_, err := resource.NewHelper(info.Client, info.Mapping).DeleteWithOptions(info.Namespace, info.Name, opts)
+	return err
 }
 
 func createPatch(target *resource.Info, current runtime.Object) ([]byte, types.PatchType, error) {
@@ -411,7 +401,7 @@ func createPatch(target *resource.Info, current runtime.Object) ([]byte, types.P
 	}
 
 	// Get a versioned object
-	versionedObject, err := target.Versioned()
+	versionedObject := asVersioned(target)
 
 	// Unstructured objects, such as CRDs, may not have an not registered error
 	// returned from ConvertToVersion. Anything that's unstructured should
@@ -455,7 +445,7 @@ func updateResource(c *Client, target *resource.Info, currentObj runtime.Object,
 
 			if force {
 				// Attempt to delete...
-				if err := deleteResource(c, target); err != nil {
+				if err := deleteResource(target); err != nil {
 					return err
 				}
 				log.Printf("Deleted %s: %q", kind, target.Name)
@@ -483,7 +473,7 @@ func updateResource(c *Client, target *resource.Info, currentObj runtime.Object,
 		return nil
 	}
 
-	versioned := target.AsVersioned()
+	versioned := asVersioned(target)
 	selector, ok := getSelectorFromObject(versioned)
 	if !ok {
 		return nil
@@ -695,14 +685,7 @@ func (c *Client) getSelectRelationPod(info *resource.Info, objPods map[string][]
 
 	c.Log("get relation pod of object: %s/%s/%s", info.Namespace, info.Mapping.GroupVersionKind.Kind, info.Name)
 
-	versioned, err := info.Versioned()
-	switch {
-	case runtime.IsNotRegisteredError(err):
-		return objPods, nil
-	case err != nil:
-		return objPods, err
-	}
-
+	versioned := asVersioned(info)
 	selector, ok := getSelectorFromObject(versioned)
 	if !ok {
 		return objPods, nil
@@ -743,3 +726,7 @@ func isFoundPod(podItem []core.Pod, pod core.Pod) bool {
 	}
 	return false
 }
+
+func asVersioned(info *resource.Info) runtime.Object {
+	return cmdutil.AsDefaultVersionedOrOriginal(info.Object, info.Mapping)
+}
diff --git a/pkg/kube/client_test.go b/pkg/kube/client_test.go
index 6e33ca27f..617fce352 100644
--- a/pkg/kube/client_test.go
+++ b/pkg/kube/client_test.go
@@ -23,25 +23,20 @@ import (
 	"net/http"
 	"strings"
 	"testing"
-	"time"
 
-	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/rest/fake"
 	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	"k8s.io/kubernetes/pkg/api/testapi"
 	"k8s.io/kubernetes/pkg/apis/core"
-	"k8s.io/kubernetes/pkg/kubectl"
 	cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
-	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
-	"k8s.io/kubernetes/pkg/kubectl/resource"
+	"k8s.io/kubernetes/pkg/kubectl/genericclioptions/resource"
 	"k8s.io/kubernetes/pkg/kubectl/scheme"
 )
 
-var unstructuredSerializer = dynamic.ContentConfig().NegotiatedSerializer
+var unstructuredSerializer = resource.UnstructuredPlusDefaultContentConfig().NegotiatedSerializer
 
 func objBody(codec runtime.Codec, obj runtime.Object) io.ReadCloser {
 	return ioutil.NopCloser(bytes.NewReader([]byte(runtime.EncodeOrDie(codec, obj))))
@@ -98,24 +93,6 @@ func newResponse(code int, obj runtime.Object) (*http.Response, error) {
 	return &http.Response{StatusCode: code, Header: header, Body: body}, nil
 }
 
-type fakeReaper struct {
-	name string
-}
-
-func (r *fakeReaper) Stop(namespace, name string, timeout time.Duration, gracePeriod *metav1.DeleteOptions) error {
-	r.name = name
-	return nil
-}
-
-type fakeReaperFactory struct {
-	cmdutil.Factory
-	reaper kubectl.Reaper
-}
-
-func (f *fakeReaperFactory) Reaper(mapping *meta.RESTMapping) (kubectl.Reaper, error) {
-	return f.reaper, nil
-}
-
 type testClient struct {
 	*Client
 	*cmdtesting.TestFactory
@@ -144,8 +121,8 @@ func TestUpdate(t *testing.T) {
 
 	tf := cmdtesting.NewTestFactory()
 	defer tf.Cleanup()
+
 	tf.UnstructuredClient = &fake.RESTClient{
-		GroupVersion:         schema.GroupVersion{Version: "v1"},
 		NegotiatedSerializer: unstructuredSerializer,
 		Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) {
 			p, m := req.URL.Path, req.Method
@@ -180,11 +157,12 @@ func TestUpdate(t *testing.T) {
 		}),
 	}
 
-	c := newTestClient()
-	reaper := &fakeReaper{}
-	rf := &fakeReaperFactory{Factory: tf, reaper: reaper}
-	c.Client.Factory = rf
-	codec := legacyscheme.Codecs.LegacyCodec(scheme.Versions...)
+	c := &Client{
+		Factory: tf,
+		Log:     nopLogger,
+	}
+	codec := legacyscheme.Codecs.LegacyCodec(scheme.Scheme.PrioritizedVersionsAllGroups()...)
+
 	if err := c.Update(core.NamespaceDefault, objBody(codec, &listA), objBody(codec, &listB), false, false, 0, false); err != nil {
 		t.Fatal(err)
 	}
@@ -205,6 +183,7 @@ func TestUpdate(t *testing.T) {
 		"/namespaces/default/pods/otter:GET",
 		"/namespaces/default/pods/dolphin:GET",
 		"/namespaces/default/pods:POST",
+		"/namespaces/default/pods/squid:DELETE",
 	}
 	if len(expectedActions) != len(actions) {
 		t.Errorf("unexpected number of requests, expected %d, got %d", len(expectedActions), len(actions))
@@ -215,11 +194,6 @@ func TestUpdate(t *testing.T) {
 			t.Errorf("expected %s request got %s", v, actions[k])
 		}
 	}
-
-	if reaper.name != "squid" {
-		t.Errorf("unexpected reaper: %#v", reaper)
-	}
-
 }
 
 func TestBuild(t *testing.T) {
diff --git a/pkg/kube/result.go b/pkg/kube/result.go
index f90d77ad5..0c6289e49 100644
--- a/pkg/kube/result.go
+++ b/pkg/kube/result.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 package kube // import "k8s.io/helm/pkg/kube"
 
-import "k8s.io/kubernetes/pkg/kubectl/resource"
+import "k8s.io/kubernetes/pkg/kubectl/genericclioptions/resource"
 
 // Result provides convenience methods for comparing collections of Infos.
 type Result []*resource.Info
diff --git a/pkg/kube/result_test.go b/pkg/kube/result_test.go
index 0780ad9fc..503473c05 100644
--- a/pkg/kube/result_test.go
+++ b/pkg/kube/result_test.go
@@ -19,15 +19,14 @@ package kube // import "k8s.io/helm/pkg/kube"
 import (
 	"testing"
 
+	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/kubernetes/pkg/api/testapi"
-	"k8s.io/kubernetes/pkg/kubectl/resource"
+	"k8s.io/kubernetes/pkg/kubectl/genericclioptions/resource"
 )
 
 func TestResult(t *testing.T) {
-	mapping, err := testapi.Default.RESTMapper().RESTMapping(schema.GroupKind{Kind: "Pod"})
-	if err != nil {
-		t.Fatal(err)
+	mapping := &meta.RESTMapping{
+		Resource: schema.GroupVersionResource{Group: "group", Version: "version", Resource: "pod"},
 	}
 
 	info := func(name string) *resource.Info {
diff --git a/pkg/kube/wait.go b/pkg/kube/wait.go
index ed9bc10a6..960409df9 100644
--- a/pkg/kube/wait.go
+++ b/pkg/kube/wait.go
@@ -27,7 +27,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes"
 	podutil "k8s.io/kubernetes/pkg/api/v1/pod"
@@ -37,8 +36,8 @@ import (
 
 // deployment holds associated replicaSets for a deployment
 type deployment struct {
-	replicaSets *extensions.ReplicaSet
-	deployment  *extensions.Deployment
+	replicaSets *appsv1.ReplicaSet
+	deployment  *appsv1.Deployment
 }
 
 // waitForResources polls to get the current status of all pods, PVCs, and Services
@@ -56,11 +55,7 @@ func (c *Client) waitForResources(timeout time.Duration, created Result) error {
 		pvc := []v1.PersistentVolumeClaim{}
 		deployments := []deployment{}
 		for _, v := range created {
-			obj, err := v.Versioned()
-			if err != nil && !runtime.IsNotRegisteredError(err) {
-				return false, err
-			}
-			switch value := obj.(type) {
+			switch value := asVersioned(v).(type) {
 			case *v1.ReplicationController:
 				list, err := getPods(kcs, value.Namespace, value.Spec.Selector)
 				if err != nil {
@@ -74,12 +69,12 @@ func (c *Client) waitForResources(timeout time.Duration, created Result) error {
 				}
 				pods = append(pods, *pod)
 			case *appsv1.Deployment:
-				currentDeployment, err := kcs.ExtensionsV1beta1().Deployments(value.Namespace).Get(value.Name, metav1.GetOptions{})
+				currentDeployment, err := kcs.AppsV1().Deployments(value.Namespace).Get(value.Name, metav1.GetOptions{})
 				if err != nil {
 					return false, err
 				}
 				// Find RS associated with deployment
-				newReplicaSet, err := deploymentutil.GetNewReplicaSet(currentDeployment, kcs.ExtensionsV1beta1())
+				newReplicaSet, err := deploymentutil.GetNewReplicaSet(currentDeployment, kcs.AppsV1())
 				if err != nil || newReplicaSet == nil {
 					return false, err
 				}
@@ -89,12 +84,12 @@ func (c *Client) waitForResources(timeout time.Duration, created Result) error {
 				}
 				deployments = append(deployments, newDeployment)
 			case *appsv1beta1.Deployment:
-				currentDeployment, err := kcs.ExtensionsV1beta1().Deployments(value.Namespace).Get(value.Name, metav1.GetOptions{})
+				currentDeployment, err := kcs.AppsV1().Deployments(value.Namespace).Get(value.Name, metav1.GetOptions{})
 				if err != nil {
 					return false, err
 				}
 				// Find RS associated with deployment
-				newReplicaSet, err := deploymentutil.GetNewReplicaSet(currentDeployment, kcs.ExtensionsV1beta1())
+				newReplicaSet, err := deploymentutil.GetNewReplicaSet(currentDeployment, kcs.AppsV1())
 				if err != nil || newReplicaSet == nil {
 					return false, err
 				}
@@ -104,12 +99,12 @@ func (c *Client) waitForResources(timeout time.Duration, created Result) error {
 				}
 				deployments = append(deployments, newDeployment)
 			case *appsv1beta2.Deployment:
-				currentDeployment, err := kcs.ExtensionsV1beta1().Deployments(value.Namespace).Get(value.Name, metav1.GetOptions{})
+				currentDeployment, err := kcs.AppsV1().Deployments(value.Namespace).Get(value.Name, metav1.GetOptions{})
 				if err != nil {
 					return false, err
 				}
 				// Find RS associated with deployment
-				newReplicaSet, err := deploymentutil.GetNewReplicaSet(currentDeployment, kcs.ExtensionsV1beta1())
+				newReplicaSet, err := deploymentutil.GetNewReplicaSet(currentDeployment, kcs.AppsV1())
 				if err != nil || newReplicaSet == nil {
 					return false, err
 				}
@@ -119,12 +114,12 @@ func (c *Client) waitForResources(timeout time.Duration, created Result) error {
 				}
 				deployments = append(deployments, newDeployment)
 			case *extensions.Deployment:
-				currentDeployment, err := kcs.ExtensionsV1beta1().Deployments(value.Namespace).Get(value.Name, metav1.GetOptions{})
+				currentDeployment, err := kcs.AppsV1().Deployments(value.Namespace).Get(value.Name, metav1.GetOptions{})
 				if err != nil {
 					return false, err
 				}
 				// Find RS associated with deployment
-				newReplicaSet, err := deploymentutil.GetNewReplicaSet(currentDeployment, kcs.ExtensionsV1beta1())
+				newReplicaSet, err := deploymentutil.GetNewReplicaSet(currentDeployment, kcs.AppsV1())
 				if err != nil || newReplicaSet == nil {
 					return false, err
 				}
diff --git a/pkg/tiller/environment/environment.go b/pkg/tiller/environment/environment.go
index b38230bab..c9ddab3ab 100644
--- a/pkg/tiller/environment/environment.go
+++ b/pkg/tiller/environment/environment.go
@@ -27,7 +27,7 @@ import (
 	"time"
 
 	"k8s.io/kubernetes/pkg/apis/core"
-	"k8s.io/kubernetes/pkg/kubectl/resource"
+	"k8s.io/kubernetes/pkg/kubectl/genericclioptions/resource"
 
 	"k8s.io/helm/pkg/chartutil"
 	"k8s.io/helm/pkg/engine"
diff --git a/pkg/tiller/environment/environment_test.go b/pkg/tiller/environment/environment_test.go
index 0c10cda37..b835a976d 100644
--- a/pkg/tiller/environment/environment_test.go
+++ b/pkg/tiller/environment/environment_test.go
@@ -23,7 +23,7 @@ import (
 	"time"
 
 	"k8s.io/kubernetes/pkg/apis/core"
-	"k8s.io/kubernetes/pkg/kubectl/resource"
+	"k8s.io/kubernetes/pkg/kubectl/genericclioptions/resource"
 
 	"k8s.io/helm/pkg/chartutil"
 	"k8s.io/helm/pkg/kube"
diff --git a/pkg/tiller/release_server_test.go b/pkg/tiller/release_server_test.go
index b3b1bc49d..122ab9dd4 100644
--- a/pkg/tiller/release_server_test.go
+++ b/pkg/tiller/release_server_test.go
@@ -32,7 +32,7 @@ import (
 	"google.golang.org/grpc/metadata"
 	"k8s.io/kubernetes/pkg/apis/core"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake"
-	"k8s.io/kubernetes/pkg/kubectl/resource"
+	"k8s.io/kubernetes/pkg/kubectl/genericclioptions/resource"
 
 	"k8s.io/helm/pkg/helm"
 	"k8s.io/helm/pkg/hooks"