diff --git a/flyteplugins/go/tasks/pluginmachinery/flytek8s/container_helper_test.go b/flyteplugins/go/tasks/pluginmachinery/flytek8s/container_helper_test.go index d19ea3f16d..9ba4afb908 100644 --- a/flyteplugins/go/tasks/pluginmachinery/flytek8s/container_helper_test.go +++ b/flyteplugins/go/tasks/pluginmachinery/flytek8s/container_helper_test.go @@ -525,7 +525,7 @@ func TestAddFlyteCustomizationsToContainer(t *testing.T) { assert.EqualValues(t, container.Command, []string{"s3://input/path"}) assert.Len(t, container.Resources.Limits, 3) assert.Len(t, container.Resources.Requests, 3) - assert.Len(t, container.Env, 12) + assert.Len(t, container.Env, 8) } func TestAddFlyteCustomizationsToContainer_Resources(t *testing.T) { diff --git a/flyteplugins/go/tasks/pluginmachinery/flytek8s/k8s_resource_adds.go b/flyteplugins/go/tasks/pluginmachinery/flytek8s/k8s_resource_adds.go index df74771961..c638c92701 100644 --- a/flyteplugins/go/tasks/pluginmachinery/flytek8s/k8s_resource_adds.go +++ b/flyteplugins/go/tasks/pluginmachinery/flytek8s/k8s_resource_adds.go @@ -99,24 +99,6 @@ func GetExecutionEnvVars(id pluginsCore.TaskExecutionID, consoleURL string) []v1 v1.EnvVar{ Name: "FLYTE_INTERNAL_TASK_VERSION", Value: taskID.GetVersion(), - }, - // Historic Task Definition Level env variables. - // Remove these once SDK is migrated to use the new ones. - v1.EnvVar{ - Name: "FLYTE_INTERNAL_PROJECT", - Value: taskID.GetProject(), - }, - v1.EnvVar{ - Name: "FLYTE_INTERNAL_DOMAIN", - Value: taskID.GetDomain(), - }, - v1.EnvVar{ - Name: "FLYTE_INTERNAL_NAME", - Value: taskID.GetName(), - }, - v1.EnvVar{ - Name: "FLYTE_INTERNAL_VERSION", - Value: taskID.GetVersion(), }) } diff --git a/flyteplugins/go/tasks/pluginmachinery/flytek8s/k8s_resource_adds_test.go b/flyteplugins/go/tasks/pluginmachinery/flytek8s/k8s_resource_adds_test.go index 0ed5fc0337..50aaf2f218 100644 --- a/flyteplugins/go/tasks/pluginmachinery/flytek8s/k8s_resource_adds_test.go +++ b/flyteplugins/go/tasks/pluginmachinery/flytek8s/k8s_resource_adds_test.go @@ -28,13 +28,13 @@ func TestGetExecutionEnvVars(t *testing.T) { }{ { "no-console-url", - 12, + 8, "", nil, }, { "with-console-url", - 13, + 9, "scheme://host/path", &v12.EnvVar{ Name: "FLYTE_EXECUTION_URL", @@ -43,7 +43,7 @@ func TestGetExecutionEnvVars(t *testing.T) { }, { "with-console-url-ending-in-single-slash", - 13, + 9, "scheme://host/path/", &v12.EnvVar{ Name: "FLYTE_EXECUTION_URL", @@ -52,7 +52,7 @@ func TestGetExecutionEnvVars(t *testing.T) { }, { "with-console-url-ending-in-multiple-slashes", - 13, + 9, "scheme://host/path////", &v12.EnvVar{ Name: "FLYTE_EXECUTION_URL", diff --git a/flyteplugins/go/tasks/pluginmachinery/flytek8s/pod_helper.go b/flyteplugins/go/tasks/pluginmachinery/flytek8s/pod_helper.go index 5650f0652e..dacb7fd5e0 100644 --- a/flyteplugins/go/tasks/pluginmachinery/flytek8s/pod_helper.go +++ b/flyteplugins/go/tasks/pluginmachinery/flytek8s/pod_helper.go @@ -74,25 +74,6 @@ func AddRequiredNodeSelectorRequirements(base *v1.Affinity, new ...v1.NodeSelect } } -// AddPreferredNodeSelectorRequirements appends the provided v1.NodeSelectorRequirement -// objects to an existing v1.Affinity object's list of preferred scheduling terms. -// See: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity-weight -// for how weights are used during scheduling. -func AddPreferredNodeSelectorRequirements(base *v1.Affinity, weight int32, new ...v1.NodeSelectorRequirement) { - if base.NodeAffinity == nil { - base.NodeAffinity = &v1.NodeAffinity{} - } - base.NodeAffinity.PreferredDuringSchedulingIgnoredDuringExecution = append( - base.NodeAffinity.PreferredDuringSchedulingIgnoredDuringExecution, - v1.PreferredSchedulingTerm{ - Weight: weight, - Preference: v1.NodeSelectorTerm{ - MatchExpressions: new, - }, - }, - ) -} - // ApplyInterruptibleNodeSelectorRequirement configures the node selector requirement of the node-affinity using the configuration specified. func ApplyInterruptibleNodeSelectorRequirement(interruptible bool, affinity *v1.Affinity) { // Determine node selector terms to add to node affinity diff --git a/flyteplugins/go/tasks/pluginmachinery/flytek8s/pod_helper_test.go b/flyteplugins/go/tasks/pluginmachinery/flytek8s/pod_helper_test.go index ee0e5f6a0e..a0ef94d5b8 100644 --- a/flyteplugins/go/tasks/pluginmachinery/flytek8s/pod_helper_test.go +++ b/flyteplugins/go/tasks/pluginmachinery/flytek8s/pod_helper_test.go @@ -221,121 +221,6 @@ func TestAddRequiredNodeSelectorRequirements(t *testing.T) { }) } -func TestAddPreferredNodeSelectorRequirements(t *testing.T) { - t.Run("with empty node affinity", func(t *testing.T) { - affinity := v1.Affinity{} - nst := v1.NodeSelectorRequirement{ - Key: "new", - Operator: v1.NodeSelectorOpIn, - Values: []string{"new"}, - } - AddPreferredNodeSelectorRequirements(&affinity, 10, nst) - assert.EqualValues( - t, - []v1.PreferredSchedulingTerm{ - v1.PreferredSchedulingTerm{ - Weight: 10, - Preference: v1.NodeSelectorTerm{ - MatchExpressions: []v1.NodeSelectorRequirement{ - v1.NodeSelectorRequirement{ - Key: "new", - Operator: v1.NodeSelectorOpIn, - Values: []string{"new"}, - }, - }, - }, - }, - }, - affinity.NodeAffinity.PreferredDuringSchedulingIgnoredDuringExecution, - ) - }) - - t.Run("with existing node affinity", func(t *testing.T) { - affinity := v1.Affinity{ - NodeAffinity: &v1.NodeAffinity{ - RequiredDuringSchedulingIgnoredDuringExecution: &v1.NodeSelector{ - NodeSelectorTerms: []v1.NodeSelectorTerm{ - v1.NodeSelectorTerm{ - MatchExpressions: []v1.NodeSelectorRequirement{ - v1.NodeSelectorRequirement{ - Key: "required", - Operator: v1.NodeSelectorOpIn, - Values: []string{"required"}, - }, - }, - }, - }, - }, - PreferredDuringSchedulingIgnoredDuringExecution: []v1.PreferredSchedulingTerm{ - v1.PreferredSchedulingTerm{ - Weight: 1, - Preference: v1.NodeSelectorTerm{ - MatchExpressions: []v1.NodeSelectorRequirement{ - v1.NodeSelectorRequirement{ - Key: "preferred", - Operator: v1.NodeSelectorOpIn, - Values: []string{"preferred"}, - }, - }, - }, - }, - }, - }, - } - nst := v1.NodeSelectorRequirement{ - Key: "new", - Operator: v1.NodeSelectorOpIn, - Values: []string{"new"}, - } - AddPreferredNodeSelectorRequirements(&affinity, 10, nst) - assert.EqualValues( - t, - []v1.NodeSelectorTerm{ - v1.NodeSelectorTerm{ - MatchExpressions: []v1.NodeSelectorRequirement{ - v1.NodeSelectorRequirement{ - Key: "required", - Operator: v1.NodeSelectorOpIn, - Values: []string{"required"}, - }, - }, - }, - }, - affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms, - ) - assert.EqualValues( - t, - []v1.PreferredSchedulingTerm{ - v1.PreferredSchedulingTerm{ - Weight: 1, - Preference: v1.NodeSelectorTerm{ - MatchExpressions: []v1.NodeSelectorRequirement{ - v1.NodeSelectorRequirement{ - Key: "preferred", - Operator: v1.NodeSelectorOpIn, - Values: []string{"preferred"}, - }, - }, - }, - }, - v1.PreferredSchedulingTerm{ - Weight: 10, - Preference: v1.NodeSelectorTerm{ - MatchExpressions: []v1.NodeSelectorRequirement{ - v1.NodeSelectorRequirement{ - Key: "new", - Operator: v1.NodeSelectorOpIn, - Values: []string{"new"}, - }, - }, - }, - }, - }, - affinity.NodeAffinity.PreferredDuringSchedulingIgnoredDuringExecution, - ) - }) -} - func TestApplyInterruptibleNodeAffinity(t *testing.T) { t.Run("WithInterruptibleNodeSelectorRequirement", func(t *testing.T) { podSpec := v1.PodSpec{}