Adjust error message wrongly claiming that there is a resource conflict

Signed-off-by: Moritz Clasmeier <moritz@stackrox.com>
pull/10397/head
Moritz Clasmeier 4 years ago
parent fc9b46067f
commit 8613770f78

@ -272,7 +272,7 @@ func (i *Install) Run(chrt *chart.Chart, vals map[string]interface{}) (*release.
if !i.ClientOnly && !isUpgrade && len(resources) > 0 { if !i.ClientOnly && !isUpgrade && len(resources) > 0 {
toBeAdopted, err = existingResourceConflict(resources, rel.Name, rel.Namespace) toBeAdopted, err = existingResourceConflict(resources, rel.Name, rel.Namespace)
if err != nil { 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")
} }
} }

@ -277,7 +277,7 @@ func (u *Upgrade) performUpgrade(originalRelease, upgradedRelease *release.Relea
toBeUpdated, err := existingResourceConflict(toBeCreated, upgradedRelease.Name, upgradedRelease.Namespace) toBeUpdated, err := existingResourceConflict(toBeCreated, upgradedRelease.Name, upgradedRelease.Namespace)
if err != nil { 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 { toBeUpdated.Visit(func(r *resource.Info, err error) error {

Loading…
Cancel
Save