Removes build word references from TaskRun

At present `TaskRun's` `status`, it's pod containers name(`step name` prefix) and logs has references to `build` keyword. Which kind of gives the perception that `Task` is intended to perform only build operations. This patch removes those references from `TaskRun`. Fixes - #815 Signed-off-by: Vincent Demeester <[email protected]>
tektoncd · Jun 4, 2019 · 3d87e2e · 3d87e2e
1 parent a840d8f
commit 3d87e2e
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 60 deletions.
diff --git a/cmd/nop/main.go b/cmd/nop/main.go
@@ -19,5 +19,5 @@ package main
 import "fmt"
 
 func main() {
-	fmt.Println("Build successful")
+	fmt.Println("Task completed successfully")
 }
diff --git a/pkg/reconciler/v1alpha1/taskrun/resources/pod.go b/pkg/reconciler/v1alpha1/taskrun/resources/pod.go
@@ -87,11 +87,9 @@ var (
 )
 
 const (
-	// Prefixes to add to the name of the init containers.
-	// IMPORTANT: Changing these values without changing fluentd collection configuration
-	// will break log collection for init containers.
-	containerPrefix            = "build-step-"
-	unnamedInitContainerPrefix = "build-step-unnamed-"
+	// Prefixes to add to the name of the containers.
+	containerPrefix            = "step-"
+	unnamedInitContainerPrefix = "step-unnamed-"
 	// Name of the credential initialization container.
 	credsInit = "credential-initializer"
 	// Name of the working dir initialization container.
@@ -102,9 +100,9 @@ var (
 	// The container used to initialize credentials before the build runs.
 	credsImage = flag.String("creds-image", "override-with-creds:latest",
 		"The container image for preparing our Build's credentials.")
-	// The container that just prints build successful.
+	// The container that just prints Task completed successfully.
 	nopImage = flag.String("nop-image", "override-with-nop:latest",
-		"The container image run at the end of the build to log build success")
+		"The container image run at the end of the build to log task success")
 )
 
 func makeCredentialInitializer(serviceAccountName, namespace string, kubeclient kubernetes.Interface) (*corev1.Container, []corev1.Volume, error) {

diff --git a/pkg/reconciler/v1alpha1/taskrun/resources/pod_test.go b/pkg/reconciler/v1alpha1/taskrun/resources/pod_test.go
@@ -160,7 +160,7 @@ func TestMakePod(t *testing.T) {
 				WorkingDir:   workspaceDir,
 			}},
 			Containers: []corev1.Container{{
-				Name:         "build-step-name",
+				Name:         "step-name",
 				Image:        "image",
 				Env:          implicitEnvVars,
 				VolumeMounts: implicitVolumeMounts,
@@ -206,7 +206,7 @@ func TestMakePod(t *testing.T) {
 				WorkingDir:   workspaceDir,
 			}},
 			Containers: []corev1.Container{{
-				Name:         "build-step-name",
+				Name:         "step-name",
 				Image:        "image",
 				Env:          implicitEnvVars,
 				VolumeMounts: implicitVolumeMounts,
@@ -227,7 +227,7 @@ func TestMakePod(t *testing.T) {
 		desc: "very-long-step-name",
 		ts: v1alpha1.TaskSpec{
 			Steps: []corev1.Container{{
-				Name:  "a-very-long-character-step-name-to-trigger-max-len----and-invalid-characters",
+				Name:  "a-very-very-long-character-step-name-to-trigger-max-len----and-invalid-characters",
 				Image: "image",
 			}},
 		},
@@ -246,7 +246,7 @@ func TestMakePod(t *testing.T) {
 				WorkingDir:   workspaceDir,
 			}},
 			Containers: []corev1.Container{{
-				Name:         "build-step-a-very-long-character-step-name-to-trigger-max-len",
+				Name:         "step-a-very-very-long-character-step-name-to-trigger-max-len",
 				Image:        "image",
 				Env:          implicitEnvVars,
 				VolumeMounts: implicitVolumeMounts,
@@ -286,7 +286,7 @@ func TestMakePod(t *testing.T) {
 				WorkingDir:   workspaceDir,
 			}},
 			Containers: []corev1.Container{{
-				Name:         "build-step-ends-with-invalid",
+				Name:         "step-ends-with-invalid",
 				Image:        "image",
 				Env:          implicitEnvVars,
 				VolumeMounts: implicitVolumeMounts,
@@ -332,7 +332,7 @@ func TestMakePod(t *testing.T) {
 				WorkingDir:   workspaceDir,
 			}},
 			Containers: []corev1.Container{{
-				Name:         "build-step-name",
+				Name:         "step-name",
 				Image:        "image",
 				Env:          implicitEnvVars,
 				VolumeMounts: implicitVolumeMounts,

diff --git a/pkg/reconciler/v1alpha1/taskrun/taskrun.go b/pkg/reconciler/v1alpha1/taskrun/taskrun.go
@@ -79,7 +79,7 @@ const (
 
 	// imageDigestExporterContainerName defines the name of the container that will collect the
 	// built images digest
-	imageDigestExporterContainerName = "build-step-image-digest-exporter"
+	imageDigestExporterContainerName = "step-image-digest-exporter"
 )
 
 // Reconciler implements controller.Reconciler for Configuration resources.
@@ -366,7 +366,7 @@ func updateStatusFromPod(taskRun *v1alpha1.TaskRun, pod *corev1.Pod, resourceLis
 		taskRun.Status.SetCondition(&apis.Condition{
 			Type:   apis.ConditionSucceeded,
 			Status: corev1.ConditionUnknown,
-			Reason: "Building",
+			Reason: reasonRunning,
 		})
 	case corev1.PodFailed:
 		msg := getFailureMessage(pod)