rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-05-09 23:56:18 +00:00
Code Issues Releases Wiki Activity

Only reset affinity when corresponding keys are in the request

Browse Source
This commit is contained in:
Alena Prokharchyk 2018-09-28 00:48:28 -07:00
parent fdb7babf78
commit 5c4cd002e8
1 changed files with 11 additions and 3 deletions

14
mapper/scheduling.go
View File

@ -202,9 +202,17 @@ func (s SchedulingMapper) ToInternal(data map[string]interface{}) error {
data["nodeName"] = nodeName
}
requireAll := convert.ToStringSlice(values.GetValueN(data, "scheduling", "node", "requireAll"))
requireAny := convert.ToStringSlice(values.GetValueN(data, "scheduling", "node", "requireAny"))
preferred := convert.ToStringSlice(values.GetValueN(data, "scheduling", "node", "preferred"))
requireAllV := values.GetValueN(data, "scheduling", "node", "requireAll")
requireAnyV := values.GetValueN(data, "scheduling", "node", "requireAny")
preferredV := values.GetValueN(data, "scheduling", "node", "preferred")
if requireAllV == nil && requireAnyV == nil && preferredV == nil {
return nil
}
requireAll := convert.ToStringSlice(requireAllV)
requireAny := convert.ToStringSlice(requireAnyV)
preferred := convert.ToStringSlice(preferredV)
if len(requireAll) == 0 && len(requireAny) == 0 && len(preferred) == 0 {
values.PutValue(data, nil, "affinity", "nodeAffinity")