Fix executor doesn't apply user-configured container spec correctly (#1339)

The merge function executor used wasn't merge container correctly, and it
didn't merge all fields in spec except volumeMount & Env which confused people.

To apply the user-configured container correctly, this PR changes the way of merge
and follows rules:

1. Slices are merged and return an error if the elements in the slice have name conflicts.
2. Maps are merged, the value of map of dst container are overridden if the key is the same.
3. The rest of the fields of dst container are overridden directly.

pkg/buildermgr/envwatcher.go

@@ -465,6 +465,30 @@ func (envw *environmentWatcher) createBuilderDeployment(env *fv1.Environment, ns
 		podAnnotations["sidecar.istio.io/inject"] = "false"
 	}
 
+	container, err := util.MergeContainer(&apiv1.Container{
+		Name:                   "builder",
+		Image:                  env.Spec.Builder.Image,
+		ImagePullPolicy:        envw.builderImagePullPolicy,
+		TerminationMessagePath: "/dev/termination-log",
+		Command:                []string{"/builder", envw.fetcherConfig.SharedMountPath()},
+		ReadinessProbe: &apiv1.Probe{
+			InitialDelaySeconds: 5,
+			PeriodSeconds:       2,
+			Handler: apiv1.Handler{
+				HTTPGet: &apiv1.HTTPGetAction{
+					Path: "/healthz",
+					Port: intstr.IntOrString{
+						Type:   intstr.Int,
+						IntVal: 8001,
+					},
+				},
+			},
+		},
+	}, env.Spec.Builder.Container)
+	if err != nil {
+		return nil, err
+	}
+
 	deployment := &appsv1.Deployment{
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace: ns,
@@ -482,35 +506,14 @@ func (envw *environmentWatcher) createBuilderDeployment(env *fv1.Environment, ns
 					Annotations: podAnnotations,
 				},
 				Spec: apiv1.PodSpec{
-					Containers: []apiv1.Container{
-						util.MergeContainerSpecs(&apiv1.Container{
-							Name:                   "builder",
-							Image:                  env.Spec.Builder.Image,
-							ImagePullPolicy:        envw.builderImagePullPolicy,
-							TerminationMessagePath: "/dev/termination-log",
-							Command:                []string{"/builder", envw.fetcherConfig.SharedMountPath()},
-							ReadinessProbe: &apiv1.Probe{
-								InitialDelaySeconds: 5,
-								PeriodSeconds:       2,
-								Handler: apiv1.Handler{
-									HTTPGet: &apiv1.HTTPGetAction{
-										Path: "/healthz",
-										Port: intstr.IntOrString{
-											Type:   intstr.Int,
-											IntVal: 8001,
-										},
-									},
-								},
-							},
-						}, env.Spec.Builder.Container),
-					},
+					Containers:         []apiv1.Container{*container},
 					ServiceAccountName: "fission-builder",
 				},
 			},
 		},
 	}
 
-	err := envw.fetcherConfig.AddFetcherToPodSpec(&deployment.Spec.Template.Spec, "builder")
+	err = envw.fetcherConfig.AddFetcherToPodSpec(&deployment.Spec.Template.Spec, "builder")
 	if err != nil {
 		return nil, err
 	}