dilim/helm
1
0
Fork 0
mirror of https://github.com/helm/helm.git synced 2026-08-05 23:51:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10397 from mtesseract/mc/fix-err-message-on-existing-resource-conflict

Browse Source 
Adjust error message wrongly claiming that there is a resource conflict
This commit is contained in:
Joe Julian
2023-07-13 08:20:16 -07:00
committed by GitHub
parent 14d363669f 8613770f78
commit 8554d518d5
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/action/install.go
View File

@@ -322,7 +322,7 @@ func (i *Install) RunWithContext(ctx context.Context, chrt *chart.Chart, vals ma
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

@@ -306,7 +306,7 @@ func (u *Upgrade) performUpgrade(ctx context.Context, originalRelease, upgradedR
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 {