Move to the v1beta1 Conditions implementation

See here for more context on what's changed (no breaking changes): knative/pkg#361

Signed-off-by: Vincent Demeester <vdemeest@redhat.com>

pkg/apis/pipeline/v1alpha1/pipelinerun_types.go

@@ -21,7 +21,8 @@ import (
 	"fmt"
 	"time"
 
-	duckv1alpha1 "github.com/knative/pkg/apis/duck/v1alpha1"
+	"github.com/knative/pkg/apis"
+	duckv1beta1 "github.com/knative/pkg/apis/duck/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -113,16 +114,20 @@ type PipelineTrigger struct {
 
 // PipelineRunStatus defines the observed state of PipelineRun
 type PipelineRunStatus struct {
-	Conditions duckv1alpha1.Conditions `json:"conditions"`
+	duckv1beta1.Status `json:",inline"`
+
 	// In #107 should be updated to hold the location logs have been uploaded to
 	// +optional
 	Results *Results `json:"results,omitempty"`
+
 	// StartTime is the time the PipelineRun is actually started.
 	// +optional
 	StartTime *metav1.Time `json:"startTime,omitempty"`
+
 	// CompletionTime is the time the PipelineRun completed.
 	// +optional
 	CompletionTime *metav1.Time `json:"completionTime,omitempty"`
+
 	// map of PipelineRunTaskRunStatus with the taskRun name as the key
 	// +optional
 	TaskRuns map[string]*PipelineRunTaskRunStatus `json:"taskRuns,omitempty"`
@@ -137,10 +142,10 @@ type PipelineRunTaskRunStatus struct {
 	Status *TaskRunStatus `json:"status,omitempty"`
 }
 
-var pipelineRunCondSet = duckv1alpha1.NewBatchConditionSet()
+var pipelineRunCondSet = apis.NewBatchConditionSet()
 
 // GetCondition returns the Condition matching the given type.
-func (pr *PipelineRunStatus) GetCondition(t duckv1alpha1.ConditionType) *duckv1alpha1.Condition {
+func (pr *PipelineRunStatus) GetCondition(t apis.ConditionType) *apis.Condition {
 	return pipelineRunCondSet.Manage(pr).GetCondition(t)
 }
 
@@ -157,7 +162,7 @@ func (pr *PipelineRunStatus) InitializeConditions() {
 
 // SetCondition sets the condition, unsetting previous conditions with the same
 // type as necessary.
-func (pr *PipelineRunStatus) SetCondition(newCond *duckv1alpha1.Condition) {
+func (pr *PipelineRunStatus) SetCondition(newCond *apis.Condition) {
 	if newCond != nil {
 		pipelineRunCondSet.Manage(pr).SetCondition(*newCond)
 	}
@@ -218,7 +223,7 @@ func (pr *PipelineRun) GetOwnerReference() []metav1.OwnerReference {
 
 // IsDone returns true if the PipelineRun's status indicates that it is done.
 func (pr *PipelineRun) IsDone() bool {
-	return !pr.Status.GetCondition(duckv1alpha1.ConditionSucceeded).IsUnknown()
+	return !pr.Status.GetCondition(apis.ConditionSucceeded).IsUnknown()
 }
 
 // HasStarted function check whether pipelinerun has valid start time set in its status

pkg/apis/pipeline/v1alpha1/pipelinerun_types_test.go

@@ -6,18 +6,17 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/knative/pkg/apis"
-	duckv1alpha1 "github.com/knative/pkg/apis/duck/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 func TestPipelineRunStatusConditions(t *testing.T) {
 	p := &PipelineRun{}
-	foo := &duckv1alpha1.Condition{
+	foo := &apis.Condition{
 		Type:   "Foo",
 		Status: "True",
 	}
-	bar := &duckv1alpha1.Condition{
+	bar := &apis.Condition{
 		Type:   "Bar",
 		Status: "True",
 	}
@@ -91,8 +90,8 @@ func TestInitializeConditions(t *testing.T) {
 
 func TestPipelineRunIsDone(t *testing.T) {
 	pr := &PipelineRun{}
-	foo := &duckv1alpha1.Condition{
-		Type:   duckv1alpha1.ConditionSucceeded,
+	foo := &apis.Condition{
+		Type:   apis.ConditionSucceeded,
 		Status: corev1.ConditionFalse,
 	}
 	pr.Status.SetCondition(foo)

pkg/apis/pipeline/v1alpha1/taskrun_types.go

@@ -21,7 +21,7 @@ import (
 	"time"
 
 	"github.com/knative/pkg/apis"
-	duckv1alpha1 "github.com/knative/pkg/apis/duck/v1alpha1"
+	duckv1beta1 "github.com/knative/pkg/apis/duck/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -111,13 +111,11 @@ type TaskTrigger struct {
 	Name string `json:"name,omitempty"`
 }
 
-var taskRunCondSet = duckv1alpha1.NewBatchConditionSet()
+var taskRunCondSet = apis.NewBatchConditionSet()
 
 // TaskRunStatus defines the observed state of TaskRun
 type TaskRunStatus struct {
-	// Conditions describes the set of conditions of this build.
-	// +optional
-	Conditions duckv1alpha1.Conditions `json:"conditions,omitempty"`
+	duckv1beta1.Status `json:",inline"`
 
 	// In #107 should be updated to hold the location logs have been uploaded to
 	// +optional
@@ -140,7 +138,7 @@ type TaskRunStatus struct {
 }
 
 // GetCondition returns the Condition matching the given type.
-func (tr *TaskRunStatus) GetCondition(t duckv1alpha1.ConditionType) *duckv1alpha1.Condition {
+func (tr *TaskRunStatus) GetCondition(t apis.ConditionType) *apis.Condition {
 	return taskRunCondSet.Manage(tr).GetCondition(t)
 }
 func (tr *TaskRunStatus) InitializeConditions() {
@@ -152,7 +150,7 @@ func (tr *TaskRunStatus) InitializeConditions() {
 
 // SetCondition sets the condition, unsetting previous conditions with the same
 // type as necessary.
-func (tr *TaskRunStatus) SetCondition(newCond *duckv1alpha1.Condition) {
+func (tr *TaskRunStatus) SetCondition(newCond *apis.Condition) {
 	if newCond != nil {
 		taskRunCondSet.Manage(tr).SetCondition(*newCond)
 	}
@@ -225,7 +223,7 @@ func (tr *TaskRun) HasPipelineRunOwnerReference() bool {
 
 // IsDone returns true if the TaskRun's status indicates that it is done.
 func (tr *TaskRun) IsDone() bool {
-	return !tr.Status.GetCondition(duckv1alpha1.ConditionSucceeded).IsUnknown()
+	return !tr.Status.GetCondition(apis.ConditionSucceeded).IsUnknown()
 }
 
 // IsCancelled returns true if the TaskRun's spec status is set to Cancelled state

pkg/apis/pipeline/v1alpha1/taskrun_types_test.go

@@ -20,7 +20,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	duckv1alpha1 "github.com/knative/pkg/apis/duck/v1alpha1"
+	"github.com/knative/pkg/apis"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -129,8 +129,8 @@ func TestTaskRun_HasPipelineRun(t *testing.T) {
 
 func TestTaskRunIsDone(t *testing.T) {
 	tr := &TaskRun{}
-	foo := &duckv1alpha1.Condition{
-		Type:   duckv1alpha1.ConditionSucceeded,
+	foo := &apis.Condition{
+		Type:   apis.ConditionSucceeded,
 		Status: corev1.ConditionFalse,
 	}
 	tr.Status.SetCondition(foo)

pkg/reconciler/event.go

@@ -16,15 +16,15 @@ limitations under the License.
 package reconciler
 
 import (
-	duckv1alpha1 "github.com/knative/pkg/apis/duck/v1alpha1"
+	"github.com/knative/pkg/apis"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/tools/record"
 )
 
 // EmitEvent emits success or failed event for object
 // if afterCondition is different from beforeCondition
-func EmitEvent(c record.EventRecorder, beforeCondition *duckv1alpha1.Condition, afterCondition *duckv1alpha1.Condition, object runtime.Object) {
+func EmitEvent(c record.EventRecorder, beforeCondition *apis.Condition, afterCondition *apis.Condition, object runtime.Object) {
 	if beforeCondition != afterCondition && afterCondition != nil {
 		// Create events when the obj result is in.
 		if afterCondition.Status == corev1.ConditionTrue {

pkg/reconciler/event_test.go

@@ -4,68 +4,68 @@ import (
 	"testing"
 	"time"
 
-	duckv1alpha1 "github.com/knative/pkg/apis/duck/v1alpha1"
+	"github.com/knative/pkg/apis"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/tools/record"
 )
 
 func Test_EmitEvent(t *testing.T) {
 	testcases := []struct {
 		name        string
-		before      *duckv1alpha1.Condition
-		after       *duckv1alpha1.Condition
+		before      *apis.Condition
+		after       *apis.Condition
 		expectEvent bool
 	}{
 		{
 			name: "unknown to true",
-			before: &duckv1alpha1.Condition{
-				Type:   duckv1alpha1.ConditionSucceeded,
+			before: &apis.Condition{
+				Type:   apis.ConditionSucceeded,
 				Status: corev1.ConditionUnknown,
 			},
-			after: &duckv1alpha1.Condition{
-				Type:   duckv1alpha1.ConditionSucceeded,
+			after: &apis.Condition{
+				Type:   apis.ConditionSucceeded,
 				Status: corev1.ConditionTrue,
 			},
 			expectEvent: true,
 		},
 		{
 			name: "true to true",
-			before: &duckv1alpha1.Condition{
-				Type:   duckv1alpha1.ConditionSucceeded,
+			before: &apis.Condition{
+				Type:   apis.ConditionSucceeded,
 				Status: corev1.ConditionTrue,
 			},
-			after: &duckv1alpha1.Condition{
-				Type:   duckv1alpha1.ConditionSucceeded,
+			after: &apis.Condition{
+				Type:   apis.ConditionSucceeded,
 				Status: corev1.ConditionTrue,
 			},
 			expectEvent: false,
 		},
 		{
 			name: "false to false",
-			before: &duckv1alpha1.Condition{
-				Type:   duckv1alpha1.ConditionSucceeded,
+			before: &apis.Condition{
+				Type:   apis.ConditionSucceeded,
 				Status: corev1.ConditionFalse,
 			},
-			after: &duckv1alpha1.Condition{
-				Type:   duckv1alpha1.ConditionSucceeded,
+			after: &apis.Condition{
+				Type:   apis.ConditionSucceeded,
 				Status: corev1.ConditionFalse,
 			},
 			expectEvent: false,
 		},
 		{
 			name:  "true to nil",
 			after: nil,
-			before: &duckv1alpha1.Condition{
-				Type:   duckv1alpha1.ConditionSucceeded,
+			before: &apis.Condition{
+				Type:   apis.ConditionSucceeded,
 				Status: corev1.ConditionTrue,
 			},
 			expectEvent: true,
 		},
 		{
 			name:   "nil to true",
 			before: nil,
-			after: &duckv1alpha1.Condition{
-				Type:   duckv1alpha1.ConditionSucceeded,
+			after: &apis.Condition{
+				Type:   apis.ConditionSucceeded,
 				Status: corev1.ConditionTrue,
 			},
 			expectEvent: true,

pkg/reconciler/reconciler_test.go

@@ -21,7 +21,7 @@ import (
 	"strings"
 	"testing"
 
-	duckv1alpha1 "github.com/knative/pkg/apis/duck/v1alpha1"
+	"github.com/knative/pkg/apis"
 	"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1"
 	"github.com/tektoncd/pipeline/pkg/reconciler/v1alpha1/pipelinerun/resources"
 	"github.com/tektoncd/pipeline/test"
@@ -37,8 +37,8 @@ func TestRecorderOptions(t *testing.T) {
 
 	prs := []*v1alpha1.PipelineRun{tb.PipelineRun("test-pipeline-run-completed", "foo",
 		tb.PipelineRunSpec("test-pipeline", tb.PipelineRunServiceAccount("test-sa")),
-		tb.PipelineRunStatus(tb.PipelineRunStatusCondition(duckv1alpha1.Condition{
-			Type:    duckv1alpha1.ConditionSucceeded,
+		tb.PipelineRunStatus(tb.PipelineRunStatusCondition(apis.Condition{
+			Type:    apis.ConditionSucceeded,
 			Status:  corev1.ConditionTrue,
 			Reason:  resources.ReasonSucceeded,
 			Message: "All Tasks have completed executing",