support VolumeClaimTemplates with --workspace

pkg/cmd/pipeline/start.go

@@ -274,7 +274,7 @@ func (opt *startOptions) startPipeline(pipelineStart *v1beta1.Pipeline) error {
 	}
 	pr.Spec.Params = param
 
-	workspaces, err := workspaces.Merge(pr.Spec.Workspaces, opt.Workspaces)
+	workspaces, err := workspaces.Merge(pr.Spec.Workspaces, opt.Workspaces, opt.cliparams)
 	if err != nil {
 		return err
 	}
@@ -736,8 +736,8 @@ func NameArg(args []string, p cli.Params, file string) (*v1beta1.Pipeline, error
 	return pipelineFile, nil
 }
 
-func parsePipeline(taskLocation string, p cli.Params) (*v1beta1.Pipeline, error) {
-	b, err := file.LoadFileContent(p, taskLocation, file.IsYamlFile(), fmt.Errorf("invalid file format for %s: .yaml or .yml file extension and format required", taskLocation))
+func parsePipeline(pipelineLocation string, p cli.Params) (*v1beta1.Pipeline, error) {
+	b, err := file.LoadFileContent(p, pipelineLocation, file.IsYamlFile(), fmt.Errorf("invalid file format for %s: .yaml or .yml file extension and format required", pipelineLocation))
 	if err != nil {
 		return nil, err
 	}

pkg/cmd/task/start.go

@@ -335,7 +335,7 @@ func startTask(opt startOptions, args []string) error {
 	}
 	tr.ObjectMeta.Labels = labels
 
-	workspaces, err := workspaces.Merge(tr.Spec.Workspaces, opt.Workspaces)
+	workspaces, err := workspaces.Merge(tr.Spec.Workspaces, opt.Workspaces, opt.cliparams)
 	if err != nil {
 		return err
 	}

pkg/file/file.go

@@ -41,12 +41,16 @@ func LoadFileContent(p cli.Params, target string, validate TypeValidator, errorM
 	}
 
 	var content []byte
-	cs, err := p.Clients()
-	if err != nil {
-		return nil, fmt.Errorf("failed to create tekton client")
+	var cs *cli.Clients
+	var err error
+	if p != nil {
+		cs, err = p.Clients()
+		if err != nil {
+			return nil, fmt.Errorf("failed to create tekton client")
+		}
 	}
 
-	if strings.HasPrefix(target, "http") {
+	if strings.HasPrefix(target, "http") && cs != nil {
 		content, err = getRemoteContent(cs, target)
 	} else {
 		content, err = ioutil.ReadFile(target)

pkg/workspaces/testdata/pvc-typo.yaml

@@ -0,0 +1,25 @@
+# Copyright 2020 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.
+
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: vctname
+spec:
+  storageClassNam: "storageclassname"
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 50Mi

pkg/workspaces/testdata/pvc.yaml

@@ -0,0 +1,25 @@
+# Copyright 2020 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.
+
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: vctname
+spec:
+  storageClassName: "storageclassname"
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 50Mi

pkg/workspaces/workspaces.go

@@ -16,30 +16,35 @@ package workspaces
 
 import (
 	"errors"
+	"fmt"
 	"strings"
 
+	"github.com/tektoncd/cli/pkg/cli"
+	"github.com/tektoncd/cli/pkg/file"
 	"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
 	corev1 "k8s.io/api/core/v1"
+	"sigs.k8s.io/yaml"
 )
 
 var (
-	nameParam       = "name"
-	claimNameParam  = "claimName"
-	subPathParam    = "subPath"
-	emptyDirParam   = "emptyDir"
-	configParam     = "config"
-	secretParam     = "secret"
-	configItemParam = "item"
+	nameParam               = "name"
+	claimNameParam          = "claimName"
+	subPathParam            = "subPath"
+	emptyDirParam           = "emptyDir"
+	configParam             = "config"
+	secretParam             = "secret"
+	configItemParam         = "item"
+	volumeClaimTemplateFile = "volumeClaimTemplateFile"
 )
 
 const invalidWorkspace = "invalid input format for workspace : "
 
 var errNotFoundParam = errors.New("param not found")
 
 // Merge merges workspacebinding already in pipelineruns with given options
-func Merge(ws []v1beta1.WorkspaceBinding, optWS []string) ([]v1beta1.WorkspaceBinding,
+func Merge(ws []v1beta1.WorkspaceBinding, optWS []string, p cli.Params) ([]v1beta1.WorkspaceBinding,
 	error) {
-	workspaces, err := parseWorkspace(optWS)
+	workspaces, err := parseWorkspace(optWS, p)
 	if err != nil {
 		return nil, err
 	}
@@ -62,7 +67,7 @@ func Merge(ws []v1beta1.WorkspaceBinding, optWS []string) ([]v1beta1.WorkspaceBi
 	return ws, nil
 }
 
-func parseWorkspace(w []string) (map[string]v1beta1.WorkspaceBinding, error) {
+func parseWorkspace(w []string, p cli.Params) (map[string]v1beta1.WorkspaceBinding, error) {
 	ws := map[string]v1beta1.WorkspaceBinding{}
 	for _, v := range w {
 
@@ -83,37 +88,49 @@ func parseWorkspace(w []string) (map[string]v1beta1.WorkspaceBinding, error) {
 			return nil, err
 		}
 
-		err = setWorkspaceConfig(r, &wB)
-		if err == nil {
-			ws[name] = wB
-			nWB++
-		} else if err != errNotFoundParam {
-			return nil, err
-		}
+		// check for volumeClaimTemplate
+		vctFile, err := getPar(r, volumeClaimTemplateFile)
+		if err != nil {
+			err = setWorkspaceConfig(r, &wB)
+			if err == nil {
+				ws[name] = wB
+				nWB++
+			} else if err != errNotFoundParam {
+				return nil, err
+			}
 
-		err = setWorkspaceSecret(r, &wB)
-		if err == nil {
-			ws[name] = wB
-			nWB++
-		} else if err != errNotFoundParam {
-			return nil, err
-		}
+			err = setWorkspaceSecret(r, &wB)
+			if err == nil {
+				ws[name] = wB
+				nWB++
+			} else if err != errNotFoundParam {
+				return nil, err
+			}
 
-		err = setWorkspaceEmptyDir(r, &wB)
-		if err == nil {
-			ws[name] = wB
-			nWB++
-		}
+			err = setWorkspaceEmptyDir(r, &wB)
+			if err == nil {
+				ws[name] = wB
+				nWB++
+			}
 
-		err = setWorkspacePVC(r, &wB)
-		if err == nil {
+			err = setWorkspacePVC(r, &wB)
+			if err == nil {
+				ws[name] = wB
+				nWB++
+			}
+
+			if nWB != 1 {
+				return nil, errors.New(invalidWorkspace + v)
+			}
+		} else {
+			err = setWorkspaceVCTemplate(r, &wB, vctFile, p)
+			if err != nil {
+				return nil, err
+			}
 			ws[name] = wB
-			nWB++
-		}
-		if nWB != 1 {
-			return nil, errors.New(invalidWorkspace + v)
 		}
 	}
+
 	return ws, nil
 }
 
@@ -219,6 +236,34 @@ func setWorkspaceEmptyDir(r []string, wB *v1beta1.WorkspaceBinding) error {
 	return nil
 }
 
+func setWorkspaceVCTemplate(r []string, wB *v1beta1.WorkspaceBinding, vctFile string, p cli.Params) error {
+	pvc, err := parseVolumeClaimTemplate(vctFile, p)
+	if err != nil {
+		return err
+	}
+
+	wB.VolumeClaimTemplate = pvc
+	return nil
+}
+
+func parseVolumeClaimTemplate(filePath string, p cli.Params) (*corev1.PersistentVolumeClaim, error) {
+	b, err := file.LoadFileContent(p, filePath, file.IsYamlFile(), fmt.Errorf("invalid file format for %s: .yaml or .yml file extension and format required", filePath))
+	if err != nil {
+		return nil, err
+	}
+	m := map[string]interface{}{}
+	err = yaml.UnmarshalStrict(b, &m)
+	if err != nil {
+		return nil, err
+	}
+
+	pvc := corev1.PersistentVolumeClaim{}
+	if err := yaml.UnmarshalStrict(b, &pvc); err != nil {
+		return nil, err
+	}
+	return &pvc, nil
+}
+
 func getPar(r []string, par string) (string, error) {
 	var p string
 	for i := range r {