helm
/
helm
mirror of https://github.com/helm/helm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adjust error message wrongly claiming that there is a resource conflict 

Signed-off-by: Moritz Clasmeier <moritz@stackrox.com>
This commit is contained in:
Moritz Clasmeier 2021-11-24 11:15:15 +01:00
parent fc9b46067f
commit 8613770f78
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/action/install.go
View File

@ -272,7 +272,7 @@ func (i *Install) Run(chrt *chart.Chart, vals map[string]interface{}) (*release.
if !i.ClientOnly && !isUpgrade && len(resources) > 0 {
toBeAdopted, err = existingResourceConflict(resources, rel.Name, rel.Namespace)
if err != nil {
return nil, errors.Wrap(err, "rendered manifests contain a resource that already exists. Unable to continue with install")
return nil, errors.Wrap(err, "Unable to continue with install")
}
}

2
pkg/action/upgrade.go
View File

@ -277,7 +277,7 @@ func (u *Upgrade) performUpgrade(originalRelease, upgradedRelease *release.Relea
toBeUpdated, err := existingResourceConflict(toBeCreated, upgradedRelease.Name, upgradedRelease.Namespace)
if err != nil {
return nil, errors.Wrap(err, "rendered manifests contain a resource that already exists. Unable to continue with update")
return nil, errors.Wrap(err, "Unable to continue with update")
}
toBeUpdated.Visit(func(r *resource.Info, err error) error {