Make sure the results folder exists

tektoncd · Jan 17, 2020 · d5a867a · d5a867a
1 parent d8a0190
commit d5a867a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 35 deletions.
diff --git a/cmd/entrypoint/main.go b/cmd/entrypoint/main.go
@@ -25,6 +25,7 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/tektoncd/pipeline/pkg/apis/pipeline"
 	"github.com/tektoncd/pipeline/pkg/entrypoint"
 )
 
@@ -53,6 +54,11 @@ func main() {
 		PostWriter:      &realPostWriter{},
 		Results:         strings.Split(*results, ","),
 	}
+	if len(e.Results) != 0 {
+		if err := os.MkdirAll(pipeline.DefaultResultPath, 0755); err != nil {
+			log.Fatalf("Error creating the results directory: %v", err)
+		}
+	}
 	if err := e.Go(); err != nil {
 		switch t := err.(type) {
 		case skipError:

diff --git a/pkg/pod/entrypoint.go b/pkg/pod/entrypoint.go
@@ -22,7 +22,6 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/tektoncd/pipeline/pkg/apis/pipeline"
 	"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -41,8 +40,6 @@ const (
 	readyAnnotation        = "tekton.dev/ready"
 	readyAnnotationValue   = "READY"
 
-	resultsVolumeName = "tekton-internal-results"
-
 	stepPrefix    = "step-"
 	sidecarPrefix = "sidecar-"
 )
@@ -58,15 +55,6 @@ var (
 		VolumeSource: corev1.VolumeSource{EmptyDir: &corev1.EmptyDirVolumeSource{}},
 	}
 
-	resultsMount = corev1.VolumeMount{
-		Name:      resultsVolumeName,
-		MountPath: pipeline.DefaultResultPath,
-	}
-	resultsVolume = corev1.Volume{
-		Name:         resultsVolumeName,
-		VolumeSource: corev1.VolumeSource{EmptyDir: &corev1.EmptyDirVolumeSource{}},
-	}
-
 	// TODO(#1605): Signal sidecar readiness by injecting entrypoint,
 	// remove dependency on Downward API.
 	downwardVolume = corev1.Volume{
@@ -98,26 +86,16 @@ var (
 // method, using entrypoint_lookup.go.
 //
 // TODO(#1605): Also use entrypoint injection to order sidecar start/stop.
-func orderContainers(images pipeline.Images, steps []corev1.Container, results []v1alpha1.TaskResult) ([]corev1.Container, []corev1.Container, error) {
-	initContainers := []corev1.Container{}
-	if results != nil && len(results) != 0 {
-		initContainers = append(initContainers, corev1.Container{
-			Name:         "results-dir-initializer",
-			Image:        images.ShellImage,
-			Command:      []string{"sh"},
-			Args:         []string{"-c", "mkdir -p " + pipeline.DefaultResultPath},
-			VolumeMounts: []corev1.VolumeMount{resultsMount},
-		})
-	}
-	initContainers = append(initContainers, corev1.Container{
+func orderContainers(entrypointImage string, steps []corev1.Container, results []v1alpha1.TaskResult) (corev1.Container, []corev1.Container, error) {
+	initContainer := corev1.Container{
 		Name:         "place-tools",
-		Image:        images.EntrypointImage,
+		Image:        entrypointImage,
 		Command:      []string{"cp", "/ko-app/entrypoint", entrypointBinary},
 		VolumeMounts: []corev1.VolumeMount{toolsMount},
-	})
+	}
 
 	if len(steps) == 0 {
-		return []corev1.Container{}, nil, errors.New("No steps specified")
+		return corev1.Container{}, nil, errors.New("No steps specified")
 	}
 
 	for i, s := range steps {
@@ -144,7 +122,7 @@ func orderContainers(images pipeline.Images, steps []corev1.Container, results [
 
 		cmd, args := s.Command, s.Args
 		if len(cmd) == 0 {
-			return []corev1.Container{}, nil, fmt.Errorf("Step %d did not specify command", i)
+			return corev1.Container{}, nil, fmt.Errorf("Step %d did not specify command", i)
 		}
 		if len(cmd) > 1 {
 			args = append(cmd[1:], args...)
@@ -161,7 +139,7 @@ func orderContainers(images pipeline.Images, steps []corev1.Container, results [
 	// Mount the Downward volume into the first step container.
 	steps[0].VolumeMounts = append(steps[0].VolumeMounts, downwardMount)
 
-	return initContainers, steps, nil
+	return initContainer, steps, nil
 }
 
 func resultArgument(steps []corev1.Container, results []v1alpha1.TaskResult) []string {

diff --git a/pkg/pod/entrypoint_test.go b/pkg/pod/entrypoint_test.go
@@ -86,7 +86,7 @@ func TestOrderContainers(t *testing.T) {
 		VolumeMounts:           []corev1.VolumeMount{toolsMount},
 		TerminationMessagePath: "/tekton/termination",
 	}}
-	gotInit, got, err := orderContainers(images, steps, nil)
+	gotInit, got, err := orderContainers(images.EntrypointImage, steps, nil)
 	if err != nil {
 		t.Fatalf("orderContainers: %v", err)
 	}
@@ -170,7 +170,7 @@ func TestEntryPointResults(t *testing.T) {
 		VolumeMounts:           []corev1.VolumeMount{toolsMount},
 		TerminationMessagePath: "/tekton/termination",
 	}}
-	_, got, err := orderContainers(images, steps, results)
+	_, got, err := orderContainers(images.EntrypointImage, steps, results)
 	if err != nil {
 		t.Fatalf("orderContainers: %v", err)
 	}
@@ -208,7 +208,7 @@ func TestEntryPointResultsSingleStep(t *testing.T) {
 		VolumeMounts:           []corev1.VolumeMount{toolsMount, downwardMount},
 		TerminationMessagePath: "/tekton/termination",
 	}}
-	_, got, err := orderContainers(images, steps, results)
+	_, got, err := orderContainers(images.EntrypointImage, steps, results)
 	if err != nil {
 		t.Fatalf("orderContainers: %v", err)
 	}
@@ -242,7 +242,7 @@ func TestEntryPointSingleResultsSingleStep(t *testing.T) {
 		VolumeMounts:           []corev1.VolumeMount{toolsMount, downwardMount},
 		TerminationMessagePath: "/tekton/termination",
 	}}
-	_, got, err := orderContainers(images, steps, results)
+	_, got, err := orderContainers(images.EntrypointImage, steps, results)
 	if err != nil {
 		t.Fatalf("orderContainers: %v", err)
 	}

diff --git a/pkg/pod/pod.go b/pkg/pod/pod.go
@@ -112,11 +112,11 @@ func MakePod(images pipeline.Images, taskRun *v1alpha1.TaskRun, taskSpec v1alpha
 
 	// Rewrite steps with entrypoint binary. Append the entrypoint init
 	// container to place the entrypoint binary.
-	entrypointInits, stepContainers, err := orderContainers(images, stepContainers, taskSpec.Results)
+	entrypointInit, stepContainers, err := orderContainers(images.EntrypointImage, stepContainers, taskSpec.Results)
 	if err != nil {
 		return nil, err
 	}
-	initContainers = append(initContainers, entrypointInits...)
+	initContainers = append(initContainers, entrypointInit)
 	volumes = append(volumes, toolsVolume, downwardVolume)
 
 	// Zero out non-max resource requests, move max resource requests to the last step.