zishuo/onepanel
1
0
Fork 0
mirror of https://github.com/onepanelio/onepanel.git synced 2025-10-30 16:26:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adjusting the pod anti-affinity per feedback.

Browse Source 
- The pod anti-affinity should be set for a template that has a nodeSelector
value (not nil).
- If the template does not have a nodeSelector, we do nothing.
This commit is contained in:
Aleksandr Melnikov
2020-09-18 15:51:48 -07:00
parent 31076bc70d
commit 6dd7c0ac70
1 changed files with 38 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
pkg/workflow_execution.go
View File

@@ -363,23 +363,49 @@ func (c *Client) createWorkflow(namespace string, workflowTemplateID uint64, wor
func ensureWorkflowRunsOnDedicatedNode(wf *wfv1.Workflow, config SystemConfig) (*wfv1.Workflow, error) {
antiAffinityLabelKey := "onepanel.io/reserves-instance-type"
nodeSelectorVal := "singular-workflow"
nodeSelectorVal := ""
for i := range wf.Spec.Templates {
wf.Spec.Templates[i].Metadata.Labels = map[string]string{antiAffinityLabelKey: nodeSelectorVal}
}
wf.Spec.Affinity = &corev1.Affinity{
PodAntiAffinity: &corev1.PodAntiAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: []corev1.PodAffinityTerm{
{LabelSelector: &metav1.LabelSelector{
MatchExpressions: []metav1.LabelSelectorRequirement{
{Key: antiAffinityLabelKey, Operator: "In", Values: []string{nodeSelectorVal}},
template := &wf.Spec.Templates[i]
if template.NodeSelector == nil {
continue
}
var value string
for k, v := range template.NodeSelector {
if k == *config.NodePoolLabel() {
value = v
break
}
}
if value == "" {
continue
}
if strings.Contains(value, "{{workflow.") {
parts := strings.Split(strings.Replace(value, "}}", "", -1), ".")
paramName := parts[len(parts)-1]
for _, param := range wf.Spec.Arguments.Parameters {
if param.Name == paramName && param.Value != nil {
nodeSelectorVal = *param.Value
break
}
}
}
template.Metadata.Labels = map[string]string{antiAffinityLabelKey: nodeSelectorVal}
wf.Spec.Affinity = &corev1.Affinity{
PodAntiAffinity: &corev1.PodAntiAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: []corev1.PodAffinityTerm{
{LabelSelector: &metav1.LabelSelector{
MatchExpressions: []metav1.LabelSelectorRequirement{
{Key: antiAffinityLabelKey, Operator: "In", Values: []string{nodeSelectorVal}},
},
},
TopologyKey: "kubernetes.io/hostname"},
},
TopologyKey: "kubernetes.io/hostname"},
},
},
}
}
return wf
return wf, nil
}
func (c *Client) ValidateWorkflowExecution(namespace string, manifest []byte) (err error) {