generateName is also considered in logic

Signed-off-by: Mujib Ahasan <ahasanmujib8@gmail.com>
pull/31563/head
Mujib Ahasan 1 month ago
parent b357bcae86
commit 6769fb6fb6

@ -45,9 +45,11 @@ func requireAdoption(resources kube.ResourceList) (kube.ResourceList, error) {
if err != nil {
return err
}
if info.Name == "" {
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")
}
helper := resource.NewHelper(info.Client, info.Mapping)
@ -74,8 +76,11 @@ func existingResourceConflict(resources kube.ResourceList, releaseName, releaseN
return err
}
if info.Name == "" {
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")
}
helper := resource.NewHelper(info.Client, info.Mapping)

Loading…
Cancel
Save