Skip to content

[SPARK-53703] Improve unit tests to be neutral from Spark versions #339

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

Closed
dongjoon-hyun wants to merge 1 commit into from
Closed

[SPARK-53703] Improve unit tests to be neutral from Spark versions #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 2 additions & 11 deletions spark-operator-api/src/test/resources/spark-job-with-driver-service-ingress.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
{
"mainClass": "org.apache.spark.examples.SparkPi",
"jars": "local:///opt/spark/examples/jars/spark-examples.jar",
"sparkConf": {
"spark.kubernetes.driver.master": "local[10]",
"spark.kubernetes.driver.request.cores": "5",
"spark.kubernetes.driver.limit.cores": "5",
"spark.kubernetes.authenticate.driver.serviceAccountName": "spark",
"spark.kubernetes.container.image": "apache/spark:4.0.0"
},
Copy link
Member Author

@dongjoon-hyun dongjoon-hyun Sep 24, 2025

Choose a reason for hiding this comment

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

This test resource is used for Driver Service Ingress test case. So, the removed information are irrelevant and not required.

"runtimeVersions": {
"sparkVersion": "4.0.0"
"sparkVersion": "test"
},
"driverServiceIngressList": [
{
Expand Down Expand Up @@ -56,4 +47,4 @@
}
}
]
}
}
31 changes: 16 additions & 15 deletions ...sion-worker/src/test/java/org/apache/spark/k8s/operator/SparkClusterResourceSpecTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ class SparkClusterResourceSpecTest {
RuntimeVersions runtimeVersions = new RuntimeVersions();
SparkConf sparkConf = new SparkConf().set("spark.kubernetes.namespace", "other-namespace");
ClusterTolerations clusterTolerations = new ClusterTolerations();
static final String VERSION = "dev";

@BeforeEach
void setUp() {
Expand All @@ -76,7 +77,7 @@ void setUp() {
when(clusterSpec.getMasterSpec()).thenReturn(masterSpec);
when(clusterSpec.getWorkerSpec()).thenReturn(workerSpec);
when(clusterSpec.getRuntimeVersions()).thenReturn(runtimeVersions);
runtimeVersions.setSparkVersion("4.0.0");
runtimeVersions.setSparkVersion(VERSION);
when(masterSpec.getStatefulSetSpec()).thenReturn(statefulSetSpec);
when(masterSpec.getStatefulSetMetadata()).thenReturn(objectMeta);
when(masterSpec.getServiceSpec()).thenReturn(serviceSpec);
Expand All @@ -92,19 +93,19 @@ void testMasterService() {
Service service1 = new SparkClusterResourceSpec(cluster, new SparkConf()).getMasterService();
assertEquals("my-namespace", service1.getMetadata().getNamespace());
assertEquals("cluster-name-master-svc", service1.getMetadata().getName());
assertEquals("4.0.0", service1.getMetadata().getLabels().get(LABEL_SPARK_VERSION_NAME));
assertEquals(VERSION, service1.getMetadata().getLabels().get(LABEL_SPARK_VERSION_NAME));

Service service2 = new SparkClusterResourceSpec(cluster, sparkConf).getMasterService();
assertEquals("other-namespace", service2.getMetadata().getNamespace());
assertEquals("4.0.0", service1.getMetadata().getLabels().get(LABEL_SPARK_VERSION_NAME));
assertEquals(VERSION, service1.getMetadata().getLabels().get(LABEL_SPARK_VERSION_NAME));
}

@Test
void testWorkerService() {
Service service1 = new SparkClusterResourceSpec(cluster, new SparkConf()).getWorkerService();
assertEquals("my-namespace", service1.getMetadata().getNamespace());
assertEquals("cluster-name-worker-svc", service1.getMetadata().getName());
assertEquals("4.0.0", service1.getMetadata().getLabels().get(LABEL_SPARK_VERSION_NAME));
assertEquals(VERSION, service1.getMetadata().getLabels().get(LABEL_SPARK_VERSION_NAME));

Service service2 = new SparkClusterResourceSpec(cluster, sparkConf).getMasterService();
assertEquals("other-namespace", service2.getMetadata().getNamespace());
Expand All @@ -128,7 +129,7 @@ void testWorkerServiceWithTemplate() {
assertEquals("my-namespace", service1.getMetadata().getNamespace());
assertEquals("cluster-name-worker-svc", service1.getMetadata().getName());
assertEquals("bar", service1.getMetadata().getLabels().get("foo"));
assertEquals("4.0.0", service1.getMetadata().getLabels().get(LABEL_SPARK_VERSION_NAME));
assertEquals(VERSION, service1.getMetadata().getLabels().get(LABEL_SPARK_VERSION_NAME));
assertEquals("foo", service1.getSpec().getExternalName());
assertEquals(
Map.of(
Expand Down Expand Up @@ -157,7 +158,7 @@ void testMasterServiceWithTemplate() {
assertEquals("my-namespace", service1.getMetadata().getNamespace());
assertEquals("cluster-name-master-svc", service1.getMetadata().getName());
assertEquals("bar", service1.getMetadata().getLabels().get("foo"));
assertEquals("4.0.0", service1.getMetadata().getLabels().get(LABEL_SPARK_VERSION_NAME));
assertEquals(VERSION, service1.getMetadata().getLabels().get(LABEL_SPARK_VERSION_NAME));
assertEquals("foo", service1.getSpec().getExternalName());
assertEquals(
Map.of(
Expand All @@ -174,9 +175,9 @@ void testMasterStatefulSet() {
StatefulSet statefulSet1 = spec1.getMasterStatefulSet();
assertEquals("my-namespace", statefulSet1.getMetadata().getNamespace());
assertEquals("cluster-name-master", statefulSet1.getMetadata().getName());
assertEquals("4.0.0", statefulSet1.getMetadata().getLabels().get(LABEL_SPARK_VERSION_NAME));
assertEquals(VERSION, statefulSet1.getMetadata().getLabels().get(LABEL_SPARK_VERSION_NAME));
assertEquals(
"4.0.0",
VERSION,
statefulSet1
.getSpec()
.getTemplate()
Expand Down Expand Up @@ -230,11 +231,11 @@ void testMasterStatefulSetWithTemplate() {
assertEquals("my-namespace", statefulSet1.getMetadata().getNamespace());
assertEquals("cluster-name-master", statefulSet1.getMetadata().getName());
assertEquals("bar", statefulSet1.getMetadata().getLabels().get("foo"));
assertEquals("4.0.0", statefulSet1.getMetadata().getLabels().get(LABEL_SPARK_VERSION_NAME));
assertEquals(VERSION, statefulSet1.getMetadata().getLabels().get(LABEL_SPARK_VERSION_NAME));
assertEquals(1, statefulSet1.getSpec().getTemplate().getSpec().getInitContainers().size());
assertEquals(2, statefulSet1.getSpec().getTemplate().getSpec().getContainers().size());
assertEquals(
"4.0.0",
VERSION,
statefulSet1
.getSpec()
.getTemplate()
Expand All @@ -249,9 +250,9 @@ void testWorkerStatefulSet() {
StatefulSet statefulSet = spec.getWorkerStatefulSet();
assertEquals("my-namespace", statefulSet.getMetadata().getNamespace());
assertEquals("cluster-name-worker", statefulSet.getMetadata().getName());
assertEquals("4.0.0", statefulSet.getMetadata().getLabels().get(LABEL_SPARK_VERSION_NAME));
assertEquals(VERSION, statefulSet.getMetadata().getLabels().get(LABEL_SPARK_VERSION_NAME));
assertEquals(
"4.0.0",
VERSION,
statefulSet
.getSpec()
.getTemplate()
Expand Down Expand Up @@ -304,9 +305,9 @@ void testWorkerStatefulSetWithTemplate() {
StatefulSet statefulSet = spec.getWorkerStatefulSet();
assertEquals("my-namespace", statefulSet.getMetadata().getNamespace());
assertEquals("cluster-name-worker", statefulSet.getMetadata().getName());
assertEquals("4.0.0", statefulSet.getMetadata().getLabels().get(LABEL_SPARK_VERSION_NAME));
assertEquals(VERSION, statefulSet.getMetadata().getLabels().get(LABEL_SPARK_VERSION_NAME));
assertEquals(
"4.0.0",
VERSION,
statefulSet
.getSpec()
.getTemplate()
Expand Down Expand Up @@ -338,7 +339,7 @@ void testHorizontalPodAutoscaler() {
assertEquals("HorizontalPodAutoscaler", hpa.getKind());
assertEquals("my-namespace", hpa.getMetadata().getNamespace());
assertEquals("cluster-name-worker-hpa", hpa.getMetadata().getName());
assertEquals("4.0.0", hpa.getMetadata().getLabels().get(LABEL_SPARK_VERSION_NAME));
assertEquals(VERSION, hpa.getMetadata().getLabels().get(LABEL_SPARK_VERSION_NAME));
assertEquals(1, hpa.getSpec().getMinReplicas());
assertEquals(3, hpa.getSpec().getMaxReplicas());
assertEquals(1, hpa.getSpec().getMetrics().size());
Expand Down
Loading