diff --git a/pkg/cmd/install.go b/pkg/cmd/install.go index 8c56f7ac2..d6c43e05a 100644 --- a/pkg/cmd/install.go +++ b/pkg/cmd/install.go @@ -138,9 +138,10 @@ resource it creates: - Annotation: meta.helm.sh/release-namespace= These are used to track ownership. If a resource already exists in the cluster -without these annotations, Helm will refuse to install and return an error. To -adopt pre-existing resources into the release, use '--take-ownership'. Helm will -then add the ownership metadata and manage those resources going forward. +without this metadata, or with metadata pointing to a different release or +namespace, Helm will refuse to install and return an error. To adopt such +pre-existing resources into the release, use '--take-ownership'. Helm will then +add the ownership metadata and manage those resources going forward. ` func newInstallCmd(cfg *action.Configuration, out io.Writer) *cobra.Command { diff --git a/pkg/cmd/upgrade.go b/pkg/cmd/upgrade.go index e41bcddaa..113c1e703 100644 --- a/pkg/cmd/upgrade.go +++ b/pkg/cmd/upgrade.go @@ -89,10 +89,10 @@ Helm tracks ownership of Kubernetes resources using the following metadata: - Annotation: meta.helm.sh/release-name= - Annotation: meta.helm.sh/release-namespace= -During an upgrade, if a resource exists in the cluster without these annotations -(or with annotations pointing to a different release), Helm will return an error. -To take ownership of such resources and have Helm manage them going forward, use -'--take-ownership'. +During an upgrade, if a resource exists in the cluster without this metadata +(or with metadata pointing to a different release or namespace), Helm will +return an error. To take ownership of such resources and have Helm manage them +going forward, use '--take-ownership'. ` func newUpgradeCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {