diff --git a/examples/v1/pipelineruns/alpha/pipelinerun-with-matrix-and-results.yaml b/examples/v1/pipelineruns/beta/pipelinerun-with-matrix-and-results.yaml similarity index 100% rename from examples/v1/pipelineruns/alpha/pipelinerun-with-matrix-and-results.yaml rename to examples/v1/pipelineruns/beta/pipelinerun-with-matrix-and-results.yaml diff --git a/examples/v1/pipelineruns/alpha/pipelinerun-with-matrix-array-references.yaml b/examples/v1/pipelineruns/beta/pipelinerun-with-matrix-array-references.yaml similarity index 100% rename from examples/v1/pipelineruns/alpha/pipelinerun-with-matrix-array-references.yaml rename to examples/v1/pipelineruns/beta/pipelinerun-with-matrix-array-references.yaml diff --git a/examples/v1/pipelineruns/alpha/pipelinerun-with-matrix-include-explicit.yaml b/examples/v1/pipelineruns/beta/pipelinerun-with-matrix-include-explicit.yaml similarity index 100% rename from examples/v1/pipelineruns/alpha/pipelinerun-with-matrix-include-explicit.yaml rename to examples/v1/pipelineruns/beta/pipelinerun-with-matrix-include-explicit.yaml diff --git a/examples/v1/pipelineruns/alpha/pipelinerun-with-matrix-include.yaml b/examples/v1/pipelineruns/beta/pipelinerun-with-matrix-include.yaml similarity index 100% rename from examples/v1/pipelineruns/alpha/pipelinerun-with-matrix-include.yaml rename to examples/v1/pipelineruns/beta/pipelinerun-with-matrix-include.yaml diff --git a/examples/v1/pipelineruns/alpha/pipelinerun-with-matrix.yaml b/examples/v1/pipelineruns/beta/pipelinerun-with-matrix.yaml similarity index 100% rename from examples/v1/pipelineruns/alpha/pipelinerun-with-matrix.yaml rename to examples/v1/pipelineruns/beta/pipelinerun-with-matrix.yaml diff --git a/pkg/apis/pipeline/v1/pipeline_validation.go b/pkg/apis/pipeline/v1/pipeline_validation.go index 71b002d9bcd..f2ac8a18a0a 100644 --- a/pkg/apis/pipeline/v1/pipeline_validation.go +++ b/pkg/apis/pipeline/v1/pipeline_validation.go @@ -230,9 +230,9 @@ func (pt PipelineTask) Validate(ctx context.Context) (errs *apis.FieldError) { func (pt *PipelineTask) validateMatrix(ctx context.Context) (errs *apis.FieldError) { if pt.IsMatrixed() { - // This is an alpha feature and will fail validation if it's used in a pipeline spec - // when the enable-api-fields feature gate is anything but "alpha". - errs = errs.Also(version.ValidateEnabledAPIFields(ctx, "matrix", config.AlphaAPIFields)) + // This is a beta feature and will fail validation if it's used in a pipeline spec + // when the enable-api-fields feature gate is set to "stable". + errs = errs.Also(version.ValidateEnabledAPIFields(ctx, "matrix", config.BetaAPIFields)) errs = errs.Also(pt.Matrix.validateCombinationsCount(ctx)) errs = errs.Also(pt.Matrix.validateUniqueParams()) } diff --git a/pkg/reconciler/pipelinerun/pipelinerun_test.go b/pkg/reconciler/pipelinerun/pipelinerun_test.go index ab35dc88702..9d65c8309d5 100644 --- a/pkg/reconciler/pipelinerun/pipelinerun_test.go +++ b/pkg/reconciler/pipelinerun/pipelinerun_test.go @@ -7039,7 +7039,7 @@ spec: `), } - cms := []*corev1.ConfigMap{withEnabledAlphaAPIFields(newFeatureFlagsConfigMap())} + cms := []*corev1.ConfigMap{newFeatureFlagsConfigMap()} d := test.Data{ ConfigMaps: cms, PipelineRuns: prs, @@ -8215,7 +8215,7 @@ spec: kind: Task `), } - cms := []*corev1.ConfigMap{withEnabledAlphaAPIFields(newFeatureFlagsConfigMap())} + cms := []*corev1.ConfigMap{newFeatureFlagsConfigMap()} cms = append(cms, withMaxMatrixCombinationsCount(newDefaultsConfigMap(), 10)) tests := []struct { @@ -8591,8 +8591,7 @@ spec: script: | echo "$(params.platform) and $(params.browser)" `) - - cms := []*corev1.ConfigMap{withEnabledAlphaAPIFields(newFeatureFlagsConfigMap())} + cms := []*corev1.ConfigMap{newFeatureFlagsConfigMap()} cms = append(cms, withMaxMatrixCombinationsCount(newDefaultsConfigMap(), 10)) tests := []struct { @@ -8976,7 +8975,7 @@ spec: kind: Task `), } - cms := []*corev1.ConfigMap{withEnabledAlphaAPIFields(newFeatureFlagsConfigMap())} + cms := []*corev1.ConfigMap{newFeatureFlagsConfigMap()} cms = append(cms, withMaxMatrixCombinationsCount(newDefaultsConfigMap(), 10)) tests := []struct { @@ -9434,7 +9433,7 @@ spec: kind: Task `), } - cms := []*corev1.ConfigMap{withEnabledAlphaAPIFields(newFeatureFlagsConfigMap())} + cms := []*corev1.ConfigMap{newFeatureFlagsConfigMap()} cms = append(cms, withMaxMatrixCombinationsCount(newDefaultsConfigMap(), 10)) tests := []struct { @@ -9795,7 +9794,7 @@ spec: kind: Task `), } - cms := []*corev1.ConfigMap{withEnabledAlphaAPIFields(newFeatureFlagsConfigMap())} + cms := []*corev1.ConfigMap{newFeatureFlagsConfigMap()} cms = append(cms, withMaxMatrixCombinationsCount(newDefaultsConfigMap(), 10)) tests := []struct { @@ -10225,7 +10224,7 @@ spec: echo -n "[\"linux\",\"mac\",\"windows\"]" | tee $(results.platforms.path) `) - cms := []*corev1.ConfigMap{withEnabledAlphaAPIFields(newFeatureFlagsConfigMap())} + cms := []*corev1.ConfigMap{newFeatureFlagsConfigMap()} cms = append(cms, withMaxMatrixCombinationsCount(newDefaultsConfigMap(), 10)) tests := []struct { name string @@ -10768,7 +10767,8 @@ spec: tekton.dev/pipeline: p-dag `), } - cms := []*corev1.ConfigMap{withEnabledAlphaAPIFields(newFeatureFlagsConfigMap())} + + cms := []*corev1.ConfigMap{newFeatureFlagsConfigMap()} cms = append(cms, withMaxMatrixCombinationsCount(newDefaultsConfigMap(), 10)) tests := []struct { name string @@ -10945,7 +10945,7 @@ spec: exit 1 `) - cms := []*corev1.ConfigMap{withEnabledAlphaAPIFields(newFeatureFlagsConfigMap())} + cms := []*corev1.ConfigMap{newFeatureFlagsConfigMap()} cms = append(cms, withMaxMatrixCombinationsCount(newDefaultsConfigMap(), 10)) tests := []struct { @@ -11567,7 +11567,7 @@ spec: name: mytask `), } - cms := []*corev1.ConfigMap{withEnabledAlphaAPIFields(newFeatureFlagsConfigMap())} + cms := []*corev1.ConfigMap{newFeatureFlagsConfigMap()} tests := []struct { name string @@ -11929,7 +11929,7 @@ spec: echo -n "[\"linux\",\"mac\",\"windows\"]" | tee $(results.platforms.path) `) - cms := []*corev1.ConfigMap{withEnabledAlphaAPIFields(newFeatureFlagsConfigMap())} + cms := []*corev1.ConfigMap{newFeatureFlagsConfigMap()} cms = append(cms, withMaxMatrixCombinationsCount(newDefaultsConfigMap(), 10)) tests := []struct { name string @@ -12092,7 +12092,8 @@ spec: kind: Task `), } - cms := []*corev1.ConfigMap{withEnabledAlphaAPIFields(newFeatureFlagsConfigMap())} + + cms := []*corev1.ConfigMap{newFeatureFlagsConfigMap()} cms = append(cms, withMaxMatrixCombinationsCount(newDefaultsConfigMap(), 10)) tests := []struct {