wip

Signed-off-by: Vincent Demeester <[email protected]>

cmd/webhook/main.go

@@ -22,6 +22,7 @@ import (
 
 	defaultconfig "github.com/tektoncd/pipeline/pkg/apis/config"
 	"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1"
+	"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha2"
 	"github.com/tektoncd/pipeline/pkg/contexts"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"knative.dev/pkg/configmap"
@@ -38,13 +39,20 @@ import (
 )
 
 var types = map[schema.GroupVersionKind]resourcesemantics.GenericCRD{
+	// v1alpha1
 	v1alpha1.SchemeGroupVersion.WithKind("Pipeline"):         &v1alpha1.Pipeline{},
 	v1alpha1.SchemeGroupVersion.WithKind("Task"):             &v1alpha1.Task{},
 	v1alpha1.SchemeGroupVersion.WithKind("ClusterTask"):      &v1alpha1.ClusterTask{},
 	v1alpha1.SchemeGroupVersion.WithKind("TaskRun"):          &v1alpha1.TaskRun{},
 	v1alpha1.SchemeGroupVersion.WithKind("PipelineRun"):      &v1alpha1.PipelineRun{},
 	v1alpha1.SchemeGroupVersion.WithKind("Condition"):        &v1alpha1.Condition{},
 	v1alpha1.SchemeGroupVersion.WithKind("PipelineResource"): &v1alpha1.PipelineResource{},
+	// v1alpha2
+	v1alpha2.SchemeGroupVersion.WithKind("Pipeline"):    &v1alpha2.Pipeline{},
+	v1alpha2.SchemeGroupVersion.WithKind("Task"):        &v1alpha2.Task{},
+	v1alpha2.SchemeGroupVersion.WithKind("ClusterTask"): &v1alpha2.ClusterTask{},
+	v1alpha2.SchemeGroupVersion.WithKind("TaskRun"):     &v1alpha2.TaskRun{},
+	v1alpha2.SchemeGroupVersion.WithKind("PipelineRun"): &v1alpha2.PipelineRun{},
 }
 
 func NewDefaultingAdmissionController(ctx context.Context, cmw configmap.Watcher) *controller.Impl {
@@ -65,9 +73,7 @@ func NewDefaultingAdmissionController(ctx context.Context, cmw configmap.Watcher
 
 		// A function that infuses the context passed to Validate/SetDefaults with custom metadata.
 		func(ctx context.Context) context.Context {
-			// FIXME(vdemeester) uncomment that for auto-conversion
-			// return v1alpha2.WithUpgradeViaDefaulting(store.ToContext(ctx))
-			return contexts.WithDefaultConfigurationName(store.ToContext(ctx))
+			return contexts.WithUpgradeViaDefaulting(store.ToContext(ctx))
 		},
 
 		// Whether to disallow unknown fields.

config/300-clustertask.yaml

@@ -17,6 +17,13 @@ metadata:
   name: clustertasks.tekton.dev
 spec:
   group: tekton.dev
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
+  - name: v1alpha2
+    served: true
+    storage: false
   names:
     kind: ClusterTask
     plural: clustertasks

config/300-pipeline.yaml

@@ -17,6 +17,13 @@ metadata:
   name: pipelines.tekton.dev
 spec:
   group: tekton.dev
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
+  - name: v1alpha2
+    served: true
+    storage: false
   names:
     kind: Pipeline
     plural: pipelines

config/300-pipelinerun.yaml

@@ -17,6 +17,13 @@ metadata:
   name: pipelineruns.tekton.dev
 spec:
   group: tekton.dev
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
+  - name: v1alpha2
+    served: true
+    storage: false
   names:
     kind: PipelineRun
     plural: pipelineruns

config/300-task.yaml

@@ -17,6 +17,13 @@ metadata:
   name: tasks.tekton.dev
 spec:
   group: tekton.dev
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
+  - name: v1alpha2
+    served: true
+    storage: false
   names:
     kind: Task
     plural: tasks

config/300-taskrun.yaml

@@ -17,6 +17,13 @@ metadata:
   name: taskruns.tekton.dev
 spec:
   group: tekton.dev
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
+  - name: v1alpha2
+    served: true
+    storage: false
   names:
     kind: TaskRun
     plural: taskruns

pkg/apis/pipeline/v1alpha1/conversion_error.go

@@ -17,35 +17,21 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"fmt"
-
+	"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha2"
 	"knative.dev/pkg/apis"
 )
 
 const (
 	// ConditionTypeConvertible is a Warning condition that is set on
 	// resources when they cannot be converted to warn of a forthcoming
 	// breakage.
-	ConditionTypeConvertible apis.ConditionType = "Convertible"
+	ConditionTypeConvertible apis.ConditionType = v1alpha2.ConditionTypeConvertible
 )
 
 // CannotConvertError is returned when a field cannot be converted.
-type CannotConvertError struct {
-	Message string
-	Field   string
-}
+type CannotConvertError = v1alpha2.CannotConvertError
 
 var _ error = (*CannotConvertError)(nil)
 
-// Error implements error
-func (cce *CannotConvertError) Error() string {
-	return cce.Message
-}
-
 // ConvertErrorf creates a CannotConvertError from the field name and format string.
-func ConvertErrorf(field, msg string, args ...interface{}) error {
-	return &CannotConvertError{
-		Message: fmt.Sprintf(msg, args...),
-		Field:   field,
-	}
-}
+var ConvertErrorf = v1alpha2.ConvertErrorf

pkg/apis/pipeline/v1alpha1/task_defaults.go

@@ -19,6 +19,8 @@ package v1alpha1
 import (
 	"context"
 
+	"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha2"
+	"github.com/tektoncd/pipeline/pkg/contexts"
 	"knative.dev/pkg/apis"
 )
 
@@ -30,6 +32,18 @@ func (t *Task) SetDefaults(ctx context.Context) {
 
 // SetDefaults set any defaults for the task spec
 func (ts *TaskSpec) SetDefaults(ctx context.Context) {
+	if contexts.IsUpgradeViaDefaulting(ctx) {
+		v := v1alpha2.TaskSpec{}
+		if ts.ConvertUp(ctx, &v) == nil {
+			alpha := TaskSpec{}
+			if alpha.ConvertDown(ctx, &v) == nil {
+				*ts = alpha
+			}
+		}
+	}
+	for i := range ts.Params {
+		ts.Params[i].SetDefaults(ctx)
+	}
 	if ts.Inputs != nil {
 		ts.Inputs.SetDefaults(ctx)
 	}

pkg/apis/pipeline/v1alpha1/task_types.go

@@ -105,9 +105,7 @@ type Inputs struct {
 // the Task definition, and when provided as an Input, the Name will be the
 // path to the volume mounted containing this Resource as an input (e.g.
 // an input Resource named `workspace` will be mounted at `/workspace`).
-type TaskResource struct {
-	ResourceDeclaration `json:",inline"`
-}
+type TaskResource = v1alpha2.TaskResource
 
 // Outputs allow a task to declare what data the Build/Task will be producing,
 // i.e. results such as logs and artifacts such as images.

pkg/apis/pipeline/v1alpha1/task_validation.go

@@ -22,6 +22,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha2"
 	"github.com/tektoncd/pipeline/pkg/apis/validate"
 	"github.com/tektoncd/pipeline/pkg/substitution"
 	corev1 "k8s.io/api/core/v1"
@@ -79,9 +80,18 @@ func (ts *TaskSpec) Validate(ctx context.Context) *apis.FieldError {
 		}
 	}
 
+	// Validate Resources declaration
+	if err := ts.Resources.Validate(ctx); err != nil {
+		return err
+	}
+	// Validate that the parameters type are correct
+	if err := v1alpha2.ValidateParameterTypes(ts.Params); err != nil {
+		return err
+	}
+
 	// A task doesn't have to have inputs or outputs, but if it does they must be valid.
 	// A task can't duplicate input or output names.
-
+	// Deprecated
 	if ts.Inputs != nil {
 		for _, resource := range ts.Inputs.Resources {
 			if err := validateResourceType(resource, fmt.Sprintf("taskspec.Inputs.Resources.%s.Type", resource.Name)); err != nil {
@@ -95,6 +105,7 @@ func (ts *TaskSpec) Validate(ctx context.Context) *apis.FieldError {
 			return err
 		}
 	}
+	// Deprecated
 	if ts.Outputs != nil {
 		for _, resource := range ts.Outputs.Resources {
 			if err := validateResourceType(resource, fmt.Sprintf("taskspec.Outputs.Resources.%s.Type", resource.Name)); err != nil {
@@ -117,10 +128,19 @@ func (ts *TaskSpec) Validate(ctx context.Context) *apis.FieldError {
 		}
 	}
 
-	if err := validateInputParameterVariables(ts.Steps, ts.Inputs); err != nil {
+	if err := v1alpha2.ValidateParameterVariables(ts.Steps, ts.Params); err != nil {
+		return err
+	}
+	// Deprecated
+	if err := validateInputParameterVariables(ts.Steps, ts.Inputs, ts.Params); err != nil {
+		return err
+	}
+
+	if err := v1alpha2.ValidateResourcesVariables(ts.Steps, ts.Resources); err != nil {
 		return err
 	}
-	if err := validateResourceVariables(ts.Steps, ts.Inputs, ts.Outputs); err != nil {
+	// Deprecated
+	if err := validateResourceVariables(ts.Steps, ts.Inputs, ts.Outputs, ts.Resources); err != nil {
 		return err
 	}
 	return nil
@@ -251,10 +271,17 @@ func validateInputParameterTypes(inputs *Inputs) *apis.FieldError {
 	return nil
 }
 
-func validateInputParameterVariables(steps []Step, inputs *Inputs) *apis.FieldError {
+func validateInputParameterVariables(steps []Step, inputs *Inputs, params []v1alpha2.ParamSpec) *apis.FieldError {
 	parameterNames := map[string]struct{}{}
 	arrayParameterNames := map[string]struct{}{}
 
+	for _, p := range params {
+		parameterNames[p.Name] = struct{}{}
+		if p.Type == ParamTypeArray {
+			arrayParameterNames[p.Name] = struct{}{}
+		}
+	}
+	// Deprecated
 	if inputs != nil {
 		for _, p := range inputs.Params {
 			parameterNames[p.Name] = struct{}{}
@@ -270,13 +297,23 @@ func validateInputParameterVariables(steps []Step, inputs *Inputs) *apis.FieldEr
 	return validateArrayUsage(steps, "params", arrayParameterNames)
 }
 
-func validateResourceVariables(steps []Step, inputs *Inputs, outputs *Outputs) *apis.FieldError {
+func validateResourceVariables(steps []Step, inputs *Inputs, outputs *Outputs, resources *v1alpha2.TaskResources) *apis.FieldError {
 	resourceNames := map[string]struct{}{}
+	if resources != nil {
+		for _, r := range resources.Inputs {
+			resourceNames[r.Name] = struct{}{}
+		}
+		for _, r := range resources.Outputs {
+			resourceNames[r.Name] = struct{}{}
+		}
+	}
+	// Deprecated
 	if inputs != nil {
 		for _, r := range inputs.Resources {
 			resourceNames[r.Name] = struct{}{}
 		}
 	}
+	// Deprecated
 	if outputs != nil {
 		for _, r := range outputs.Resources {
 			resourceNames[r.Name] = struct{}{}

pkg/apis/pipeline/v1alpha1/taskrun_defaults.go

@@ -21,6 +21,7 @@ import (
 	"time"
 
 	"github.com/tektoncd/pipeline/pkg/apis/config"
+	"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha2"
 	"github.com/tektoncd/pipeline/pkg/contexts"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"knative.dev/pkg/apis"
@@ -31,7 +32,8 @@ var _ apis.Defaultable = (*TaskRun)(nil)
 const managedByLabelKey = "app.kubernetes.io/managed-by"
 
 func (tr *TaskRun) SetDefaults(ctx context.Context) {
-	tr.Spec.SetDefaults(ctx)
+	ctx = apis.WithinParent(ctx, tr.ObjectMeta)
+	tr.Spec.SetDefaults(apis.WithinSpec(ctx))
 
 	// If the TaskRun doesn't have a managed-by label, apply the default
 	// specified in the config.
@@ -45,6 +47,16 @@ func (tr *TaskRun) SetDefaults(ctx context.Context) {
 }
 
 func (trs *TaskRunSpec) SetDefaults(ctx context.Context) {
+	if contexts.IsUpgradeViaDefaulting(ctx) {
+		v := v1alpha2.TaskRunSpec{}
+		if trs.ConvertUp(ctx, &v) == nil {
+			alpha := TaskRunSpec{}
+			if alpha.ConvertDown(ctx, &v) == nil {
+				*trs = alpha
+			}
+		}
+	}
+
 	cfg := config.FromContextOrDefaults(ctx)
 	if trs.TaskRef != nil && trs.TaskRef.Kind == "" {
 		trs.TaskRef.Kind = NamespacedTaskKind

pkg/apis/pipeline/v1alpha1/taskrun_types.go

@@ -87,14 +87,7 @@ type TaskRunInputs struct {
 
 // TaskResourceBinding points to the PipelineResource that
 // will be used for the Task input or output called Name.
-type TaskResourceBinding struct {
-	PipelineResourceBinding
-	// Paths will probably be removed in #1284, and then PipelineResourceBinding can be used instead.
-	// The optional Path field corresponds to a path on disk at which the Resource can be found
-	// (used when providing the resource via mounted volume, overriding the default logic to fetch the Resource).
-	// +optional
-	Paths []string `json:"paths,omitempty"`
-}
+type TaskResourceBinding = v1alpha2.TaskResourceBinding
 
 // TaskRunOutputs holds the output values that this task was invoked with.
 type TaskRunOutputs struct {

pkg/apis/pipeline/v1alpha1/taskrun_validation.go

@@ -59,19 +59,29 @@ func (ts *TaskRunSpec) Validate(ctx context.Context) *apis.FieldError {
 		}
 	}
 
+	// Deprecated
 	// check for input resources
 	if err := ts.Inputs.Validate(ctx, "spec.Inputs"); err != nil {
 		return err
 	}
 
+	// Deprecated
 	// check for output resources
 	if err := ts.Outputs.Validate(ctx, "spec.Outputs"); err != nil {
 		return err
 	}
 
+	// Validate Resources
+	if err := ts.Resources.Validate(ctx); err != nil {
+		return err
+	}
+
 	if err := validateWorkspaceBindings(ctx, ts.Workspaces); err != nil {
 		return err
 	}
+	if err := validateParameters(ts.Params); err != nil {
+		return err
+	}
 
 	if ts.Timeout != nil {
 		// timeout should be a valid duration of at least 0.