moved config map mounts to driver/executors

Author: adwk67

deploy/crd/sparkapplication.crd.yaml

@@ -98,6 +98,19 @@ spec:
                 driver:
                   nullable: true
                   properties:
+                    configMapMounts:
+                      items:
+                        properties:
+                          configMapName:
+                            type: string
+                          path:
+                            type: string
+                        required:
+                          - configMapName
+                          - path
+                        type: object
+                      nullable: true
+                      type: array
                     coreLimit:
                       nullable: true
                       type: string
@@ -222,6 +235,19 @@ spec:
                 executor:
                   nullable: true
                   properties:
+                    configMapMounts:
+                      items:
+                        properties:
+                          configMapName:
+                            type: string
+                          path:
+                            type: string
+                        required:
+                          - configMapName
+                          - path
+                        type: object
+                      nullable: true
+                      type: array
                     cores:
                       format: uint
                       minimum: 0.0

deploy/helm/spark-k8s-operator/crds/crds.yaml

@@ -100,6 +100,19 @@ spec:
                 driver:
                   nullable: true
                   properties:
+                    configMapMounts:
+                      items:
+                        properties:
+                          configMapName:
+                            type: string
+                          path:
+                            type: string
+                        required:
+                          - configMapName
+                          - path
+                        type: object
+                      nullable: true
+                      type: array
                     coreLimit:
                       nullable: true
                       type: string
@@ -224,6 +237,19 @@ spec:
                 executor:
                   nullable: true
                   properties:
+                    configMapMounts:
+                      items:
+                        properties:
+                          configMapName:
+                            type: string
+                          path:
+                            type: string
+                        required:
+                          - configMapName
+                          - path
+                        type: object
+                      nullable: true
+                      type: array
                     cores:
                       format: uint
                       minimum: 0.0

deploy/manifests/crds.yaml

@@ -101,6 +101,19 @@ spec:
                 driver:
                   nullable: true
                   properties:
+                    configMapMounts:
+                      items:
+                        properties:
+                          configMapName:
+                            type: string
+                          path:
+                            type: string
+                        required:
+                          - configMapName
+                          - path
+                        type: object
+                      nullable: true
+                      type: array
                     coreLimit:
                       nullable: true
                       type: string
@@ -225,6 +238,19 @@ spec:
                 executor:
                   nullable: true
                   properties:
+                    configMapMounts:
+                      items:
+                        properties:
+                          configMapName:
+                            type: string
+                          path:
+                            type: string
+                        required:
+                          - configMapName
+                          - path
+                        type: object
+                      nullable: true
+                      type: array
                     cores:
                       format: uint
                       minimum: 0.0

examples/ny-tlc-report-configmap.yaml

@@ -28,20 +28,23 @@ spec:
     "spark.hadoop.fs.s3a.aws.credentials.provider": "org.apache.hadoop.fs.s3a.AnonymousAWSCredentialsProvider"
     "spark.driver.extraClassPath": "/dependencies/jars/hadoop-aws-3.2.0.jar:/dependencies/jars/aws-java-sdk-bundle-1.11.375.jar"
     "spark.executor.extraClassPath": "/dependencies/jars/hadoop-aws-3.2.0.jar:/dependencies/jars/aws-java-sdk-bundle-1.11.375.jar"
-  configMapMounts:
-    - configMapName: cm-job-arguments
-      path: /arguments
   driver:
     cores: 1
     coreLimit: "1200m"
     memory: "512m"
     volumeMounts:
       - name: job-deps
         mountPath: /dependencies
+    configMapMounts:
+      - configMapName: cm-job-arguments
+        path: /arguments
   executor:
     cores: 1
     instances: 3
     memory: "512m"
     volumeMounts:
       - name: job-deps
         mountPath: /dependencies
+    configMapMounts:
+      - configMapName: cm-job-arguments
+        path: /arguments

rust/crd/src/lib.rs

@@ -111,15 +111,6 @@ pub struct S3 {
     pub endpoint: Option<String>,
 }
 
-#[derive(Clone, Debug, Default, Deserialize, JsonSchema, PartialEq, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ConfigMapMount {
-    pub config_map_name: String,
-    pub path: String,
-}
-
-impl ConfigMapMount {}
-
 impl SparkApplication {
     pub fn enable_monitoring(&self) -> Option<bool> {
         let spec: &SparkApplicationSpec = &self.spec;
@@ -180,8 +171,22 @@ impl SparkApplication {
         tmp.iter().flat_map(|v| v.iter()).cloned().collect()
     }
 
-    pub fn config_map_mounts(&self) -> Vec<ConfigMapMount> {
-        let tmp = self.spec.config_map_mounts.as_ref();
+    pub fn executor_config_map_mounts(&self) -> Vec<ConfigMapMount> {
+        let tmp = self
+            .spec
+            .executor
+            .as_ref()
+            .and_then(|executor_conf| executor_conf.config_map_mounts.clone());
+
+        tmp.iter().flat_map(|v| v.iter()).cloned().collect()
+    }
+
+    pub fn driver_config_map_mounts(&self) -> Vec<ConfigMapMount> {
+        let tmp = self
+            .spec
+            .driver
+            .as_ref()
+            .and_then(|driver_conf| driver_conf.config_map_mounts.clone());
 
         tmp.iter().flat_map(|v| v.iter()).cloned().collect()
     }
@@ -304,6 +309,13 @@ pub struct CommonConfig {
     pub enable_monitoring: Option<bool>,
 }
 
+#[derive(Clone, Debug, Default, Deserialize, JsonSchema, PartialEq, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ConfigMapMount {
+    pub config_map_name: String,
+    pub path: String,
+}
+
 #[derive(Clone, Debug, Default, Deserialize, JsonSchema, PartialEq, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct DriverConfig {
@@ -312,6 +324,8 @@ pub struct DriverConfig {
     pub memory: Option<String>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub volume_mounts: Option<Vec<VolumeMount>>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub config_map_mounts: Option<Vec<ConfigMapMount>>,
 }
 
 impl DriverConfig {
@@ -340,6 +354,8 @@ pub struct ExecutorConfig {
     pub memory: Option<String>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub volume_mounts: Option<Vec<VolumeMount>>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub config_map_mounts: Option<Vec<ConfigMapMount>>,
 }
 
 impl ExecutorConfig {

rust/operator-binary/src/spark_k8s_controller.rs

@@ -241,7 +241,7 @@ fn pod_template_config_map(
         volumes.as_ref(),
         spark_application.driver_volume_mounts().as_ref(),
         spark_application.env().as_ref(),
-        spark_application.config_map_mounts(),
+        spark_application.driver_config_map_mounts(),
     )?;
     let executor_template = pod_template(
         CONTAINER_NAME_EXECUTOR,
@@ -250,7 +250,7 @@ fn pod_template_config_map(
         volumes.as_ref(),
         spark_application.executor_volume_mounts().as_ref(),
         spark_application.env().as_ref(),
-        spark_application.config_map_mounts(),
+        spark_application.executor_config_map_mounts(),
     )?;
 
     let mut builder = ConfigMapBuilder::new();
@@ -306,13 +306,6 @@ fn spark_job(
     }];
     volumes.extend(spark_application.volumes());
 
-    // add the volumes/volume mounts for the configMaps in the job container
-    apply_configmap_mounts(
-        spark_application.config_map_mounts(),
-        &mut volume_mounts,
-        &mut volumes,
-    );
-
     let commands = spark_application
         .build_command(serviceaccount.metadata.name.as_ref().unwrap())
         .context(BuildCommandSnafu)?;