|
|
|
@ -46,6 +46,10 @@ func requireAdoption(resources kube.ResourceList) (kube.ResourceList, error) {
|
|
|
|
return err
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if info.Name == "" {
|
|
|
|
|
|
|
|
return nil
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
helper := resource.NewHelper(info.Client, info.Mapping)
|
|
|
|
helper := resource.NewHelper(info.Client, info.Mapping)
|
|
|
|
_, err = helper.Get(info.Namespace, info.Name)
|
|
|
|
_, err = helper.Get(info.Namespace, info.Name)
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
@ -71,6 +75,10 @@ func existingResourceConflict(resources kube.ResourceList, releaseName, releaseN
|
|
|
|
return err
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if info.Name == "" {
|
|
|
|
|
|
|
|
return nil
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
helper := resource.NewHelper(info.Client, info.Mapping)
|
|
|
|
helper := resource.NewHelper(info.Client, info.Mapping)
|
|
|
|
existing, err := helper.Get(info.Namespace, info.Name)
|
|
|
|
existing, err := helper.Get(info.Namespace, info.Name)
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
|