Skip to content

Tomnewton/use pod templates feature on spark operator #8

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

Draft
Tom-Newton wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Tomnewton/use pod templates feature on spark operator #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
098f58d
LLM looks about right
Tom-Newton Jun 23, 2026
4d00730
Remove now redundant explicit priorityClassName
Tom-Newton Jun 23, 2026
252e411
Fix labels and annotations
Tom-Newton Jun 24, 2026
0a98622
Tests pass
Tom-Newton Jun 24, 2026
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
30 changes: 11 additions & 19 deletions flyteplugins/go/tasks/plugins/k8s/spark/spark.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,26 +167,20 @@ func createSparkPodSpec(
labels = pluginsUtils.UnionMaps(labels, k8sPod.GetMetadata().GetLabels())
}

sparkEnv := make([]v1.EnvVar, 0)
for _, envVar := range container.Env {
sparkEnv = append(sparkEnv, *envVar.DeepCopy())
for i := range podSpec.Containers {
if podSpec.Containers[i].Name == container.Name {
podSpec.Containers[i].Env = append(podSpec.Containers[i].Env,
v1.EnvVar{Name: "FLYTE_MAX_ATTEMPTS", Value: strconv.Itoa(int(taskCtx.TaskExecutionMetadata().GetMaxAttempts()))})
}
}
sparkEnv = append(sparkEnv, v1.EnvVar{Name: "FLYTE_MAX_ATTEMPTS", Value: strconv.Itoa(int(taskCtx.TaskExecutionMetadata().GetMaxAttempts()))})

spec := sparkOp.SparkPodSpec{
Affinity: podSpec.Affinity,
Annotations: annotations,
Labels: labels,
Env: sparkEnv,
Image: &container.Image,
PodSecurityContext: podSpec.SecurityContext,
SecurityContext: container.SecurityContext,
DNSConfig: podSpec.DNSConfig.DeepCopy(),
Tolerations: podSpec.Tolerations,
SchedulerName: &podSpec.SchedulerName,
NodeSelector: podSpec.NodeSelector,
HostNetwork: &podSpec.HostNetwork,
ServiceAccount: strPtr(serviceAccountName(taskCtx.TaskExecutionMetadata())),
ServiceAccount: strPtr(serviceAccountName(taskCtx.TaskExecutionMetadata())),
Template: &v1.PodTemplateSpec{
Spec: *podSpec,
},
Annotations: annotations,
Labels: labels,
}
return &spec
}
Expand Down Expand Up @@ -236,7 +230,6 @@ func createDriverSpec(ctx context.Context, taskCtx pluginsCore.TaskExecutionCont
},
}
spec.sparkSpec.ServiceAccount = strPtr(serviceAccountName(nonInterruptibleTaskCtx.TaskExecutionMetadata()))
spec.sparkSpec.PriorityClassName = strPtr(podSpec.PriorityClassName)

if cores, err := strconv.ParseInt(sparkConfig["spark.driver.cores"], 10, 32); err == nil {
spec.sparkSpec.Cores = intPtr(int32(cores))
Expand Down Expand Up @@ -291,7 +284,6 @@ func createExecutorSpec(ctx context.Context, taskCtx pluginsCore.TaskExecutionCo
},
serviceAccountName,
}
spec.sparkSpec.PriorityClassName = strPtr(podSpec.PriorityClassName)
if execCores, err := strconv.ParseInt(sparkConfig["spark.executor.cores"], 10, 32); err == nil {
spec.sparkSpec.Cores = intPtr(int32(execCores))
}
Expand Down
Loading
Loading