[Addon #579] Refactor the spark-workload parameter definition

Signed-off-by: yanghua <yanghua1127@gmail.com>
kubevela · Mar 1, 2023 · 043d7df · 043d7df
1 parent 1c0cf18
commit 043d7df
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 34 deletions.
diff --git a/examples/spark-kubernetes-operator/sparkapp.yaml b/examples/spark-kubernetes-operator/sparkapp.yaml
@@ -22,11 +22,13 @@ spec:
           hostPath:
             path: "/tmp"
             type: Directory
-      driverCores: 1
-      executorCores: 1
-      driverVolumeMounts:
-        - name: "test-volume"
-          mountPath: "/tmp"
-      executorVolumeMounts:
-        - name: "test-volume"
-          mountPath: "/tmp"
+      driver:
+        cores: 1
+        volumeMounts:
+          - name: "test-volume"
+            mountPath: "/tmp"
+      executor:
+        cores: 1
+        volumeMounts:
+          - name: "test-volume"
+            mountPath: "/tmp"
diff --git a/experimental/addons/spark-kubernetes-operator/definitions/spark-workload.cue b/experimental/addons/spark-kubernetes-operator/definitions/spark-workload.cue
@@ -28,10 +28,22 @@ template: {
 		mainApplicationFile: string
 		// +usage=Specify the version of Spark the application uses
 		sparkVersion: string
-		// +usage=Specify the number of CPU cores to request for the driver pod
-		driverCores: int
-		// +usage=Specify the number of CPU cores to request for the executor pod
-		executorCores: int
+		// +usage=Specify the driver sepc request for the driver pod
+		driver: {
+			cores: int
+			volumeMounts?: [...{
+				name:      string
+				mountPath: string
+			}]
+		}
+		// +usage=Specify the executor spec request for the executor pod
+		executor: {
+			cores: int
+			volumeMounts?: [...{
+				name:      string
+				mountPath: string
+			}]
+		}
 		// +usage=Specify a list of arguments to be passed to the application
 		arguments?: [...string]
 		// +usage=Specify the config information carries user-specified Spark configuration properties as they would use the  "--conf" option in spark-submit
@@ -50,16 +62,6 @@ template: {
 				type: *"Directory" | string
 			}
 		}]
-		// +usage=Specify the volumes listed in "parameter.volumes" to mount into the main container’s filesystem for driver pod
-		driverVolumeMounts?: [...{
-			name:      string
-			mountPath: string
-		}]
-		// +usage=Specify the volumes listed in "parameter.volumes" to mount into the main container’s filesystem for executor pod
-		executorVolumeMounts?: [...{
-			name:      string
-			mountPath: string
-		}]
 	}
 
 	output: {
@@ -95,18 +97,8 @@ template: {
 				mainClass:           parameter.mainClass
 				mainApplicationFile: parameter.mainApplicationFile
 				sparkVersion:        parameter.sparkVersion
-				driver: {
-					cores: parameter.driverCores
-					if parameter.driverVolumeMounts != _|_ {
-						volumeMounts: parameter.driverVolumeMounts
-					}
-				}
-				executor: {
-					cores: parameter.executorCores
-					if parameter.executorVolumeMounts != _|_ {
-						volumeMounts: parameter.executorVolumeMounts
-					}
-				}
+				driver:              parameter.driver
+				executor:            parameter.executor
 				if parameter.volumes != _|_ {
 					volumes: parameter.volumes
 				}