update: helper function added for the business logic

Signed-off-by: Mujib Ahasan <ahasanmujib8@gmail.com>
(cherry picked from commit 522d2fe615)
pull/31940/head
Mujib Ahasan 5 months ago committed by Scott Rigby
parent c1c090e8ce
commit d55b0b9022
No known key found for this signature in database
GPG Key ID: C7C6FBB5B91C1155

@ -45,11 +45,10 @@ func requireAdoption(resources kube.ResourceList) (kube.ResourceList, error) {
if err != nil {
return err
}
accessor, _ := meta.Accessor(info.Object)
if info.Name == "" && accessor.GetGenerateName() != "" {
return nil
} else if info.Name != "" && accessor.GetGenerateName() != "" {
return fmt.Errorf("metadata.name and metadata.generateName cannot both be set")
skip, err := validateNameAndgenerateName(info)
if skip {
return err
}
helper := resource.NewHelper(info.Client, info.Mapping)
@ -77,11 +76,9 @@ func existingResourceConflict(resources kube.ResourceList, releaseName, releaseN
return err
}
accessor, _ := meta.Accessor(info.Object)
if info.Name == "" && accessor.GetGenerateName() != "" {
return nil
} else if info.Name != "" && accessor.GetGenerateName() != "" {
return fmt.Errorf("metadata.name and metadata.generateName cannot both be set")
skip, err := validateNameAndgenerateName(info)
if skip {
return err
}
helper := resource.NewHelper(info.Client, info.Mapping)
@ -214,3 +211,14 @@ func mergeStrStrMaps(current, desired map[string]string) map[string]string {
maps.Copy(result, desired)
return result
}
func validateNameAndgenerateName(info *resource.Info) (bool, error) {
accessor, _ := meta.Accessor(info.Object)
if info.Name == "" && accessor.GetGenerateName() != "" {
return true, nil
} else if info.Name != "" && accessor.GetGenerateName() != "" {
return true, fmt.Errorf("metadata.name and metadata.generateName cannot both be set")
}
return false, nil
}

Loading…
Cancel
Save