Remove the Trigger field from TaskRun.

This field is not currently used, and it's usage should be replaced with labels/annotations. This commit removes it now, before anyone takes a dependency on it. At a later time we can decide on the correct label/annotation usage for this information and start writing that data.
tektoncd · May 14, 2019 · 81f178e · 81f178e
1 parent 3a09bc0
commit 81f178e
Show file tree

Hide file tree

Showing 22 changed files with 4 additions and 254 deletions.
diff --git a/docs/taskruns.md b/docs/taskruns.md
@@ -263,8 +263,6 @@ metadata:
 spec:
   taskRef:
     name: read-task
-  trigger:
-    type: manual
   inputs:
     resources:
       - name: workspace
@@ -322,8 +320,6 @@ kind: TaskRun
 metadata:
   name: build-push-task-run-2
 spec:
-  trigger:
-    type: manual
   inputs:
     resources:
       - name: workspace
@@ -356,8 +352,6 @@ metadata:
 spec:
   taskRef:
     name: read-task
-  trigger:
-    type: manual
   inputs:
     resources:
       - name: workspace

diff --git a/docs/tutorial.md b/docs/tutorial.md
@@ -50,8 +50,6 @@ metadata:
 spec:
   taskRef:
     name: echo-hello-world
-  trigger:
-    type: manual
 ```
 
 To apply the yaml files use the following command:
@@ -86,8 +84,6 @@ spec:
   taskRef:
     name: echo-hello-world
   taskSpec: null
-  trigger:
-    type: manual
 status:
   conditions:
     - lastTransitionTime: 2018-12-11T15:50:09Z
@@ -206,8 +202,6 @@ metadata:
 spec:
   taskRef:
     name: build-docker-image-from-git-source
-  trigger:
-    type: manual
   inputs:
     resources:
       - name: docker-source
@@ -294,8 +288,6 @@ spec:
   taskRef:
     name: build-docker-image-from-git-source
   taskSpec: null
-  trigger:
-    type: manual
 status:
   conditions:
     - lastTransitionTime: 2018-12-11T18:15:09Z
@@ -434,8 +426,6 @@ metadata:
 spec:
   pipelineRef:
     name: tutorial-pipeline
-  trigger:
-    type: manual
   resources:
     - name: source-repo
       resourceRef:
@@ -489,8 +479,6 @@ spec:
       resourceRef:
         name: skaffold-image-leeroy-web
   serviceAccount: ""
-  trigger:
-    type: manual
 status:
   conditions:
     - lastTransitionTime: 2018-12-11T20:32:41Z

diff --git a/examples/pipelineruns/output-pipelinerun.yaml b/examples/pipelineruns/output-pipelinerun.yaml
@@ -90,8 +90,6 @@ metadata:
 spec:
   pipelineRef:
     name: output-pipeline
-  trigger:
-    type: manual
   serviceAccount: 'default'
   resources:
   - name: source-repo

diff --git a/examples/pipelineruns/pipelinerun.yaml b/examples/pipelineruns/pipelinerun.yaml
@@ -245,8 +245,6 @@ metadata:
 spec:
   pipelineRef:
     name: demo-pipeline
-  trigger:
-    type: manual
   serviceAccount: 'default'
   resources:
   - name: source-repo

diff --git a/examples/taskruns/gcs-resource-spec-taskrun.yaml b/examples/taskruns/gcs-resource-spec-taskrun.yaml
@@ -13,8 +13,6 @@ spec:
       image: ubuntu
       command: ["/bin/bash"]
       args: ['-c', 'ls -al /workspace/rules/rules_docker-master'] # tests build-gcs resource
-  trigger:
-    type: manual
   inputs:
     resources:
     - name: workspace

diff --git a/examples/taskruns/git-resource-spec-taskrun.yaml b/examples/taskruns/git-resource-spec-taskrun.yaml
@@ -15,8 +15,6 @@ spec:
       image: ubuntu
       command: ["/bin/bash"]
       args: ['-c', 'cat /workspace/skaffold/README.md'] # tests that resource spec and task spec can be defined in taskrun
-  trigger:
-    type: manual
   inputs:
     resources:
     - name: workspace

diff --git a/examples/taskruns/private-taskrun.yaml b/examples/taskruns/private-taskrun.yaml
@@ -49,5 +49,3 @@ spec:
       image: quay.io/rhpipeline/skopeo:alpine
       command: ["skopeo"]
       args: ["copy", "docker://gcr.io/build-crd-testing/secret-sauce", "dir:///tmp/"]
-  trigger:
-    type: manual
diff --git a/examples/taskruns/taskrun.yaml b/examples/taskruns/taskrun.yaml
@@ -74,8 +74,6 @@ metadata:
 spec:
   taskRef:
     name: build-push-kaniko
-  trigger:
-    type: manual
   inputs:
     resources:
     - name: workspace

diff --git a/pkg/apis/pipeline/v1alpha1/pipelinerun_types.go b/pkg/apis/pipeline/v1alpha1/pipelinerun_types.go
@@ -39,8 +39,7 @@ var (
 
 // PipelineRunSpec defines the desired state of PipelineRun
 type PipelineRunSpec struct {
-	PipelineRef PipelineRef     `json:"pipelineRef"`
-	Trigger     PipelineTrigger `json:"trigger"`
+	PipelineRef PipelineRef `json:"pipelineRef"`
 	// Resources is a list of bindings specifying which actual instances of
 	// PipelineResources to use for the resources the Pipeline has declared
 	// it needs.
@@ -99,22 +98,6 @@ type PipelineRef struct {
 	APIVersion string `json:"apiVersion,omitempty"`
 }
 
-// PipelineTriggerType indicates the mechanism by which this PipelineRun was created.
-type PipelineTriggerType string
-
-const (
-	// PipelineTriggerTypeManual indicates that this PipelineRun was invoked manually by a user.
-	PipelineTriggerTypeManual PipelineTriggerType = "manual"
-)
-
-// PipelineTrigger describes what triggered this Pipeline to run. It could be triggered manually,
-// or it could have been some kind of external event (not yet designed).
-type PipelineTrigger struct {
-	Type PipelineTriggerType `json:"type,omitempty"`
-	// +optional
-	Name string `json:"name,omitempty"`
-}
-
 // PipelineRunStatus defines the observed state of PipelineRun
 type PipelineRunStatus struct {
 	duckv1beta1.Status `json:",inline"`

diff --git a/pkg/apis/pipeline/v1alpha1/pipelinerun_validation.go b/pkg/apis/pipeline/v1alpha1/pipelinerun_validation.go
@@ -41,9 +41,7 @@ func (ps *PipelineRunSpec) Validate(ctx context.Context) *apis.FieldError {
 	if ps.PipelineRef.Name == "" {
 		return apis.ErrMissingField("pipelinerun.spec.Pipelineref.Name")
 	}
-	if ps.Trigger.Type != PipelineTriggerTypeManual {
-		return apis.ErrInvalidValue(string(ps.Trigger.Type), "pipelinerun.spec.trigger.type")
-	}
+
 	// check for results
 	if ps.Results != nil {
 		if err := ps.Results.Validate(ctx, "spec.results"); err != nil {

diff --git a/pkg/apis/pipeline/v1alpha1/pipelinerun_validation_test.go b/pkg/apis/pipeline/v1alpha1/pipelinerun_validation_test.go
@@ -58,28 +58,10 @@ func TestPipelineRun_Invalidate(t *testing.T) {
 					Name: "pipelinelineName",
 				},
 				Spec: PipelineRunSpec{
-					Trigger: PipelineTrigger{
-						Type: PipelineTriggerTypeManual,
-					},
+					ServiceAccount: "foo",
 				},
 			},
 			want: apis.ErrMissingField("pipelinerun.spec.Pipelineref.Name"),
-		}, {
-			name: "invalid trigger reference",
-			pr: PipelineRun{
-				ObjectMeta: metav1.ObjectMeta{
-					Name: "pipelinelineName",
-				},
-				Spec: PipelineRunSpec{
-					PipelineRef: PipelineRef{
-						Name: "prname",
-					},
-					Trigger: PipelineTrigger{
-						Type: "badtype",
-					},
-				},
-			},
-			want: apis.ErrInvalidValue("badtype", "pipelinerun.spec.trigger.type"),
 		}, {
 			name: "negative pipeline timeout",
 			pr: PipelineRun{
@@ -90,9 +72,6 @@ func TestPipelineRun_Invalidate(t *testing.T) {
 					PipelineRef: PipelineRef{
 						Name: "prname",
 					},
-					Trigger: PipelineTrigger{
-						Type: PipelineTriggerTypeManual,
-					},
 					Timeout: &metav1.Duration{Duration: -48 * time.Hour},
 				},
 			},
@@ -119,9 +98,6 @@ func TestPipelineRun_Validate(t *testing.T) {
 			PipelineRef: PipelineRef{
 				Name: "prname",
 			},
-			Trigger: PipelineTrigger{
-				Type: "manual",
-			},
 			Results: &Results{
 				URL:  "http://www.google.com",
 				Type: "gcs",

diff --git a/pkg/apis/pipeline/v1alpha1/taskrun_types.go b/pkg/apis/pipeline/v1alpha1/taskrun_types.go
@@ -32,7 +32,6 @@ var _ apis.Defaultable = (*TaskRun)(nil)
 
 // TaskRunSpec defines the desired state of TaskRun
 type TaskRunSpec struct {
-	Trigger TaskTrigger `json:"trigger,omitempty"`
 	// +optional
 	Inputs TaskRunInputs `json:"inputs,omitempty"`
 	// +optional
@@ -92,28 +91,6 @@ type TaskRunOutputs struct {
 	Params []Param `json:"params,omitempty"`
 }
 
-// TaskTriggerType indicates the mechanism by which this TaskRun was created.
-type TaskTriggerType string
-
-const (
-	// TaskTriggerTypeManual indicates that this TaskRun was invoked manually by a user.
-	TaskTriggerTypeManual TaskTriggerType = "manual"
-
-	// TaskTriggerTypePipelineRun indicates that this TaskRun was created by a controller
-	// attempting to realize a PipelineRun. In this case the `name` will refer to the name
-	// of the PipelineRun.
-	TaskTriggerTypePipelineRun TaskTriggerType = "pipelineRun"
-)
-
-// TaskTrigger describes what triggered this Task to run. It could be triggered manually,
-// or it may have been part of a PipelineRun in which case this ref would refer
-// to the corresponding PipelineRun.
-type TaskTrigger struct {
-	Type TaskTriggerType `json:"type"`
-	// +optional
-	Name string `json:"name,omitempty,omitempty"`
-}
-
 var taskRunCondSet = apis.NewBatchConditionSet()
 
 // TaskRunStatus defines the observed state of TaskRun

diff --git a/pkg/apis/pipeline/v1alpha1/taskrun_validation.go b/pkg/apis/pipeline/v1alpha1/taskrun_validation.go
@@ -49,11 +49,6 @@ func (ts *TaskRunSpec) Validate(ctx context.Context) *apis.FieldError {
 		return apis.ErrMissingField("spec.taskref.name", "spec.taskspec")
 	}
 
-	// Check for Trigger
-	if err := ts.Trigger.Validate(ctx, "spec.trigger"); err != nil {
-		return err
-	}
-
 	// check for input resources
 	if err := ts.Inputs.Validate(ctx, "spec.Inputs"); err != nil {
 		return err
@@ -114,27 +109,6 @@ func validatePipelineResources(ctx context.Context, resources []TaskResourceBind
 	return nil
 }
 
-// Validate validates that the task trigger is of a known type. If it was triggered by a PipelineRun, the
-// name of the trigger should be the name of a PipelienRun.
-func (r TaskTrigger) Validate(ctx context.Context, path string) *apis.FieldError {
-	if r.Type == "" {
-		return nil
-	}
-
-	taskType := strings.ToLower(string(r.Type))
-	for _, allowed := range []TaskTriggerType{TaskTriggerTypePipelineRun, TaskTriggerTypeManual} {
-		allowedType := strings.ToLower(string(allowed))
-
-		if taskType == allowedType {
-			if allowedType == strings.ToLower(string(TaskTriggerTypePipelineRun)) && r.Name == "" {
-				return apis.ErrMissingField(fmt.Sprintf("%s.name", path))
-			}
-			return nil
-		}
-	}
-	return apis.ErrInvalidValue(string(r.Type), fmt.Sprintf("%s.type", path))
-}
-
 func validateParameters(params []Param) *apis.FieldError {
 	// Template must not duplicate parameter names.
 	seen := map[string]struct{}{}