Knative Build component removed, Knative deps latest version

Author: tzununbekov

.circleci/config.yml

@@ -28,6 +28,7 @@ jobs:
       - run:
           name: Building package
           command: make build
+          no_output_timeout: 20m
       - gcp-cli/install
       - gcp-cli/initialize
       - run:
@@ -58,6 +59,7 @@ jobs:
       - run:
           name: Running unit tests
           command: mkdir -p ${OUTPUT_DIR} && make test
+          no_output_timeout: 20m
           environment:
             OUTPUT_DIR: /tmp/test-results/
       - store_test_results:

README.md

@@ -4,14 +4,17 @@ A CLI for [knative](https://github.com/knative)
 
 ## Installation
 
-With a working [Golang](https://golang.org/doc/install) environment do:
+There are two ways of tm CLI installation:
 
+- Download a binary from the [latest release](https://github.com/triggermesh/tm/releases/latest)
+
+- Install CLI from sources:
 ```
-go get github.com/triggermesh/tm
+git clone https://github.com/triggermesh/tm.git
+cd tm
+go install
 ```
 
-Or head to the GitHub [release page](https://github.com/triggermesh/tm/releases) and download a release.
-
 ### Configuration
 
 **On TriggerMesh:**
@@ -31,11 +34,11 @@ Deploy service from Docker image
 tm deploy service foo -f gcr.io/google-samples/hello-app:1.0 --wait
 ```
 
-If you have Dockerfile for your service, you can use kaniko buildtemplate to deploy it
+If you have Dockerfile for your service, you can use kaniko runtime to deploy it
 ```
 tm deploy service foobar \
     -f https://github.com/knative/docs \
-    --build-template https://raw.githubusercontent.com/triggermesh/build-templates/master/kaniko/kaniko.yaml \
+    --runtime https://raw.githubusercontent.com/triggermesh/knative-lambda-runtime/master/kaniko/runtime.yaml \
     --build-argument DIRECTORY=docs/serving/samples/hello-world/helloworld-go \
     --wait
 ```
@@ -44,7 +47,7 @@ or deploy service straight from Go source using Openfaas runtime
 ```
 tm deploy service bar \
     -f https://github.com/golang/example \
-    --build-template https://raw.githubusercontent.com/triggermesh/openfaas-runtime/master/go/openfaas-go-runtime.yaml \
+    --runtime https://raw.githubusercontent.com/triggermesh/openfaas-runtime/master/go/openfaas-go-runtime.yaml \
     --build-argument DIRECTORY=hello \
     --wait
 ```
@@ -100,10 +103,10 @@ func main() {
 EOF
 ```
 
-Deploy function using Knative lambda buildtemplate with Go runtime
+Deploy function using Go Knative lambda runtime
 
 ```
-tm deploy service go-lambda -f . --build-template https://raw.githubusercontent.com/triggermesh/knative-lambda-runtime/master/go-1.x/buildtemplate.yaml --wait
+tm deploy service go-lambda -f . --runtime https://raw.githubusercontent.com/triggermesh/knative-lambda-runtime/master/go-1.x/runtime.yaml --wait
 ```
 
 Lambda function available via http events
@@ -177,7 +180,7 @@ Besides pulling, this secret may be used to push new images for service deployme
 
 ```
 tm deploy service foo-private -f https://github.com/serverless/examples \
-                              --build-template knative-node4-runtime \
+                              --runtime knative-node4-runtime \
                               --build-argument DIRECTORY=aws-node-serve-dynamic-html-via-http-endpoint \
                               --build-argument HANDLER=handler.landingPage \
                               --registry-secret foo-registry \

cmd/cmd.go

@@ -21,10 +21,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/triggermesh/tm/pkg/client"
 	"github.com/triggermesh/tm/pkg/generate"
-	"github.com/triggermesh/tm/pkg/resources/build"
-	"github.com/triggermesh/tm/pkg/resources/buildtemplate"
 	"github.com/triggermesh/tm/pkg/resources/channel"
-	"github.com/triggermesh/tm/pkg/resources/clusterbuildtemplate"
 	"github.com/triggermesh/tm/pkg/resources/configuration"
 	"github.com/triggermesh/tm/pkg/resources/credential"
 	"github.com/triggermesh/tm/pkg/resources/pipelineresource"
@@ -50,7 +47,6 @@ var (
 	registrySecret  string
 	registrySkipTLS bool
 
-	b   build.Build
 	c   channel.Channel
 	t   task.Task
 	tr  taskrun.TaskRun
@@ -62,8 +58,6 @@ var (
 	cf  configuration.Configuration
 	gc  credential.GitCreds
 	rc  credential.RegistryCreds
-	bt  buildtemplate.Buildtemplate
-	cbt clusterbuildtemplate.ClusterBuildtemplate
 )
 
 // tmCmd represents the base command when called without any subcommands

cmd/delete.go

@@ -38,10 +38,8 @@ func newDeleteCmd(clientset *client.ConfigSet) *cobra.Command {
 	deleteCmd.Flags().StringVarP(&file, "file", "f", "serverless.yaml", "Delete functions defined in yaml")
 	deleteCmd.Flags().IntVarP(&concurrency, "concurrency", "c", 3, "Number of concurrent deletion threads")
 	deleteCmd.AddCommand(cmdDeleteConfiguration(clientset))
-	deleteCmd.AddCommand(cmdDeleteBuildTemplate(clientset))
 	deleteCmd.AddCommand(cmdDeleteRevision(clientset))
 	deleteCmd.AddCommand(cmdDeleteService(clientset))
-	deleteCmd.AddCommand(cmdDeleteBuild(clientset))
 	deleteCmd.AddCommand(cmdDeleteRoute(clientset))
 	deleteCmd.AddCommand(cmdDeleteChannel(clientset))
 	deleteCmd.AddCommand(cmdDeleteTask(clientset))
@@ -51,40 +49,6 @@ func newDeleteCmd(clientset *client.ConfigSet) *cobra.Command {
 	return deleteCmd
 }
 
-func cmdDeleteBuild(clientset *client.ConfigSet) *cobra.Command {
-	return &cobra.Command{
-		Use:     "build",
-		Aliases: []string{"builds"},
-		Short:   "Delete knative build resource",
-		Args:    cobra.ExactArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			b.Name = args[0]
-			b.Namespace = client.Namespace
-			if err := b.Delete(clientset); err != nil {
-				log.Fatalln(err)
-			}
-			clientset.Log.Infoln("Build is being deleted")
-		},
-	}
-}
-
-func cmdDeleteBuildTemplate(clientset *client.ConfigSet) *cobra.Command {
-	return &cobra.Command{
-		Use:     "buildtemplate",
-		Aliases: []string{"buildtemplates"},
-		Short:   "Delete knative buildtemplate resource",
-		Args:    cobra.ExactArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			bt.Name = args[0]
-			bt.Namespace = client.Namespace
-			if err := bt.Delete(clientset); err != nil {
-				log.Fatalln(err)
-			}
-			clientset.Log.Infoln("BuildTemplate is being deleted")
-		},
-	}
-}
-
 func cmdDeleteChannel(clientset *client.ConfigSet) *cobra.Command {
 	return &cobra.Command{
 		Use:     "channel",

cmd/deploy.go

@@ -40,8 +40,6 @@ func newDeployCmd(clientset *client.ConfigSet) *cobra.Command {
 
 	deployCmd.AddCommand(cmdDeployService(clientset))
 	deployCmd.AddCommand(cmdDeployChannel(clientset))
-	deployCmd.AddCommand(cmdDeployBuild(clientset))
-	deployCmd.AddCommand(cmdDeployBuildTemplate(clientset))
 	deployCmd.AddCommand(cmdDeployTask(clientset))
 	deployCmd.AddCommand(cmdDeployTaskRun(clientset))
 	deployCmd.AddCommand(cmdDeployPipelineResource(clientset))
@@ -73,13 +71,10 @@ func cmdDeployService(clientset *client.ConfigSet) *cobra.Command {
 
 	deployServiceCmd.Flags().StringVarP(&s.Source, "from", "f", "", "Service source to deploy: local folder with sources, git repository or docker image")
 	deployServiceCmd.Flags().StringVar(&s.Revision, "revision", "master", "Git revision (branch, tag, commit SHA or ref)")
-	deployServiceCmd.Flags().StringVar(&s.Runtime, "runtime", "", "Existing buildtemplate name, local path or URL to buildtemplate yaml file")
-	// deployServiceCmd.Flags().StringVar(&s.RegistrySecret, "registry-secret", "", "Name of k8s secret to use in buildtemplate as registry auth json")
-	// deployServiceCmd.Flags().StringVar(&s.ResultImageTag, "tag", "latest", "Image tag to build")
-	// deployServiceCmd.Flags().StringVar(&s.PullPolicy, "image-pull-policy", "Always", "Image pull policy")
+	deployServiceCmd.Flags().StringVar(&s.Runtime, "runtime", "", "Existing task name, local path or URL to task yaml file")
 	deployServiceCmd.Flags().StringVar(&s.BuildTimeout, "build-timeout", "10m", "Service image build timeout")
 	deployServiceCmd.Flags().IntVar(&s.Concurrency, "concurrency", 0, "Number of concurrent events per container: 0 - multiple events, 1 - single event, N - particular number of events")
-	deployServiceCmd.Flags().StringSliceVar(&s.BuildArgs, "build-argument", []string{}, "Buildtemplate arguments")
+	deployServiceCmd.Flags().StringSliceVar(&s.BuildArgs, "build-argument", []string{}, "Build arguments")
 	deployServiceCmd.Flags().StringSliceVar(&s.EnvSecrets, "env-secret", []string{}, "Name of k8s secrets to populate pod environment variables")
 	deployServiceCmd.Flags().BoolVar(&s.BuildOnly, "build-only", false, "Build image and exit")
 	deployServiceCmd.Flags().StringSliceVarP(&s.Labels, "label", "l", []string{}, "Service labels")
@@ -88,49 +83,6 @@ func cmdDeployService(clientset *client.ConfigSet) *cobra.Command {
 	return deployServiceCmd
 }
 
-func cmdDeployBuild(clientset *client.ConfigSet) *cobra.Command {
-	deployBuildCmd := &cobra.Command{
-		Use:     "build",
-		Aliases: []string{"builds"},
-		Args:    cobra.ExactArgs(1),
-		Short:   "Deploy knative build",
-		Example: "tm deploy build foo-builder --source git-repo --buildtemplate kaniko --args IMAGE=knative-local-registry:5000/foo-image",
-		Run: func(cmd *cobra.Command, args []string) {
-			b.Name = args[0]
-			b.Namespace = client.Namespace
-			if _, err := b.Deploy(clientset); err != nil {
-				clientset.Log.Fatal(err)
-			}
-			clientset.Log.Infoln("Build created")
-		},
-	}
-
-	deployBuildCmd.Flags().StringVar(&b.Source, "source", "", "Git URL or local path to get sources from")
-	deployBuildCmd.Flags().StringVar(&b.Revision, "revision", "master", "Git source revision")
-	deployBuildCmd.Flags().StringVar(&b.Buildtemplate, "buildtemplate", "", "Buildtemplate name to use with build")
-	deployBuildCmd.Flags().StringSliceVar(&b.Args, "args", []string{}, "Build arguments")
-	deployBuildCmd.MarkFlagRequired("source")
-	return deployBuildCmd
-}
-
-func cmdDeployBuildTemplate(clientset *client.ConfigSet) *cobra.Command {
-	deployBuildTemplateCmd := &cobra.Command{
-		Use:     "buildtemplate",
-		Aliases: []string{"buildtemplates", "bldtmpl"},
-		Short:   "Deploy knative build template",
-		Example: "tm -n default deploy buildtemplate -f https://raw.githubusercontent.com/triggermesh/nodejs-runtime/master/knative-build-template.yaml",
-		Run: func(cmd *cobra.Command, args []string) {
-			bt.Namespace = client.Namespace
-			if _, err := bt.Deploy(clientset); err != nil {
-				clientset.Log.Fatal(err)
-			}
-		},
-	}
-
-	deployBuildTemplateCmd.Flags().StringVarP(&bt.File, "from", "f", "", "Local path or URL to buildtemplate yaml file")
-	return deployBuildTemplateCmd
-}
-
 func cmdDeployChannel(clientset *client.ConfigSet) *cobra.Command {
 	deployChannelCmd := &cobra.Command{
 		Use:     "channel",

cmd/get.go

@@ -36,9 +36,6 @@ var getCmd = &cobra.Command{
 
 // NewGetCmd returns "Get" cobra CLI command with its subcommands
 func newGetCmd(clientset *client.ConfigSet) *cobra.Command {
-	getCmd.AddCommand(cmdListBuild(clientset))
-	getCmd.AddCommand(cmdListBuildTemplates(clientset))
-	getCmd.AddCommand(cmdListClusterBuildTemplates(clientset))
 	getCmd.AddCommand(cmdListConfigurations(clientset))
 	getCmd.AddCommand(cmdListRevision(clientset))
 	getCmd.AddCommand(cmdListRoute(clientset))
@@ -51,92 +48,6 @@ func newGetCmd(clientset *client.ConfigSet) *cobra.Command {
 	return getCmd
 }
 
-func cmdListBuild(clientset *client.ConfigSet) *cobra.Command {
-	return &cobra.Command{
-		Use:     "build",
-		Aliases: []string{"builds"},
-		Short:   "List of knative build resources",
-		Run: func(cmd *cobra.Command, args []string) {
-			b.Namespace = client.Namespace
-			if len(args) == 0 {
-				list, err := b.List(clientset)
-				if err != nil {
-					clientset.Log.Fatalln(err)
-				}
-				if len(list.Items) == 0 {
-					fmt.Fprintf(cmd.OutOrStdout(), "No builds found\n")
-					return
-				}
-				clientset.Printer.PrintTable(b.GetTable(list))
-				return
-			}
-			b.Name = args[0]
-			build, err := b.Get(clientset)
-			if err != nil {
-				clientset.Log.Fatalln(err)
-			}
-			clientset.Printer.PrintObject(b.GetObject(build))
-		},
-	}
-}
-
-func cmdListBuildTemplates(clientset *client.ConfigSet) *cobra.Command {
-	return &cobra.Command{
-		Use:     "buildtemplate",
-		Aliases: []string{"buildtemplates"},
-		Short:   "List of buildtemplates",
-		Run: func(cmd *cobra.Command, args []string) {
-			bt.Namespace = client.Namespace
-			if len(args) == 0 {
-				list, err := bt.List(clientset)
-				if err != nil {
-					clientset.Log.Fatalln(err)
-				}
-				if len(list.Items) == 0 {
-					fmt.Fprintf(cmd.OutOrStdout(), "No builds found\n")
-					return
-				}
-				clientset.Printer.PrintTable(bt.GetTable(list))
-				return
-			}
-			bt.Name = args[0]
-			buildtemplate, err := bt.Get(clientset)
-			if err != nil {
-				clientset.Log.Fatalln(err)
-			}
-			clientset.Printer.PrintObject(bt.GetObject(buildtemplate))
-		},
-	}
-}
-
-func cmdListClusterBuildTemplates(clientset *client.ConfigSet) *cobra.Command {
-	return &cobra.Command{
-		Use:     "clusterbuildtemplate",
-		Aliases: []string{"cbuildtemplates", "cbuildtemplate", "clusterbuildtemplates"},
-		Short:   "List of clusterbuildtemplates",
-		Run: func(cmd *cobra.Command, args []string) {
-			if len(args) == 0 {
-				list, err := cbt.List(clientset)
-				if err != nil {
-					clientset.Log.Fatalln(err)
-				}
-				if len(list.Items) == 0 {
-					fmt.Fprintf(cmd.OutOrStdout(), "No clusterbuildtemplates found\n")
-					return
-				}
-				clientset.Printer.PrintTable(cbt.GetTable(list))
-				return
-			}
-			cbt.Name = args[0]
-			cbuildtemplate, err := cbt.Get(clientset)
-			if err != nil {
-				clientset.Log.Fatalln(err)
-			}
-			clientset.Printer.PrintObject(cbt.GetObject(cbuildtemplate))
-		},
-	}
-}
-
 func cmdListChannels(clientset *client.ConfigSet) *cobra.Command {
 	return &cobra.Command{
 		Use:     "channel",