Allow subPath in PipelineRun for volumeClaimTemplate as well

tektoncd · Apr 27, 2020 · 9f9d1bd · 9f9d1bd
1 parent bd8cfa3
commit 9f9d1bd
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 43 deletions.
diff --git a/pkg/apis/pipeline/v1beta1/pipelinerun_validation.go b/pkg/apis/pipeline/v1beta1/pipelinerun_validation.go
@@ -81,10 +81,6 @@ func (ps *PipelineRunSpec) Validate(ctx context.Context) *apis.FieldError {
 				}
 			}
 			wsNames[ws.Name] = idx
-
-			if err := ws.Validate(ctx); err != nil {
-				return err
-			}
 		}
 	}
 

diff --git a/pkg/apis/pipeline/v1beta1/pipelinerun_validation_test.go b/pkg/apis/pipeline/v1beta1/pipelinerun_validation_test.go
@@ -196,22 +196,6 @@ func TestPipelineRunSpec_Invalidate(t *testing.T) {
 			Message: `workspace "ws" provided by pipelinerun more than once, at index 0 and 1`,
 			Paths:   []string{"spec.workspaces"},
 		},
-	}, {
-		name: "workspace with volumeClaimTemplate can not contain subPath field",
-		spec: v1beta1.PipelineRunSpec{
-			PipelineRef: &v1beta1.PipelineRef{
-				Name: "pipelinerefname",
-			},
-			Workspaces: []v1beta1.WorkspaceBinding{{
-				Name:                "ws",
-				VolumeClaimTemplate: &corev1.PersistentVolumeClaim{},
-				SubPath:             "subdir",
-			}},
-		},
-		wantErr: &apis.FieldError{
-			Message: `must not set the field(s)`,
-			Paths:   []string{"workspaces.volumeclaimtemplate.subpath"},
-		},
 	}}
 	for _, ps := range tests {
 		t.Run(ps.name, func(t *testing.T) {

diff --git a/pkg/apis/pipeline/v1beta1/workspace_validation.go b/pkg/apis/pipeline/v1beta1/workspace_validation.go
@@ -56,10 +56,6 @@ func (b *WorkspaceBinding) Validate(ctx context.Context) *apis.FieldError {
 		return apis.ErrMissingField("workspace.persistentvolumeclaim.claimname")
 	}
 
-	if b.VolumeClaimTemplate != nil && b.SubPath != "" {
-		return apis.ErrDisallowedFields("workspaces.volumeclaimtemplate.subpath")
-	}
-
 	// For a ConfigMap to work, you must provide the name of the ConfigMap to use.
 	if b.ConfigMap != nil && b.ConfigMap.LocalObjectReference.Name == "" {
 		return apis.ErrMissingField("workspace.configmap.name")

diff --git a/pkg/apis/pipeline/v1beta1/workspace_validation_test.go b/pkg/apis/pipeline/v1beta1/workspace_validation_test.go
@@ -105,25 +105,6 @@ func TestWorkspaceBindingValidateInvalid(t *testing.T) {
 				ClaimName: "pool-party",
 			},
 		},
-	}, {
-		name: "Provided volumeClaimTemplate with subPath field set",
-		binding: &WorkspaceBinding{
-			Name:    "beth",
-			SubPath: "notallowed-when-using-volumeclaimtemplate-in-pipeline",
-			VolumeClaimTemplate: &corev1.PersistentVolumeClaim{
-				ObjectMeta: metav1.ObjectMeta{
-					Name: "mypvc",
-				},
-				Spec: corev1.PersistentVolumeClaimSpec{
-					AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
-					Resources: corev1.ResourceRequirements{
-						Requests: corev1.ResourceList{
-							"storage": resource.MustParse("1Gi"),
-						},
-					},
-				},
-			},
-		},
 	}, {
 		name: "Provided neither pvc nor emptydir",
 		binding: &WorkspaceBinding{
-Original file line number
+Diff line change
@@ Expand Up @@
     				}
     			}
     			wsNames[ws.Name] = idx
-    			if err := ws.Validate(ctx); err != nil {
-    				return err
-    			}
     		}
     	}
@@ Expand Down @@