Move remote resolution out of alpha

Closes #4710 There are two major aspects to this change: * Creating a `v1beta1` for `ResolutionRequest`, changing from `parameters` as a `map[string]string` to `params` (field name rename for `openapi-gen` API rule validation reasons) as a `[]pipelinev1beta1.Param`. This is being done to match `ResolverRef.Params`, which is a `[]pipelinev1beta1.Param`. We originally left `ResolutionRequest.Parameters` as `map[string]string` since it already was that in `v1alpha1` and changing it would require `ResolutionRequest` `v1beta1`, hence doing this now. Changing to `[]pipelinev1beta1.Param` is needed to support array and object params for resolvers, and we're going with a slice rather than a map because that's how you're supposed to do this in Kubernetes. =) * Promoting the remote resolution functionality from `alpha` to `beta`, meaning on by default for `v1beta1` `Pipeline`s etc, and requiring `enable-api-fields: beta` for `v1` `Pipeline`s etc. Additionally, we're undoing the questionable decision to split the resolvers out into `resolvers.yaml`, separate from `release.yaml`, and enabling the built-in resolvers. Deprecation of the legacy `taskRef.bundle` and `pipelineRef.bundle` syntax will be handled in a separate PR (#5514). Signed-off-by: Andrew Bayer <[email protected]>
tektoncd · Oct 5, 2022 · 7aa4a34 · 7aa4a34
1 parent 607d2bf
commit 7aa4a34
Show file tree

Hide file tree

Showing 83 changed files with 1,154 additions and 1,016 deletions.
diff --git a/cmd/webhook/main.go b/cmd/webhook/main.go
@@ -27,7 +27,9 @@ import (
 	v1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
 	"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1"
 	"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
+	"github.com/tektoncd/pipeline/pkg/apis/resolution"
 	resolutionv1alpha1 "github.com/tektoncd/pipeline/pkg/apis/resolution/v1alpha1"
+	resolutionv1beta1 "github.com/tektoncd/pipeline/pkg/apis/resolution/v1beta1"
 	resourcev1alpha1 "github.com/tektoncd/pipeline/pkg/apis/resource/v1alpha1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"knative.dev/pkg/configmap"
@@ -66,6 +68,8 @@ var types = map[schema.GroupVersionKind]resourcesemantics.GenericCRD{
 	// resolution
 	// v1alpha1
 	resolutionv1alpha1.SchemeGroupVersion.WithKind("ResolutionRequest"): &resolutionv1alpha1.ResolutionRequest{},
+	// v1beta1
+	resolutionv1beta1.SchemeGroupVersion.WithKind("ResolutionRequest"): &resolutionv1beta1.ResolutionRequest{},
 }
 
 func newDefaultingAdmissionController(ctx context.Context, cmw configmap.Watcher) *controller.Impl {
@@ -140,8 +144,10 @@ func newConfigValidationController(ctx context.Context, cmw configmap.Watcher) *
 func newConversionController(ctx context.Context, cmw configmap.Watcher) *controller.Impl {
 	// nolint: revive
 	var (
-		v1beta1GroupVersion = v1beta1.SchemeGroupVersion.Version
-		v1GroupVersion      = v1.SchemeGroupVersion.Version
+		v1beta1GroupVersion            = v1beta1.SchemeGroupVersion.Version
+		v1GroupVersion                 = v1.SchemeGroupVersion.Version
+		resolutionv1alpha1GroupVersion = resolutionv1alpha1.SchemeGroupVersion.Version
+		resolutionv1beta1GroupVersion  = resolutionv1beta1.SchemeGroupVersion.Version
 	)
 	return conversion.NewConversionController(ctx,
 		// The path on which to serve the webhook
@@ -182,6 +188,14 @@ func newConversionController(ctx context.Context, cmw configmap.Watcher) *contro
 					v1GroupVersion:      &v1.PipelineRun{},
 				},
 			},
+			resolutionv1beta1.Kind("ResolutionRequest"): {
+				DefinitionName: resolution.ResolutionRequestResource.String(),
+				HubVersion:     resolutionv1beta1GroupVersion,
+				Zygotes: map[string]conversion.ConvertibleObject{
+					resolutionv1alpha1GroupVersion: &resolutionv1alpha1.ResolutionRequest{},
+					resolutionv1beta1GroupVersion:  &resolutionv1beta1.ResolutionRequest{},
+				},
+			},
 		},
 
 		// A function that infuses the context passed to ConvertTo/ConvertFrom/SetDefaults with custom metadata

diff --git a/config/300-resolutionrequest.yaml b/config/300-resolutionrequest.yaml
@@ -34,7 +34,8 @@ spec:
   versions:
     - name: v1alpha1
       served: true
-      storage: true
+      deprecated: true
+      storage: false
       subresources:
         status: {}
       schema:
@@ -56,8 +57,8 @@ spec:
           type: string
           jsonPath: ".status.conditions[?(@.type=='Succeeded')].reason"
     - name: v1beta1
-      served: false
-      storage: false
+      served: true
+      storage: true
       subresources:
         status: {}
       schema:

diff --git a/config/resolvers/config-feature-flags.yaml b/config/resolvers/config-feature-flags.yaml
@@ -23,18 +23,10 @@ metadata:
     app.kubernetes.io/part-of: tekton-pipelines
 data:
   # Setting this flag to "true" enables remote resolution of Tekton OCI bundles.
-  # This is an experimental feature and thus should still be considered
-  # an alpha feature.
-  enable-bundles-resolver: "false"
+  enable-bundles-resolver: "true"
   # Setting this flag to "true" enables remote resolution of tasks and pipelines via the Tekton Hub.
-  # This is an experimental feature and thus should still be considered
-  # an alpha feature.
-  enable-hub-resolver: "false"
+  enable-hub-resolver: "true"
   # Setting this flag to "true" enables remote resolution of tasks and pipelines from Git repositories.
-  # This is an experimental feature and thus should still be considered
-  # an alpha feature.
-  enable-git-resolver: "false"
+  enable-git-resolver: "true"
   # Setting this flag to "true" enables remote resolution of tasks and pipelines from other namespaces within the cluster.
-  # This is an experimental feature and thus should still be considered
-  # an alpha feature.
-  enable-cluster-resolver: "false"
+  enable-cluster-resolver: "true"
diff --git a/docs/bundle-resolver.md b/docs/bundle-resolver.md
@@ -15,7 +15,7 @@ This Resolver responds to type `bundles`.
 
 ## Requirements
 
-- A cluster running Tekton Pipeline v0.40.0 or later, with the `alpha` feature gate enabled.
+- A cluster running Tekton Pipeline v0.41.0 or later.
 - The [built-in remote resolvers installed](./install.md#installing-and-configuring-remote-task-and-pipeline-resolution).
 - The `enable-bundles-resolver` feature flag in the `resolvers-feature-flags` ConfigMap 
   in the `tekton-pipelines-resolvers` namespace set to `true`.

diff --git a/docs/cluster-resolver.md b/docs/cluster-resolver.md
@@ -14,7 +14,7 @@ This Resolver responds to type `cluster`.
 
 ## Requirements
 
-- A cluster running Tekton Pipeline v0.40.0 or later, with the `alpha` feature gate enabled.
+- A cluster running Tekton Pipeline v0.41.0 or later.
 - The [built-in remote resolvers installed](./install.md#installing-and-configuring-remote-task-and-pipeline-resolution).
 - The `enable-cluster-resolver` feature flag in the `resolvers-feature-flags` ConfigMap
   in the `tekton-pipelines-resolvers` namespace set to `true`.

diff --git a/docs/git-resolver.md b/docs/git-resolver.md
@@ -16,7 +16,7 @@ This Resolver responds to type `git`.
 
 ## Requirements
 
-- A cluster running Tekton Pipeline v0.40.0 or later, with the `alpha` feature gate enabled.
+- A cluster running Tekton Pipeline v0.41.0 or later.
 - The [built-in remote resolvers installed](./install.md#installing-and-configuring-remote-task-and-pipeline-resolution).
 - The `enable-git-resolver` feature flag in the `resolvers-feature-flags` ConfigMap in the
   `tekton-pipelines-resolvers` namespace set to `true`.

diff --git a/docs/how-to-write-a-resolver.md b/docs/how-to-write-a-resolver.md
@@ -185,13 +185,12 @@ We'll also need to add another import for this package at the top:
 ```go
 import (
   "context"
-
-  // Add this one; it defines LabelKeyResolverType we use in GetSelector
+
+  "github.com/tektoncd/pipeline/pkg/apis/resolution/v1beta1"
+// Add this one; it defines LabelKeyResolverType we use in GetSelector
   "github.com/tektoncd/pipeline/pkg/resolution/common"
-
   "github.com/tektoncd/pipeline/pkg/resolution/resolver/framework"
   "knative.dev/pkg/injection/sharedmain"
-  "github.com/tektoncd/pipeline/pkg/apis/resolution/v1alpha1"
 )
 ```
 
@@ -263,7 +262,7 @@ func (*myResolvedResource) Annotations() map[string]string {
 
 // Source is the source reference of the remote data that records where the remote 
 // file came from including the url, digest and the entrypoint. None atm.
-func (*myResolvedResource) Source() *v1alpha1.ConfigSource {
+func (*myResolvedResource) Source() *v1beta1.ConfigSource {
 	return nil
 }
 ```
@@ -276,8 +275,8 @@ following example.
 ```go
 // Source is the source reference of the remote data that records where the remote 
 // file came from including the url, digest and the entrypoint.
-func (*myResolvedResource) Source() *v1alpha1.ConfigSource {
-	return &v1alpha1.ConfigSource{
+func (*myResolvedResource) Source() *v1beta1.ConfigSource {
+	return &v1beta1.ConfigSource{
 		URI: "https://github.com/user/example",
 		Digest: map[string]string{
 			"sha1": "example",
@@ -394,7 +393,7 @@ pipeline. Create a file called `test-request.yaml` with the following
 content:
 
 ```yaml
-apiVersion: resolution.tekton.dev/v1alpha1
+apiVersion: resolution.tekton.dev/v1beta1
 kind: ResolutionRequest
 metadata:
   name: test-request

diff --git a/docs/hub-resolver.md b/docs/hub-resolver.md
@@ -13,7 +13,7 @@ Use resolver type `hub`.
 
 ## Requirements
 
-- A cluster running Tekton Pipeline v0.40.0 or later, with the `alpha` feature gate enabled.
+- A cluster running Tekton Pipeline v0.41.0 or later.
 - The [built-in remote resolvers installed](./install.md#installing-and-configuring-remote-task-and-pipeline-resolution).
 - The `enable-hub-resolver` feature flag in the `resolvers-feature-flags` ConfigMap in the
   `tekton-pipelines-resolvers` namespace set to `true`.

diff --git a/docs/install.md b/docs/install.md
@@ -86,6 +86,10 @@ To install Tekton Pipelines on a Kubernetes cluster:
    kubectl apply --filename https://storage.googleapis.com/tekton-releases/pipeline/latest/release.notags.yaml
    ```
 
+1. **Note**: To install Tekton Pipelines without including [the built-in remote resolvers](#installing-and-configuring-remote-task-and-pipeline-resolution)
+   follow the directions above, but replace `release.yaml` or `release.notags.yaml` with `minimal-release.yaml` or
+   `minimal-release.notags.yaml` as appropriate. 
+
 1. **Note**: Some cloud providers (such as [GKE](https://github.com/tektoncd/pipeline/issues/3317#issuecomment-708066087))
    may also require you to allow port 8443 in your firewall rules so that the Tekton Pipelines webhook is reachable.
 
@@ -270,10 +274,14 @@ data:
 
 ## Installing and configuring remote Task and Pipeline resolution
 
-**NOTE**: Remote resolution is currently [an `alpha` feature](#alpha-features).
+By default, when Tekton Pipelines is installed using `release.yaml` or `release.notags.yaml`, the
+[built-in resolvers](#built-in-resolvers) are installed into the `tekton-pipelines-resolvers` namespace.
+
+### Installing built-in remote resolvers with a minimal Tekton Pipelines installation
 
-To install the latest release of the [built-in remote resolvers](#built-in-resolvers),
-run the following command:
+If you have installed Tekton Pipelines using `minimal-release.yaml` or `minimal-release.notags.yaml` and
+wish to add the [built-in remote resolvers](#built-in-resolvers) later, you can install them separately 
+by running the following command:
 
    ```bash
    kubectl apply --filename https://storage.googleapis.com/tekton-releases/pipeline/latest/resolvers.yaml
@@ -464,7 +472,6 @@ Features currently in "alpha" are:
 | [Propagated `Parameters`](./taskruns.md#propagated-parameters)                                        | [TEP-0107](https://github.com/tektoncd/community/blob/main/teps/0107-propagating-parameters.md)                            | [v0.36.0](https://github.com/tektoncd/pipeline/releases/tag/v0.36.0) |                             |
 | [Propagated `Workspaces`](./pipelineruns.md#propagated-workspaces)                                    | [TEP-0111](https://github.com/tektoncd/community/blob/main/teps/0111-propagating-workspaces.md)                      |            v0.40.0                                                          |                             |
 | [Windows Scripts](./tasks.md#windows-scripts)                                                         | [TEP-0057](https://github.com/tektoncd/community/blob/main/teps/0057-windows-support.md)                                   | [v0.28.0](https://github.com/tektoncd/pipeline/releases/tag/v0.28.0) |                             |
-| [Remote Tasks](./taskruns.md#remote-tasks) and [Remote Pipelines](./pipelineruns.md#remote-pipelines) | [TEP-0060](https://github.com/tektoncd/community/blob/main/teps/0060-remote-resolution.md)                                 | [v0.35.0](https://github.com/tektoncd/pipeline/releases/tag/v0.35.0) |                             |
 | [Debug](./debug.md)                                                                                   | [TEP-0042](https://github.com/tektoncd/community/blob/main/teps/0042-taskrun-breakpoint-on-failure.md)                     | [v0.26.0](https://github.com/tektoncd/pipeline/releases/tag/v0.26.0) |                             |
 | [Step and Sidecar Overrides](./taskruns.md#overriding-task-steps-and-sidecars)                        | [TEP-0094](https://github.com/tektoncd/community/blob/main/teps/0094-specifying-resource-requirements-at-runtime.md)       |   [v0.34.0](https://github.com/tektoncd/pipeline/releases/tag/v0.34.0)                                                                   |                             |
 | [Matrix](./matrix.md)                                                                                 | [TEP-0090](https://github.com/tektoncd/community/blob/main/teps/0090-matrix.md)                                            | [v0.38.0](https://github.com/tektoncd/pipeline/releases/tag/v0.38.0) |                             |