rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-04-28 02:30:07 +00:00
Code Issues Releases Wiki Activity

fix scheduling mapper

Browse Source
This commit is contained in:
Daishan Peng 2018-06-20 12:42:11 -07:00 committed by Alena Prokharchyk
parent e68cd7ed66
commit f092c91a56
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mapper/scheduling.go
View File

@ -95,7 +95,7 @@ func (s SchedulingMapper) nodeAffinity(data map[string]interface{}, nodeAffinity
values.PutValue(data, requireAny, "scheduling", "node", "requireAny")
}
if len(preferred) > 0 {
values.PutValue(data, requireAny, "scheduling", "node", "preferred")
values.PutValue(data, preferred, "scheduling", "node", "preferred")
}
}
@ -207,6 +207,7 @@ func (s SchedulingMapper) ToInternal(data map[string]interface{}) {
preferred := convert.ToStringSlice(values.GetValueN(data, "scheduling", "node", "preferred"))
if len(requireAll) == 0 && len(requireAny) == 0 && len(preferred) == 0 {
data["affinity"] = nil
return
}
@ -243,6 +244,14 @@ func (s SchedulingMapper) ToInternal(data map[string]interface{}) {
NodeAffinity: &nodeAffinity,
})
if nodeAffinity.PreferredDuringSchedulingIgnoredDuringExecution == nil {
values.PutValue(affinity, nil, "nodeAffinity", "preferredDuringSchedulingIgnoredDuringExecution")
}
if nodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution == nil {
values.PutValue(affinity, nil, "nodeAffinity", "requiredDuringSchedulingIgnoredDuringExecution")
}
data["affinity"] = affinity
}