knative · knative-prow-robot · Sep 21, 2018 · Sep 21, 2018
diff --git a/cmd/nop/main.go b/cmd/nop/main.go
@@ -0,0 +1,23 @@
+/*
+Copyright 2018 The Knative Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package main
+
+import "fmt"
+
+func main() {
+	fmt.Println("Build successful")
+}
diff --git a/config/999-cache.yaml b/config/999-cache.yaml
@@ -39,3 +39,13 @@ metadata:
   namespace: knative-build
 spec:
   image: gcr.io/cloud-builders/gcs-fetcher
+---
+apiVersion: caching.internal.knative.dev/v1alpha1
+kind: Image
+metadata:
+  name: nop
+  namespace: knative-build
+spec:
+  # This is the Go import path for the binary that is containerized
+  # and substituted here.
+  image: github.com/knative/build/cmd/nop
diff --git a/config/controller.yaml b/config/controller.yaml
@@ -32,11 +32,12 @@ spec:
           "-stderrthreshold", "INFO",
           "-creds-image", "github.com/knative/build/cmd/creds-init",
           "-git-image", "github.com/knative/build/cmd/git-init",
+          "-nop-image", "github.com/knative/build/cmd/nop",
         ]
         volumeMounts:
         - name: config-logging
           mountPath: /etc/config-logging
       volumes:
         - name: config-logging
           configMap:
-            name: config-logging
+            name: config-logging
diff --git a/pkg/builder/cluster/convert/convert.go b/pkg/builder/cluster/convert/convert.go
@@ -22,7 +22,6 @@ import (
 	"flag"
 	"fmt"
 	"path/filepath"
-	"reflect"
 	"strings"
 
 	corev1 "k8s.io/api/core/v1"
@@ -63,13 +62,6 @@ var (
 		Name:         "home",
 		VolumeSource: emptyVolumeSource,
 	}}
-	// A benign placeholder for when a container is required, but none was specified.
-	nopContainer = corev1.Container{
-		Name:    "nop",
-		Image:   "busybox",
-		Command: []string{"/bin/echo"},
-		Args:    []string{"Build successful"},
-	}
 )
 
 func validateVolumes(vs []corev1.Volume) error {
@@ -106,6 +98,9 @@ var (
 	// The container with Git that we use to implement the Git source step.
 	gitImage = flag.String("git-image", "override-with-git:latest",
 		"The container image containing our Git binary.")
+	// The container that just prints build successful.
+	nopImage = flag.String("nop-image", "override-with-nop:latest",
+		"The container image run at the end of the build to log build success")
 	gcsFetcherImage = flag.String("gcs-fetcher-image", "gcr.io/cloud-builders/gcs-fetcher:latest",
 		"The container image containing our GCS fetcher binary.")
 )
@@ -366,9 +361,12 @@ func FromCRD(build *v1alpha1.Build, kubeclient kubernetes.Interface) (*corev1.Po
 		},
 		Spec: corev1.PodSpec{
 			// If the build fails, don't restart it.
-			RestartPolicy:      corev1.RestartPolicyNever,
-			InitContainers:     initContainers,
-			Containers:         []corev1.Container{nopContainer},
+			RestartPolicy:  corev1.RestartPolicyNever,
+			InitContainers: initContainers,
+			Containers: []corev1.Container{{
+				Name:  "nop",
+				Image: *nopImage,
+			}},
 			ServiceAccountName: build.Spec.ServiceAccountName,
 			Volumes:            volumes,
 			NodeSelector:       build.Spec.NodeSelector,
@@ -445,10 +443,8 @@ func filterImplicitVolumes(vs []corev1.Volume) []corev1.Volume {
 func ToCRD(pod *corev1.Pod) (*v1alpha1.Build, error) {
 	podSpec := pod.Spec.DeepCopy()
 
-	for _, c := range podSpec.Containers {
-		if !reflect.DeepEqual(c, nopContainer) {
-			return nil, fmt.Errorf("unrecognized container spec, got: %v", podSpec.Containers)
-		}
+	if len(podSpec.Containers) != 1 {
+		return nil, fmt.Errorf("unrecognized container spec, got: %v", podSpec.Containers)
 	}
 
 	subPath := ""

diff --git a/pkg/builder/cluster/convert/convert_test.go b/pkg/builder/cluster/convert/convert_test.go
@@ -32,6 +32,11 @@ import (
 
 var ignorePrivateResourceFields = cmpopts.IgnoreUnexported(resource.Quantity{})
 
+var nopContainer = corev1.Container{
+	Name:  "nop",
+	Image: *nopImage,
+}
+
 func read2CRD(f string) (*v1alpha1.Build, error) {
 	var bs v1alpha1.Build
 	if err := buildtest.DataAs(f, &bs.Spec); err != nil {