Skip to content

Commit 2999546

Browse files
authored
Fix: should not add emptyDir sizeLimit conf on executor pods if it is nil (#2316)
Signed-off-by: Cian Gallagher <[email protected]>
1 parent 72107fd commit 2999546

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

internal/controller/sparkapplication/submission.go

+14-12
Original file line numberDiff line numberDiff line change
@@ -840,20 +840,22 @@ func executorVolumeMountsOption(app *v1beta2.SparkApplication) ([]string, error)
840840
}
841841
switch volumeType {
842842
case common.VolumeTypeEmptyDir:
843-
args = append(
844-
args,
845-
"--conf",
846-
fmt.Sprintf(
847-
"%s=%s",
843+
if volume.EmptyDir.SizeLimit != nil {
844+
args = append(
845+
args,
846+
"--conf",
848847
fmt.Sprintf(
849-
common.SparkKubernetesExecutorVolumesOptionsTemplate,
850-
common.VolumeTypeEmptyDir,
851-
volume.Name,
852-
"sizeLimit",
848+
"%s=%s",
849+
fmt.Sprintf(
850+
common.SparkKubernetesExecutorVolumesOptionsTemplate,
851+
common.VolumeTypeEmptyDir,
852+
volume.Name,
853+
"sizeLimit",
854+
),
855+
volume.EmptyDir.SizeLimit.String(),
853856
),
854-
volume.EmptyDir.SizeLimit.String(),
855-
),
856-
)
857+
)
858+
}
857859
case common.VolumeTypeHostPath:
858860
args = append(
859861
args,

0 commit comments

Comments
 (0)