CSI workspace to Beta

This commit removes the alpha feature gate for the csi workspace so that it becomes a beta feature.
tektoncd · Oct 25, 2022 · f1b6812 · f1b6812
1 parent b2aa3a4
commit f1b6812
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 31 deletions.
diff --git a/docs/install.md b/docs/install.md
@@ -455,7 +455,6 @@ Features currently in "alpha" are:
 | [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) |                             |
 | [Embedded Statuses](pipelineruns.md#configuring-usage-of-taskrun-and-run-embedded-statuses)           | [TEP-0100](https://github.com/tektoncd/community/blob/main/teps/0100-embedded-taskruns-and-runs-status-in-pipelineruns.md) |   [v0.35.0](https://github.com/tektoncd/pipeline/releases/tag/v0.35.0)     |     embedded-status                 |
 | [Task-level Resource Requirements](compute-resources.md#task-level-compute-resources-configuration)   | [TEP-0104](https://github.com/tektoncd/community/blob/main/teps/0104-tasklevel-resource-requirements.md)                   | [v0.39.0](https://github.com/tektoncd/pipeline/releases/tag/v0.39.0)  |                             |
-| [CSI Workspace Type](workspaces.md#csi)                                                               | N/A                                                                                                                        | [v0.38.0](https://github.com/tektoncd/pipeline/releases/tag/v0.38.0) |                             |
 | [Object Params and Results](pipelineruns.md#specifying-parameters)                                    | [TEP-0075](https://github.com/tektoncd/community/blob/main/teps/0075-object-param-and-result-types.md)                     | [v0.38.0](https://github.com/tektoncd/pipeline/releases/tag/v0.38.0) |                             |
 | [Array Results](pipelineruns.md#specifying-parameters)                                                | [TEP-0076](https://github.com/tektoncd/community/blob/main/teps/0076-array-result-types.md)                                | [v0.38.0](https://github.com/tektoncd/pipeline/releases/tag/v0.38.0) |                             |
 

diff --git a/docs/workspaces.md b/docs/workspaces.md
@@ -534,9 +534,6 @@ workspaces:
 
 ##### `csi`
 
-This is an alpha feature. The `enable-api-fields` feature flag [must be set to `"alpha"`](./install.md)
-for csi volume source to function.
-
 The `csi` field references a [`csi` volume](https://kubernetes.io/docs/concepts/storage/volumes/#csi).
 Using a `csi` volume has the following limitations:
 

diff --git a/pkg/apis/pipeline/v1/workspace_validation.go b/pkg/apis/pipeline/v1/workspace_validation.go
@@ -73,10 +73,10 @@ func (b *WorkspaceBinding) Validate(ctx context.Context) (errs *apis.FieldError)
 		return apis.ErrMissingField("projected.sources")
 	}
 
-	// The csi workspace is only supported when the alpha feature gate is enabled.
+	// The csi workspace is only supported when the beta feature gate is enabled.
 	// For a CSI to work, you must provide and have installed the driver to use.
 	if b.CSI != nil {
-		errs := version.ValidateEnabledAPIFields(ctx, "csi workspace type", config.AlphaAPIFields).ViaField("workspaces")
+		errs := version.ValidateEnabledAPIFields(ctx, "csi workspace type", config.BetaAPIFields).ViaField("workspaces")
 		if errs != nil {
 			return errs
 		}

diff --git a/pkg/apis/pipeline/v1/workspace_validation_test.go b/pkg/apis/pipeline/v1/workspace_validation_test.go
@@ -110,7 +110,7 @@ func TestWorkspaceBindingValidateValid(t *testing.T) {
 				Driver: "my-csi",
 			},
 		},
-		wc: config.EnableAlphaAPIFields,
+		wc: config.EnableBetaAPIFields,
 	}} {
 		t.Run(tc.name, func(t *testing.T) {
 			ctx := context.Background()
@@ -172,7 +172,7 @@ func TestWorkspaceBindingValidateInvalid(t *testing.T) {
 			Projected: &corev1.ProjectedVolumeSource{},
 		},
 	}, {
-		name: "csi workspace should be disallowed without alpha feature gate",
+		name: "csi workspace should be disallowed without beta feature gate",
 		binding: &v1.WorkspaceBinding{
 			Name: "beth",
 			CSI: &corev1.CSIVolumeSource{
@@ -187,7 +187,7 @@ func TestWorkspaceBindingValidateInvalid(t *testing.T) {
 				Driver: "",
 			},
 		},
-		wc: config.EnableAlphaAPIFields,
+		wc: config.EnableBetaAPIFields,
 	}} {
 		t.Run(tc.name, func(t *testing.T) {
 			ctx := context.Background()

diff --git a/pkg/apis/pipeline/v1beta1/workspace_validation.go b/pkg/apis/pipeline/v1beta1/workspace_validation.go
@@ -19,8 +19,6 @@ package v1beta1
 import (
 	"context"
 
-	"github.com/tektoncd/pipeline/pkg/apis/config"
-	"github.com/tektoncd/pipeline/pkg/apis/version"
 	"k8s.io/apimachinery/pkg/api/equality"
 	"knative.dev/pkg/apis"
 )
@@ -73,16 +71,9 @@ func (b *WorkspaceBinding) Validate(ctx context.Context) (errs *apis.FieldError)
 		return apis.ErrMissingField("projected.sources")
 	}
 
-	// The csi workspace is only supported when the alpha feature gate is enabled.
 	// For a CSI to work, you must provide and have installed the driver to use.
-	if b.CSI != nil {
-		errs := version.ValidateEnabledAPIFields(ctx, "csi workspace type", config.AlphaAPIFields).ViaField("workspaces")
-		if errs != nil {
-			return errs
-		}
-		if b.CSI.Driver == "" {
-			return apis.ErrMissingField("csi.driver")
-		}
+	if b.CSI != nil && b.CSI.Driver == "" {
+		return apis.ErrMissingField("csi.driver")
 	}
 
 	return nil

diff --git a/pkg/apis/pipeline/v1beta1/workspace_validation_test.go b/pkg/apis/pipeline/v1beta1/workspace_validation_test.go
@@ -20,7 +20,6 @@ import (
 	"context"
 	"testing"
 
-	"github.com/tektoncd/pipeline/pkg/apis/config"
 	"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
@@ -110,7 +109,6 @@ func TestWorkspaceBindingValidateValid(t *testing.T) {
 				Driver: "my-csi",
 			},
 		},
-		wc: config.EnableAlphaAPIFields,
 	}} {
 		t.Run(tc.name, func(t *testing.T) {
 			ctx := context.Background()
@@ -171,14 +169,6 @@ func TestWorkspaceBindingValidateInvalid(t *testing.T) {
 			Name:      "beth",
 			Projected: &corev1.ProjectedVolumeSource{},
 		},
-	}, {
-		name: "csi workspace should be disallowed without alpha feature gate",
-		binding: &v1beta1.WorkspaceBinding{
-			Name: "beth",
-			CSI: &corev1.CSIVolumeSource{
-				Driver: "csi-driver",
-			},
-		},
 	}, {
 		name: "Provide csi without a driver",
 		binding: &v1beta1.WorkspaceBinding{
@@ -187,7 +177,6 @@ func TestWorkspaceBindingValidateInvalid(t *testing.T) {
 				Driver: "",
 			},
 		},
-		wc: config.EnableAlphaAPIFields,
 	}} {
 		t.Run(tc.name, func(t *testing.T) {
 			ctx := context.Background()