Skip to content

Commit 625fa5a

Browse files
AlexNavaraekrivokonmapr
authored andcommitted
EZSPA-270 - adopt mapr spark feature to work in non-mapr env (apache#874)
- make "mapr.spark.user.secret" config optional - review all mapr-specific volumes and make them optional
1 parent d728136 commit 625fa5a

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/Config.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@ private[spark] object Config extends Logging {
735735
ConfigBuilder("spark.mapr.user.secret")
736736
.doc("Name of the mapr user secrets")
737737
.stringConf
738-
.createWithDefault("mapr-user-secret")
738+
.createOptional
739739

740740
val KUBERNETES_AUTH_SUBMISSION_CONF_PREFIX =
741741
"spark.kubernetes.authenticate.submission"

resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/features/MaprConfigFeatureStep.scala

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,15 +130,19 @@ private[spark] class MaprConfigFeatureStep(conf: KubernetesConf)
130130
.endVolumeMount()
131131
}
132132

133-
private def applyUserSecret(podBuilder: PodBuilder, containerBuilder: ContainerBuilder) = {
134-
val userSecretName = sparkConf.get(MAPR_USER_SECRET).toString
133+
private def applyUserSecret(podBuilder: PodBuilder, containerBuilder: ContainerBuilder): Unit = {
134+
val userSecretName = sparkConf.get(MAPR_USER_SECRET)
135135
val userSecretVolumeName = s"$userSecretName-volume"
136136

137+
if (userSecretName.isEmpty) {
138+
return
139+
}
140+
137141
podBuilder.editOrNewSpec()
138142
.addNewVolume()
139143
.withName(userSecretVolumeName)
140144
.withNewSecret()
141-
.withSecretName(userSecretName)
145+
.withSecretName(userSecretName.get)
142146
.endSecret()
143147
.endVolume()
144148
.endSpec()
@@ -167,6 +171,7 @@ private[spark] class MaprConfigFeatureStep(conf: KubernetesConf)
167171
.withName(serverSecretVolume)
168172
.withNewSecret()
169173
.withSecretName(serverSecretName)
174+
.withOptional(true)
170175
.endSecret()
171176
.endVolume()
172177
.endSpec()
@@ -190,6 +195,7 @@ private[spark] class MaprConfigFeatureStep(conf: KubernetesConf)
190195
.addNewEnvFrom()
191196
.withNewConfigMapRef()
192197
.withName(clusterConfMap)
198+
.withOptional(true)
193199
.endConfigMapRef()
194200
.endEnvFrom()
195201
}

0 commit comments

Comments
 (0)