tektoncd · tekton-robot · Sep 15, 2022 · Sep 15, 2022
diff --git a/config/300-resolutionrequest.yaml b/config/300-resolutionrequest.yaml
@@ -55,3 +55,26 @@ spec:
         - name: Reason
           type: string
           jsonPath: ".status.conditions[?(@.type=='Succeeded')].reason"
+    - name: v1beta1
+      served: false
+      storage: false
+      subresources:
+        status: {}
+      schema:
+        openAPIV3Schema:
+          type: object
+          # One can use x-kubernetes-preserve-unknown-fields: true
+          # at the root of the schema (and inside any properties, additionalProperties)
+          # to get the traditional CRD behaviour that nothing is pruned, despite
+          # setting spec.preserveUnknownProperties: false.
+          #
+          # See https://kubernetes.io/blog/2019/06/20/crd-structural-schema/
+          # See issue: https://github.com/knative/serving/issues/912
+          x-kubernetes-preserve-unknown-fields: true
+      additionalPrinterColumns:
+        - name: Succeeded
+          type: string
+          jsonPath: ".status.conditions[?(@.type=='Succeeded')].status"
+        - name: Reason
+          type: string
+          jsonPath: ".status.conditions[?(@.type=='Succeeded')].reason"
diff --git a/docs/pipeline-api.md b/docs/pipeline-api.md
@@ -12,6 +12,9 @@ weight: 1000
 <a href="#resolution.tekton.dev%2fv1alpha1">resolution.tekton.dev/v1alpha1</a>
 </li>
 <li>
+<a href="#resolution.tekton.dev%2fv1beta1">resolution.tekton.dev/v1beta1</a>
+</li>
+<li>
 <a href="#tekton.dev%2fv1">tekton.dev/v1</a>
 </li>
 <li>
@@ -221,6 +224,210 @@ object.</p>
 </tbody>
 </table>
 <hr/>
+<h2 id="resolution.tekton.dev/v1beta1">resolution.tekton.dev/v1beta1</h2>
+<div>
+</div>
+Resource Types:
+<ul></ul>
+<h3 id="resolution.tekton.dev/v1beta1.ResolutionRequest">ResolutionRequest
+</h3>
+<div>
+<p>ResolutionRequest is an object for requesting the content of
+a Tekton resource like a pipeline.yaml.</p>
+</div>
+<table>
+<thead>
+<tr>
+<th>Field</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>
+<code>metadata</code><br/>
+<em>
+<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#objectmeta-v1-meta">
+Kubernetes meta/v1.ObjectMeta
+</a>
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+Refer to the Kubernetes API documentation for the fields of the
+<code>metadata</code> field.
+</td>
+</tr>
+<tr>
+<td>
+<code>spec</code><br/>
+<em>
+<a href="#resolution.tekton.dev/v1beta1.ResolutionRequestSpec">
+ResolutionRequestSpec
+</a>
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>Spec holds the information for the request part of the resource request.</p>
+<br/>
+<br/>
+<table>
+<tr>
+<td>
+<code>params</code><br/>
+<em>
+<a href="#tekton.dev/v1beta1.Param">
+[]Param
+</a>
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>Parameters are the runtime attributes passed to
+the resolver to help it figure out how to resolve the
+resource being requested. For example: repo URL, commit SHA,
+path to file, the kind of authentication to leverage, etc.</p>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+<tr>
+<td>
+<code>status</code><br/>
+<em>
+<a href="#resolution.tekton.dev/v1beta1.ResolutionRequestStatus">
+ResolutionRequestStatus
+</a>
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>Status communicates the state of the request and, ultimately,
+the content of the resolved resource.</p>
+</td>
+</tr>
+</tbody>
+</table>
+<h3 id="resolution.tekton.dev/v1beta1.ResolutionRequestSpec">ResolutionRequestSpec
+</h3>
+<p>
+(<em>Appears on:</em><a href="#resolution.tekton.dev/v1beta1.ResolutionRequest">ResolutionRequest</a>)
+</p>
+<div>
+<p>ResolutionRequestSpec are all the fields in the spec of the
+ResolutionRequest CRD.</p>
+</div>
+<table>
+<thead>
+<tr>
+<th>Field</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>
+<code>params</code><br/>
+<em>
+<a href="#tekton.dev/v1beta1.Param">
+[]Param
+</a>
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>Parameters are the runtime attributes passed to
+the resolver to help it figure out how to resolve the
+resource being requested. For example: repo URL, commit SHA,
+path to file, the kind of authentication to leverage, etc.</p>
+</td>
+</tr>
+</tbody>
+</table>
+<h3 id="resolution.tekton.dev/v1beta1.ResolutionRequestStatus">ResolutionRequestStatus
+</h3>
+<p>
+(<em>Appears on:</em><a href="#resolution.tekton.dev/v1beta1.ResolutionRequest">ResolutionRequest</a>)
+</p>
+<div>
+<p>ResolutionRequestStatus are all the fields in a ResolutionRequest&rsquo;s
+status subresource.</p>
+</div>
+<table>
+<thead>
+<tr>
+<th>Field</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>
+<code>Status</code><br/>
+<em>
+<a href="https://pkg.go.dev/knative.dev/pkg/apis/duck/v1#Status">
+knative.dev/pkg/apis/duck/v1.Status
+</a>
+</em>
+</td>
+<td>
+<p>
+(Members of <code>Status</code> are embedded into this type.)
+</p>
+</td>
+</tr>
+<tr>
+<td>
+<code>ResolutionRequestStatusFields</code><br/>
+<em>
+<a href="#resolution.tekton.dev/v1beta1.ResolutionRequestStatusFields">
+ResolutionRequestStatusFields
+</a>
+</em>
+</td>
+<td>
+<p>
+(Members of <code>ResolutionRequestStatusFields</code> are embedded into this type.)
+</p>
+</td>
+</tr>
+</tbody>
+</table>
+<h3 id="resolution.tekton.dev/v1beta1.ResolutionRequestStatusFields">ResolutionRequestStatusFields
+</h3>
+<p>
+(<em>Appears on:</em><a href="#resolution.tekton.dev/v1beta1.ResolutionRequestStatus">ResolutionRequestStatus</a>)
+</p>
+<div>
+<p>ResolutionRequestStatusFields are the ResolutionRequest-specific fields
+for the status subresource.</p>
+</div>
+<table>
+<thead>
+<tr>
+<th>Field</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>
+<code>data</code><br/>
+<em>
+string
+</em>
+</td>
+<td>
+<p>Data is a string representation of the resolved content
+of the requested resource in-lined into the ResolutionRequest
+object.</p>
+</td>
+</tr>
+</tbody>
+</table>
+<hr/>
 <h2 id="tekton.dev/v1">tekton.dev/v1</h2>
 <div>
 <p>Package v1 contains API Schema definitions for the pipeline v1 API group</p>
@@ -8205,7 +8412,7 @@ The names of the <code>params</code> in the <code>Matrix</code> must match the n
 <h3 id="tekton.dev/v1beta1.Param">Param
 </h3>
 <p>
-(<em>Appears on:</em><a href="#tekton.dev/v1alpha1.RunSpec">RunSpec</a>, <a href="#tekton.dev/v1beta1.CustomRunSpec">CustomRunSpec</a>, <a href="#tekton.dev/v1beta1.Matrix">Matrix</a>, <a href="#tekton.dev/v1beta1.PipelineRunSpec">PipelineRunSpec</a>, <a href="#tekton.dev/v1beta1.PipelineTask">PipelineTask</a>, <a href="#tekton.dev/v1beta1.ResolverRef">ResolverRef</a>, <a href="#tekton.dev/v1beta1.TaskRunInputs">TaskRunInputs</a>, <a href="#tekton.dev/v1beta1.TaskRunSpec">TaskRunSpec</a>)
+(<em>Appears on:</em><a href="#tekton.dev/v1alpha1.RunSpec">RunSpec</a>, <a href="#tekton.dev/v1beta1.CustomRunSpec">CustomRunSpec</a>, <a href="#tekton.dev/v1beta1.Matrix">Matrix</a>, <a href="#tekton.dev/v1beta1.PipelineRunSpec">PipelineRunSpec</a>, <a href="#tekton.dev/v1beta1.PipelineTask">PipelineTask</a>, <a href="#tekton.dev/v1beta1.ResolverRef">ResolverRef</a>, <a href="#tekton.dev/v1beta1.TaskRunInputs">TaskRunInputs</a>, <a href="#tekton.dev/v1beta1.TaskRunSpec">TaskRunSpec</a>, <a href="#resolution.tekton.dev/v1beta1.ResolutionRequestSpec">ResolutionRequestSpec</a>)
 </p>
 <div>
 <p>Param declares an ParamValues to use for the parameter called name.</p>

diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh
@@ -48,7 +48,7 @@ bash ${REPO_ROOT_DIR}/hack/generate-groups.sh "deepcopy,client,informer,lister"
 # This generates deepcopy,client,informer and lister for the resolution package (v1alpha1)
 bash ${REPO_ROOT_DIR}/hack/generate-groups.sh "deepcopy,client,informer,lister" \
   github.com/tektoncd/pipeline/pkg/client/resolution github.com/tektoncd/pipeline/pkg/apis \
-  "resolution:v1alpha1" \
+  "resolution:v1alpha1,v1beta1" \
   --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt
 
 # Depends on generate-groups.sh to install bin/deepcopy-gen
@@ -93,7 +93,7 @@ GOFLAGS="${OLDGOFLAGS}"
 # This generates the knative inject packages for the resolution package (v1alpha1).
 bash ${REPO_ROOT_DIR}/hack/generate-knative.sh "injection" \
   github.com/tektoncd/pipeline/pkg/client/resolution github.com/tektoncd/pipeline/pkg/apis \
-  "resolution:v1alpha1" \
+  "resolution:v1alpha1,v1beta1" \
   --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt
 GOFLAGS="${OLDGOFLAGS}"
 

diff --git a/pkg/apis/resolution/v1alpha1/resolution_request_conversion.go b/pkg/apis/resolution/v1alpha1/resolution_request_conversion.go
@@ -0,0 +1,95 @@
+/*
+ Copyright 2022 The Tekton 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 v1alpha1
+
+import (
+	"context"
+	"fmt"
+	"strings"
+
+	pipelinev1beta1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
+	"github.com/tektoncd/pipeline/pkg/apis/resolution/v1beta1"
+	"knative.dev/pkg/apis"
+)
+
+var _ apis.Convertible = (*ResolutionRequest)(nil)
+
+// ConvertTo implements apis.Convertible
+func (rr *ResolutionRequest) ConvertTo(ctx context.Context, sink apis.Convertible) error {
+	if apis.IsInDelete(ctx) {
+		return nil
+	}
+	switch sink := sink.(type) {
+	case *v1beta1.ResolutionRequest:
+		sink.ObjectMeta = rr.ObjectMeta
+		return rr.Spec.ConvertTo(ctx, &sink.Spec)
+	default:
+		return fmt.Errorf("unknown version, got: %T", sink)
+	}
+}
+
+// ConvertTo converts a v1alpha1.ResolutionRequestSpec to a v1beta1.ResolutionRequestSpec
+func (rrs *ResolutionRequestSpec) ConvertTo(ctx context.Context, sink *v1beta1.ResolutionRequestSpec) error {
+	for k, v := range rrs.Parameters {
+		sink.Params = append(sink.Params, pipelinev1beta1.Param{
+			Name: k,
+			Value: pipelinev1beta1.ParamValue{
+				Type:      pipelinev1beta1.ParamTypeString,
+				StringVal: v,
+			},
+		})
+	}
+
+	return nil
+}
+
+// ConvertFrom implements apis.Convertible
+func (rr *ResolutionRequest) ConvertFrom(ctx context.Context, from apis.Convertible) error {
+	if apis.IsInDelete(ctx) {
+		return nil
+	}
+	switch from := from.(type) {
+	case *v1beta1.ResolutionRequest:
+		rr.ObjectMeta = from.ObjectMeta
+		return rr.Spec.ConvertFrom(ctx, &from.Spec)
+	default:
+		return fmt.Errorf("unknown version, got: %T", from)
+	}
+}
+
+// ConvertFrom converts a v1beta1.ResolutionRequestSpec to a v1alpha1.ResolutionRequestSpec
+func (rrs *ResolutionRequestSpec) ConvertFrom(ctx context.Context, from *v1beta1.ResolutionRequestSpec) error {
+	var nonStringParams []string
+
+	for _, p := range from.Params {
+		if p.Value.Type != pipelinev1beta1.ParamTypeString {
+			nonStringParams = append(nonStringParams, p.Name)
+		} else {
+			if rrs.Parameters == nil {
+				rrs.Parameters = make(map[string]string)
+			}
+			rrs.Parameters[p.Name] = p.Value.StringVal
+		}
+	}
+
+	if len(nonStringParams) > 0 {
+		return fmt.Errorf("cannot convert v1beta1 to v1alpha, non-string type parameter(s) found: %s", strings.Join(nonStringParams, ", "))
+	}
+
+	return nil
+}