fix: error handled correctly

Signed-off-by: Mujib Ahasan <ahasanmujib8@gmail.com>
(cherry picked from commit 94860626ce)
release-4.1
Mujib Ahasan 3 months ago committed by Scott Rigby
parent 961d7d7cd6
commit 263749874c
No known key found for this signature in database
GPG Key ID: C7C6FBB5B91C1155

@ -47,7 +47,7 @@ func requireAdoption(resources kube.ResourceList) (kube.ResourceList, error) {
}
isGenerateName, err := validateNameAndgenerateName(info)
if isGenerateName {
if isGenerateName || err != nil {
return err
}
@ -77,7 +77,7 @@ func existingResourceConflict(resources kube.ResourceList, releaseName, releaseN
}
isGenerateName, err := validateNameAndgenerateName(info)
if isGenerateName {
if isGenerateName || err != nil {
return err
}
@ -218,7 +218,7 @@ func mergeStrStrMaps(current, desired map[string]string) map[string]string {
func validateNameAndgenerateName(info *resource.Info) (bool, error) {
accessor, err := meta.Accessor(info.Object)
if err != nil {
return true, err
return false, err
}
if info.Name == "" && accessor.GetGenerateName() != "" {

Loading…
Cancel
Save