Add the ability to override base image busybox through flag.

- This will allow users to provide another base image if they do not
want to use "busybox" for open source compliance reasons.

cmd/controller/main.go

@@ -94,7 +94,6 @@ func main() {
 	if err != nil {
 		logger.Fatalf("Error building Build clientset: %v", err)
 	}
-	overrideBaseImage := flag.String("overrideBaseImage", "busybox", "Name of image to override default image for copy steps. Expects bash to be present on the image.")
 
 	configMapWatcher := configmap.NewInformedWatcher(kubeClient, system.Namespace)
 
@@ -129,7 +128,6 @@ func main() {
 			clusterTaskInformer,
 			buildInformer,
 			resourceInformer,
-			*overrideBaseImage,
 		),
 		pipelinerun.NewController(opt,
 			pipelineRunInformer,

config/controller.yaml

@@ -31,6 +31,7 @@ spec:
           "-logtostderr",
           "-stderrthreshold", "INFO",
           "-kubeconfig-writer-image", "github.com/knative/build-pipeline/cmd/kubeconfigwriter",
+          "-overrideBaseImage", "busybox",
         ]
         volumeMounts:
         - name: config-logging

pkg/reconciler/v1alpha1/taskrun/taskrun.go

@@ -18,6 +18,7 @@ package taskrun
 
 import (
 	"context"
+	"flag"
 	"fmt"
 	"reflect"
 
@@ -73,6 +74,8 @@ const (
 )
 
 var (
+	overrideBaseImage = flag.String("overrideBaseImage", "busybox", "Name of image to override default image for copy steps. Expects bash to be present on the image.")
+
 	groupVersionKind = schema.GroupVersionKind{
 		Group:   v1alpha1.SchemeGroupVersion.Group,
 		Version: v1alpha1.SchemeGroupVersion.Version,
@@ -96,7 +99,6 @@ type Reconciler struct {
 	resourceLister    listers.PipelineResourceLister
 	tracker           tracker.Interface
 	configStore       configStore
-	defaultBaseImage  string
 }
 
 // Check that our Reconciler implements controller.Reconciler
@@ -110,7 +112,6 @@ func NewController(
 	clusterTaskInformer informers.ClusterTaskInformer,
 	buildInformer buildinformers.BuildInformer,
 	resourceInformer informers.PipelineResourceInformer,
-	overrideBaseImage string,
 ) *controller.Impl {
 
 	c := &Reconciler{
@@ -410,13 +411,13 @@ func (c *Reconciler) createBuild(ctx context.Context, tr *v1alpha1.TaskRun, ts *
 		return nil, fmt.Errorf("couldn't create redirected Build: %v", err)
 	}
 
-	build, err := resources.AddInputResource(b, taskName, ts, tr, c.resourceLister, c.Logger, c.defaultBaseImage)
+	build, err := resources.AddInputResource(b, taskName, ts, tr, c.resourceLister, c.Logger, *overrideBaseImage)
 	if err != nil {
 		c.Logger.Errorf("Failed to create a build for taskrun: %s due to input resource error %v", tr.Name, err)
 		return nil, err
 	}
 
-	err = resources.AddOutputResources(b, taskName, ts, tr, c.resourceLister, c.Logger, c.defaultBaseImage)
+	err = resources.AddOutputResources(b, taskName, ts, tr, c.resourceLister, c.Logger, *overrideBaseImage)
 	if err != nil {
 		c.Logger.Errorf("Failed to create a build for taskrun: %s due to output resource error %v", tr.Name, err)
 		return nil, err

test/controller.go

@@ -77,9 +77,9 @@ type Informers struct {
 // TestAssets holds references to the controller, logs, clients, and informers.
 type TestAssets struct {
 	Controller *controller.Impl
-	Logs *observer.ObservedLogs
-	Clients Clients
-	Informers Informers
+	Logs       *observer.ObservedLogs
+	Clients    Clients
+	Informers  Informers
 }
 
 func seedTestData(d Data) (Clients, Informers) {
@@ -151,7 +151,7 @@ func seedTestData(d Data) (Clients, Informers) {
 
 // GetTaskRunController returns an instance of the TaskRun controller/reconciler that has been seeded with
 // d, where d represents the state of the system (existing resources) needed for the test.
-func GetTaskRunController(d Data) (TestAssets) {
+func GetTaskRunController(d Data) TestAssets {
 	c, i := seedTestData(d)
 	observer, logs := observer.New(zap.InfoLevel)
 	configMapWatcher := configmap.NewInformedWatcher(c.Kube, system.Namespace)
@@ -169,17 +169,16 @@ func GetTaskRunController(d Data) (TestAssets) {
 			i.ClusterTask,
 			i.Build,
 			i.PipelineResource,
-			"busybox", // use default base image
 		),
-		Logs: logs,
-		Clients: c,
+		Logs:      logs,
+		Clients:   c,
 		Informers: i,
 	}
 }
 
 // GetPipelineRunController returns an instance of the PipelineRun controller/reconciler that has been seeded with
 // d, where d represents the state of the system (existing resources) needed for the test.
-func GetPipelineRunController(d Data) (TestAssets) {
+func GetPipelineRunController(d Data) TestAssets {
 	c, i := seedTestData(d)
 	observer, logs := observer.New(zap.InfoLevel)
 	return TestAssets{
@@ -196,8 +195,8 @@ func GetPipelineRunController(d Data) (TestAssets) {
 			i.TaskRun,
 			i.PipelineResource,
 		),
-		Logs: logs,
-		Clients: c,
+		Logs:      logs,
+		Clients:   c,
 		Informers: i,
 	}
 }