Skip to content

fix: webhook fail to add lifecycle to Spark3 executor pods #2458

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 3 commits into from
Mar 6, 2025
Merged

fix: webhook fail to add lifecycle to Spark3 executor pods #2458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34cfc5e
bugfix: A lifecycle on a spark3 executor should not fail
pvbouwel Mar 5, 2025
f867e6c
tests: Add coverage for spark3 executor with a lifecycle
pvbouwel Mar 5, 2025
2badf54
make go-fmt
pvbouwel Mar 5, 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
15 changes: 3 additions & 12 deletions internal/webhook/sparkpod_defaulter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,27 +650,18 @@ func addTerminationGracePeriodSeconds(pod *corev1.Pod, app *v1beta2.SparkApplica

func addPodLifeCycleConfig(pod *corev1.Pod, app *v1beta2.SparkApplication) error {
var lifeCycle *corev1.Lifecycle
var containerName string
if util.IsDriverPod(pod) {
lifeCycle = app.Spec.Driver.Lifecycle
containerName = common.SparkDriverContainerName
} else if util.IsExecutorPod(pod) {
lifeCycle = app.Spec.Executor.Lifecycle
containerName = common.SparkExecutorContainerName
}
if lifeCycle == nil {
return nil
}

i := 0
// Find the driver container in the pod.
for ; i < len(pod.Spec.Containers); i++ {
if pod.Spec.Containers[i].Name == containerName {
break
}
}
if i == len(pod.Spec.Containers) {
return fmt.Errorf("Spark container %s not found in pod %s", containerName, pod.Name)
i := findContainer(pod)
if i < 0 {
return fmt.Errorf("failed to add lifecycle config as Spark container was not found in pod %s", pod.Name)
}

pod.Spec.Containers[i].Lifecycle = lifeCycle
Expand Down
127 changes: 70 additions & 57 deletions internal/webhook/sparkpod_defaulter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1742,77 +1742,90 @@ func TestPatchSparkPod_GracePeriodSeconds(t *testing.T) {
}

func TestPatchSparkPod_Lifecycle(t *testing.T) {
preStopTest := &corev1.ExecAction{
Command: []string{"/bin/sh", "-c", "echo Hello from the pre stop handler > /usr/share/message"},
}
postStartTest := &corev1.ExecAction{
Command: []string{"/bin/sh", "-c", "echo Hello from the post start handler > /usr/share/message"},
}
app := &v1beta2.SparkApplication{
ObjectMeta: metav1.ObjectMeta{
Name: "spark-test",
UID: "spark-test-1",
testcases := []struct {
ExecutorContainerName string
}{
{
ExecutorContainerName: common.SparkExecutorContainerName,
},
Spec: v1beta2.SparkApplicationSpec{
Driver: v1beta2.DriverSpec{
Lifecycle: &corev1.Lifecycle{
PreStop: &corev1.LifecycleHandler{Exec: preStopTest},
},
{
ExecutorContainerName: common.Spark3DefaultExecutorContainerName,
},
}

for _, testCase := range testcases {
preStopTest := &corev1.ExecAction{
Command: []string{"/bin/sh", "-c", "echo Hello from the pre stop handler > /usr/share/message"},
}
postStartTest := &corev1.ExecAction{
Command: []string{"/bin/sh", "-c", "echo Hello from the post start handler > /usr/share/message"},
}
app := &v1beta2.SparkApplication{
ObjectMeta: metav1.ObjectMeta{
Name: "spark-test",
UID: "spark-test-1",
},
Executor: v1beta2.ExecutorSpec{
Lifecycle: &corev1.Lifecycle{
PostStart: &corev1.LifecycleHandler{Exec: postStartTest},
Spec: v1beta2.SparkApplicationSpec{
Driver: v1beta2.DriverSpec{
Lifecycle: &corev1.Lifecycle{
PreStop: &corev1.LifecycleHandler{Exec: preStopTest},
},
},
Executor: v1beta2.ExecutorSpec{
Lifecycle: &corev1.Lifecycle{
PostStart: &corev1.LifecycleHandler{Exec: postStartTest},
},
},
},
},
}
}

driverPod := &corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: "spark-driver",
Labels: map[string]string{
common.LabelSparkRole: common.SparkRoleDriver,
common.LabelLaunchedBySparkOperator: "true",
driverPod := &corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: "spark-driver",
Labels: map[string]string{
common.LabelSparkRole: common.SparkRoleDriver,
common.LabelLaunchedBySparkOperator: "true",
},
},
},
Spec: corev1.PodSpec{
Containers: []corev1.Container{
{
Name: common.SparkDriverContainerName,
Image: "spark-driver:latest",
Spec: corev1.PodSpec{
Containers: []corev1.Container{
{
Name: common.SparkDriverContainerName,
Image: "spark-driver:latest",
},
},
},
},
}
}

executorPod := &corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: "spark-executor",
Labels: map[string]string{
common.LabelSparkRole: common.SparkRoleExecutor,
common.LabelLaunchedBySparkOperator: "true",
executorPod := &corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: "spark-executor",
Labels: map[string]string{
common.LabelSparkRole: common.SparkRoleExecutor,
common.LabelLaunchedBySparkOperator: "true",
},
},
},
Spec: corev1.PodSpec{
Containers: []corev1.Container{
{
Name: common.SparkExecutorContainerName,
Image: "spark-executor:latest",
Spec: corev1.PodSpec{
Containers: []corev1.Container{
{
Name: testCase.ExecutorContainerName,
Image: "spark-executor:latest",
},
},
},
},
}
}

modifiedDriverPod, err := getModifiedPod(driverPod, app)
if err != nil {
t.Fatal(err)
}
modifiedExecutorPod, err := getModifiedPod(executorPod, app)
if err != nil {
t.Fatal(err)
modifiedDriverPod, err := getModifiedPod(driverPod, app)
if err != nil {
t.Fatal(err)
}
modifiedExecutorPod, err := getModifiedPod(executorPod, app)
if err != nil {
t.Fatal(err)
}
assert.Equal(t, preStopTest, modifiedDriverPod.Spec.Containers[0].Lifecycle.PreStop.Exec)
assert.Equal(t, postStartTest, modifiedExecutorPod.Spec.Containers[0].Lifecycle.PostStart.Exec)
}
assert.Equal(t, preStopTest, modifiedDriverPod.Spec.Containers[0].Lifecycle.PreStop.Exec)
assert.Equal(t, postStartTest, modifiedExecutorPod.Spec.Containers[0].Lifecycle.PostStart.Exec)
}

func getModifiedPod(old *corev1.Pod, app *v1beta2.SparkApplication) (*corev1.Pod, error) {
Expand Down