feat: single sidecar container to surface artifacts

cmd/controller/main.go

@@ -56,7 +56,6 @@ func main() {
 	flag.StringVar(&opts.Images.ShellImage, "shell-image", "", "The container image containing a shell")
 	flag.StringVar(&opts.Images.ShellImageWin, "shell-image-win", "", "The container image containing a windows shell")
 	flag.StringVar(&opts.Images.WorkingDirInitImage, "workingdirinit-image", "", "The container image containing our working dir init binary.")
-	flag.StringVar(&opts.Images.SidecarLogArtifactsImage, "sidecarlogartifacts-image", "", "The container image containing the binary for accessing artifacts.")
 	// This parses flags.
 	cfg := injection.ParseAndGetRESTConfigOrDie()
 

cmd/sidecarlogresults/main.go

@@ -32,13 +32,14 @@ func main() {
 	var resultsDir string
 	var resultNames string
 	var stepResultsStr string
+	var stepNames string
+
 	flag.StringVar(&resultsDir, "results-dir", pipeline.DefaultResultPath, "Path to the results directory. Default is /tekton/results")
 	flag.StringVar(&resultNames, "result-names", "", "comma separated result names to expect from the steps running in the pod. eg. foo,bar,baz")
 	flag.StringVar(&stepResultsStr, "step-results", "", "json containing a map of step Name as key and list of result Names. eg. {\"stepName\":[\"foo\",\"bar\",\"baz\"]}")
+	flag.StringVar(&stepNames, "step-names", "", "comma separated step names. eg. foo,bar,baz")
 	flag.Parse()
-	if resultNames == "" {
-		log.Fatal("result-names were not provided")
-	}
+
 	expectedResults := strings.Split(resultNames, ",")
 	expectedStepResults := map[string][]string{}
 	if err := json.Unmarshal([]byte(stepResultsStr), &expectedStepResults); err != nil {
@@ -48,4 +49,10 @@ func main() {
 	if err != nil {
 		log.Fatal(err)
 	}
+
+	names := strings.Split(stepNames, ",")
+	err = sidecarlogresults.LookForArtifacts(os.Stdout, names, pod.RunDir)
+	if err != nil {
+		log.Fatal(err)
+	}
 }

config/controller.yaml

@@ -68,7 +68,6 @@ spec:
           "-entrypoint-image", "ko://github.com/tektoncd/pipeline/cmd/entrypoint",
           "-nop-image", "ko://github.com/tektoncd/pipeline/cmd/nop",
           "-sidecarlogresults-image", "ko://github.com/tektoncd/pipeline/cmd/sidecarlogresults",
-          "-sidecarlogartifacts-image", "ko://github.com/tektoncd/pipeline/cmd/sidecarlogartifacts",
           "-workingdirinit-image", "ko://github.com/tektoncd/pipeline/cmd/workingdirinit",
 
           # The shell image must allow root in order to create directories and copy files to PVCs.