Remove default flag values for image names

These values were previously defined in two places (here in flag
defaults, and in config/controller.yaml), which could lead to confusing
mismatches (#3007)

Author: imjasonh

cmd/controller/main.go

@@ -18,6 +18,7 @@ package main
 
 import (
 	"flag"
+	"log"
 
 	"github.com/tektoncd/pipeline/pkg/apis/pipeline"
 	"github.com/tektoncd/pipeline/pkg/reconciler/pipelinerun"
@@ -34,26 +35,18 @@ const (
 )
 
 var (
-	entrypointImage = flag.String("entrypoint-image", "override-with-entrypoint:latest",
-		"The container image containing our entrypoint binary.")
-	nopImage               = flag.String("nop-image", "tianon/true", "The container image used to stop sidecars")
-	affinityAssistantImage = flag.String("affinity-assistant-image", "nginx", "The container image used for the Affinity Assistant")
-	gitImage               = flag.String("git-image", "override-with-git:latest",
-		"The container image containing our Git binary.")
-	credsImage = flag.String("creds-image", "override-with-creds:latest",
-		"The container image for preparing our Build's credentials.")
-	kubeconfigWriterImage = flag.String("kubeconfig-writer-image", "override-with-kubeconfig-writer:latest",
-		"The container image containing our kubeconfig writer binary.")
-	shellImage  = flag.String("shell-image", "busybox", "The container image containing a shell")
-	gsutilImage = flag.String("gsutil-image", "google/cloud-sdk",
-		"The container image containing gsutil")
-	buildGCSFetcherImage = flag.String("build-gcs-fetcher-image", "gcr.io/cloud-builders/gcs-fetcher:latest",
-		"The container image containing our GCS fetcher binary.")
-	prImage = flag.String("pr-image", "override-with-pr:latest",
-		"The container image containing our PR binary.")
-	imageDigestExporterImage = flag.String("imagedigest-exporter-image", "override-with-imagedigest-exporter-image:latest",
-		"The container image containing our image digest exporter binary.")
-	namespace = flag.String("namespace", corev1.NamespaceAll, "Namespace to restrict informer to. Optional, defaults to all namespaces.")
+	entrypointImage          = flag.String("entrypoint-image", "", "The container image containing our entrypoint binary.")
+	nopImage                 = flag.String("nop-image", "", "The container image used to stop sidecars")
+	affinityAssistantImage   = flag.String("affinity-assistant-image", "", "The container image used for the Affinity Assistant")
+	gitImage                 = flag.String("git-image", "", "The container image containing our Git binary.")
+	credsImage               = flag.String("creds-image", "", "The container image for preparing our Build's credentials.")
+	kubeconfigWriterImage    = flag.String("kubeconfig-writer-image", "", "The container image containing our kubeconfig writer binary.")
+	shellImage               = flag.String("shell-image", "", "The container image containing a shell")
+	gsutilImage              = flag.String("gsutil-image", "", "The container image containing gsutil")
+	buildGCSFetcherImage     = flag.String("build-gcs-fetcher-image", "", "The container image containing our GCS fetcher binary.")
+	prImage                  = flag.String("pr-image", "", "The container image containing our PR binary.")
+	imageDigestExporterImage = flag.String("imagedigest-exporter-image", "", "The container image containing our image digest exporter binary.")
+	namespace                = flag.String("namespace", corev1.NamespaceAll, "Namespace to restrict informer to. Optional, defaults to all namespaces.")
 )
 
 func main() {
@@ -71,6 +64,9 @@ func main() {
 		PRImage:                  *prImage,
 		ImageDigestExporterImage: *imageDigestExporterImage,
 	}
+	if err := images.Validate(); err != nil {
+		log.Fatal(err)
+	}
 	sharedmain.MainWithContext(injection.WithNamespaceScope(signals.NewContext(), *namespace), ControllerLogKey,
 		taskrun.NewController(*namespace, images),
 		pipelinerun.NewController(*namespace, images),

pkg/apis/pipeline/images.go

@@ -16,6 +16,8 @@ limitations under the License.
 
 package pipeline
 
+import "fmt"
+
 // Images holds the images reference for a number of container images used
 // across tektoncd pipelines.
 type Images struct {
@@ -42,3 +44,26 @@ type Images struct {
 	// ImageDigestExporterImage is the container image containing our image digest exporter binary.
 	ImageDigestExporterImage string
 }
+
+// Validate returns an error if any image is not set.
+func (i Images) Validate() error {
+	m := map[string]string{
+		i.EntrypointImage:          "entrypoint",
+		i.NopImage:                 "nop",
+		i.AffinityAssistantImage:   "affinity assistant",
+		i.GitImage:                 "git",
+		i.CredsImage:               "creds",
+		i.KubeconfigWriterImage:    "kubeconfig writer",
+		i.ShellImage:               "shell",
+		i.GsutilImage:              "gsutil",
+		i.BuildGCSFetcherImage:     "gcs fetcher",
+		i.PRImage:                  "pr",
+		i.ImageDigestExporterImage: "image digest exporter",
+	}
+	for k, v := range m {
+		if k == "" {
+			return fmt.Errorf("%s image is unset", v)
+		}
+	}
+	return nil
+}

pkg/apis/pipeline/images_test.go

@@ -0,0 +1,45 @@
+package pipeline_test
+
+import (
+	"testing"
+
+	"github.com/tektoncd/pipeline/pkg/apis/pipeline"
+)
+
+func TestValidate(t *testing.T) {
+	valid := pipeline.Images{
+		EntrypointImage:          "set",
+		NopImage:                 "set",
+		AffinityAssistantImage:   "set",
+		GitImage:                 "set",
+		CredsImage:               "set",
+		KubeconfigWriterImage:    "set",
+		ShellImage:               "set",
+		GsutilImage:              "set",
+		BuildGCSFetcherImage:     "set",
+		PRImage:                  "set",
+		ImageDigestExporterImage: "set",
+	}
+	if err := valid.Validate(); err != nil {
+		t.Errorf("valid Images returned error: %v", err)
+	}
+
+	invalid := pipeline.Images{
+		EntrypointImage:          "set",
+		NopImage:                 "set",
+		GitImage:                 "", // unset!
+		CredsImage:               "set",
+		KubeconfigWriterImage:    "set",
+		ShellImage:               "set",
+		GsutilImage:              "set",
+		BuildGCSFetcherImage:     "set",
+		PRImage:                  "set",
+		ImageDigestExporterImage: "set",
+	}
+	wantErr := "git image is unset"
+	if err := invalid.Validate(); err == nil {
+		t.Error("invalid Images expected error, got nil")
+	} else if err.Error() != wantErr {
+		t.Errorf("Unexpected error message: got %q, want %q", err.Error(), wantErr)
+	}
+}