Skip to content

Remove unused node selector functions & legacy environment variables #6614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 29, 2025
Merged

Remove unused node selector functions & legacy environment variables #6614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7edd62b
Remove unused node selector functions
Sovietaced Sep 9, 2025
cd577cb
Remove legacy environment variables
Sovietaced Sep 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion flyteplugins/go/tasks/pluginmachinery/flytek8s/container_helper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
18 changes: 0 additions & 18 deletions flyteplugins/go/tasks/pluginmachinery/flytek8s/k8s_resource_adds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I validated that the SDK no longer uses these.

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(),
})

}
Expand Down
8 changes: 4 additions & 4 deletions flyteplugins/go/tasks/pluginmachinery/flytek8s/k8s_resource_adds_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
19 changes: 0 additions & 19 deletions flyteplugins/go/tasks/pluginmachinery/flytek8s/pod_helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
115 changes: 0 additions & 115 deletions flyteplugins/go/tasks/pluginmachinery/flytek8s/pod_helper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{}
Expand Down
Loading