Fixed issue kubeflow#927 (kubeflow#930)

pkg/webhook/patch.go

@@ -188,21 +188,16 @@ func addVolumeMount(pod *corev1.Pod, mount corev1.VolumeMount) *patchOperation {
 
 func addEnvVars(pod *corev1.Pod, app *v1beta2.SparkApplication) []patchOperation {
 	var envVars []corev1.EnvVar
-	var containerName string
 	if util.IsDriverPod(pod) {
 		envVars = app.Spec.Driver.Env
-		containerName = config.SparkDriverContainerName
 	} else if util.IsExecutorPod(pod) {
 		envVars = app.Spec.Executor.Env
-		containerName = config.SparkExecutorContainerName
 	}
 
-	i := 0
-	// Find the driver or executor container in the pod.
-	for ; i < len(pod.Spec.Containers); i++ {
-		if pod.Spec.Containers[i].Name == containerName {
-			break
-		}
+	i := findContainer(pod)
+	if i < 0 {
+		glog.Warningf("not able to add EnvVars as Spark container was not found in pod %s", pod.Name)
+		return nil
 	}
 	basePath := fmt.Sprintf("/spec/containers/%d/env", i)
 
@@ -230,21 +225,16 @@ func addEnvVars(pod *corev1.Pod, app *v1beta2.SparkApplication) []patchOperation
 
 func addEnvFrom(pod *corev1.Pod, app *v1beta2.SparkApplication) []patchOperation {
 	var envFrom []corev1.EnvFromSource
-	var containerName string
 	if util.IsDriverPod(pod) {
 		envFrom = app.Spec.Driver.EnvFrom
-		containerName = config.SparkDriverContainerName
 	} else if util.IsExecutorPod(pod) {
 		envFrom = app.Spec.Executor.EnvFrom
-		containerName = config.SparkExecutorContainerName
 	}
 
-	i := 0
-	// Find the driver or executor container in the pod.
-	for ; i < len(pod.Spec.Containers); i++ {
-		if pod.Spec.Containers[i].Name == containerName {
-			break
-		}
+	i := findContainer(pod)
+	if i < 0 {
+		glog.Warningf("not able to add EnvFrom as Spark container was not found in pod %s", pod.Name)
+		return nil
 	}
 	basePath := fmt.Sprintf("/spec/containers/%d/envFrom", i)