PodSpec NodeSelectors overwrite the default k8s plugin settings (flyt…

…eorg#303) * PodSpec NodeSelectors overwrite the default k8s plugin settings Signed-off-by: Dan Rammer <[email protected]> * added unit test Signed-off-by: Dan Rammer <[email protected]> * better node selector value Signed-off-by: Dan Rammer <[email protected]> * fixed issue with unionmaps where k8s plugin overrides labels Signed-off-by: Dan Rammer <[email protected]> Signed-off-by: Dan Rammer <[email protected]>
eapolinario · Dec 27, 2022 · 8efeda7 · 8efeda7
1 parent 2859755
commit 8efeda7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/go/tasks/pluginmachinery/flytek8s/pod_helper.go b/go/tasks/pluginmachinery/flytek8s/pod_helper.go
@@ -85,7 +85,7 @@ func UpdatePod(taskExecutionMetadata pluginsCore.TaskExecutionMetadata,
 	if len(podSpec.SchedulerName) == 0 {
 		podSpec.SchedulerName = config.GetK8sPluginConfig().SchedulerName
 	}
-	podSpec.NodeSelector = utils.UnionMaps(podSpec.NodeSelector, config.GetK8sPluginConfig().DefaultNodeSelector)
+	podSpec.NodeSelector = utils.UnionMaps(config.GetK8sPluginConfig().DefaultNodeSelector, podSpec.NodeSelector)
 	if taskExecutionMetadata.IsInterruptible() {
 		podSpec.NodeSelector = utils.UnionMaps(podSpec.NodeSelector, config.GetK8sPluginConfig().InterruptibleNodeSelector)
 	}

diff --git a/go/tasks/pluginmachinery/flytek8s/pod_helper_test.go b/go/tasks/pluginmachinery/flytek8s/pod_helper_test.go
@@ -330,7 +330,7 @@ func toK8sPodInterruptible(t *testing.T) {
 	assert.Len(t, p.Tolerations, 2)
 	assert.Equal(t, "x/flyte", p.Tolerations[1].Key)
 	assert.Equal(t, "interruptible", p.Tolerations[1].Value)
-	assert.Equal(t, 1, len(p.NodeSelector))
+	assert.Equal(t, 2, len(p.NodeSelector))
 	assert.Equal(t, "true", p.NodeSelector["x/interruptible"])
 	assert.EqualValues(
 		t,

diff --git a/go/tasks/pluginmachinery/flytek8s/testdata/config.yaml b/go/tasks/pluginmachinery/flytek8s/testdata/config.yaml
@@ -43,6 +43,8 @@ plugins:
       - FLYTE_AWS_ENDPOINT: "http://minio.flyte:9000"
       - FLYTE_AWS_ACCESS_KEY_ID: minio
       - FLYTE_AWS_SECRET_ACCESS_KEY: miniostorage
+    default-node-selector:
+      user: 'default'
     default-pod-security-context:
       runAsUser: 1000
       runAsGroup: 3000

diff --git a/go/tasks/plugins/array/k8s/subtask.go b/go/tasks/plugins/array/k8s/subtask.go
@@ -62,7 +62,7 @@ func addMetadata(stCtx SubTaskExecutionContext, cfg *Config, k8sPluginCfg *confi
 
 	pod.SetNamespace(namespace)
 	pod.SetAnnotations(utils.UnionMaps(k8sPluginCfg.DefaultAnnotations, pod.GetAnnotations(), utils.CopyMap(taskExecutionMetadata.GetAnnotations())))
-	pod.SetLabels(utils.UnionMaps(pod.GetLabels(), utils.CopyMap(taskExecutionMetadata.GetLabels()), k8sPluginCfg.DefaultLabels))
+	pod.SetLabels(utils.UnionMaps(k8sPluginCfg.DefaultLabels, pod.GetLabels(), utils.CopyMap(taskExecutionMetadata.GetLabels())))
 	pod.SetName(taskExecutionMetadata.GetTaskExecutionID().GetGeneratedName())
 
 	if !cfg.RemoteClusterConfig.Enabled {