pkg/reconciler/build/resources/pod.go

@@ -252,6 +252,7 @@ func MakePod(build *v1alpha1.Build, kubeclient kubernetes.Interface) (*corev1.Po
 
 	initContainers := []corev1.Container{*cred}
 	podContainers := []corev1.Container{}
+
 	if source := build.Spec.Source; source != nil {
 		sources = []v1alpha1.SourceSpec{*source}
 	}
@@ -280,13 +281,17 @@ func MakePod(build *v1alpha1.Build, kubeclient kubernetes.Interface) (*corev1.Po
 				return nil, err
 			}
 			// Prepend the custom container to the steps, to be augmented later with env, volume mounts, etc.
+
+			// initContainers = append(initContainers, *cust)
+			// TODO(aaron-prindle) not if I correctly handled  this piece....
 			build.Spec.Steps = append([]corev1.Container{*cust}, build.Spec.Steps...)
 		}
 		// webhook validation checks that only one source has subPath defined
 		workspaceSubPath = source.SubPath
 	}
 
-	// setup entrypoint rewriting container
+	// init container that copies entrypoint binary into shared volume
+	// to be used by all other containers w/ entrypoint rewriting
 	initContainers = append(initContainers,
 		corev1.Container{
 			Name:         InitContainerName,
@@ -333,12 +338,7 @@ func MakePod(build *v1alpha1.Build, kubeclient kubernetes.Interface) (*corev1.Po
 	// declared user volumes.
 	volumes := append(build.Spec.Volumes, implicitVolumes...)
 	volumes = append(volumes, secrets...)
-	volumes = append(volumes, corev1.Volume{
-		Name: MountName,
-		VolumeSource: corev1.VolumeSource{
-			EmptyDir: &corev1.EmptyDirVolumeSource{},
-		},
-	})
+	volumes = append(volumes, toolsVolume)
 	if err := v1alpha1.ValidateVolumes(volumes); err != nil {
 		return nil, err
 	}
@@ -403,6 +403,13 @@ var toolsMount = corev1.VolumeMount{
 	MountPath: MountPoint,
 }
 
+var toolsVolume = corev1.Volume{
+	Name: MountName,
+	VolumeSource: corev1.VolumeSource{
+		EmptyDir: &corev1.EmptyDirVolumeSource{},
+	},
+}
+
 type entrypointArgs struct {
 	Args       []string `json:"args"`
 	ProcessLog string   `json:"process_log"`