dongjoon-hyun commented on code in PR #10: URL: https://github.com/apache/spark-kubernetes-operator/pull/10#discussion_r1605566899
########## spark-submission-worker/src/main/java/org/apache/spark/k8s/operator/SparkAppResourceSpec.java: ########## @@ -0,0 +1,129 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.spark.k8s.operator; + +import java.util.ArrayList; +import java.util.List; + +import scala.Tuple2; +import scala.collection.immutable.HashMap; +import scala.collection.immutable.Map; +import scala.jdk.CollectionConverters; + +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.ContainerBuilder; +import io.fabric8.kubernetes.api.model.HasMetadata; +import io.fabric8.kubernetes.api.model.Pod; +import io.fabric8.kubernetes.api.model.PodBuilder; +import lombok.Getter; +import org.apache.commons.lang3.StringUtils; + +import org.apache.spark.deploy.k8s.Config; +import org.apache.spark.deploy.k8s.Constants; +import org.apache.spark.deploy.k8s.KubernetesDriverSpec; +import org.apache.spark.deploy.k8s.SparkPod; +import org.apache.spark.deploy.k8s.submit.KubernetesClientUtils; + +/** + * Resembles resources that would be directly launched by operator. Based on resolved + * org.apache.spark.deploy.k8s.KubernetesDriverSpec, it: + * + * <ul> + * <li>Add ConfigMap as a resource for driver + * <li>Converts scala types to Java for easier reference from operator + * </ul> + * + * <p>This is not thread safe and not expected to be shared among reconciler threads + */ +public class SparkAppResourceSpec { + @Getter private final Pod configuredPod; + @Getter private final List<HasMetadata> driverPreResources; + @Getter private final List<HasMetadata> driverResources; + private final SparkAppDriverConf kubernetesDriverConf; + + public SparkAppResourceSpec( + SparkAppDriverConf kubernetesDriverConf, KubernetesDriverSpec kubernetesDriverSpec) { + this.kubernetesDriverConf = kubernetesDriverConf; + String namespace = kubernetesDriverConf.sparkConf().get(Config.KUBERNETES_NAMESPACE().key()); + Map<String, String> confFilesMap = + KubernetesClientUtils.buildSparkConfDirFilesMap( + kubernetesDriverConf.configMapNameDriver(), + kubernetesDriverConf.sparkConf(), + kubernetesDriverSpec.systemProperties()) + .$plus(new Tuple2<>(Config.KUBERNETES_NAMESPACE().key(), namespace)); + SparkPod sparkPod = addConfigMap(kubernetesDriverSpec.pod(), confFilesMap); + this.configuredPod = + new PodBuilder(sparkPod.pod()) + .editSpec() + .addToContainers(sparkPod.container()) + .endSpec() + .build(); + this.driverPreResources = + new ArrayList<>( + CollectionConverters.SeqHasAsJava(kubernetesDriverSpec.driverPreKubernetesResources()) + .asJava()); + this.driverResources = + new ArrayList<>( + CollectionConverters.SeqHasAsJava(kubernetesDriverSpec.driverKubernetesResources()) + .asJava()); + this.driverResources.add( + KubernetesClientUtils.buildConfigMap( + kubernetesDriverConf.configMapNameDriver(), confFilesMap, new HashMap<>())); + this.driverPreResources.forEach(r -> setNamespaceIfMissing(r, namespace)); + this.driverResources.forEach(r -> setNamespaceIfMissing(r, namespace)); + } + + private void setNamespaceIfMissing(HasMetadata resource, String namespace) { + if (StringUtils.isNotEmpty(resource.getMetadata().getNamespace())) { + return; + } + resource.getMetadata().setNamespace(namespace); + } + + private SparkPod addConfigMap(SparkPod pod, Map<String, String> confFilesMap) { + Container containerWithVolume = + new ContainerBuilder(pod.container()) + .addNewEnv() + .withName(Constants.ENV_SPARK_CONF_DIR()) + .withValue(Constants.SPARK_CONF_DIR_INTERNAL()) + .endEnv() + .addNewVolumeMount() + .withName(Constants.SPARK_CONF_VOLUME_DRIVER()) + .withMountPath(Constants.SPARK_CONF_DIR_INTERNAL()) + .endVolumeMount() + .build(); + Pod podWithVolume = Review Comment: It would be great to have more specific name like `podWithConfigMapVolume`. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org
