some changes

Gopkg.toml

@@ -31,24 +31,24 @@
 
 [[constraint]]
   name = "github.com/mattn/go-runewidth"
-  version = "0.0.3"
+  version = "0.0.4"
 
 [[constraint]]
   name = "github.com/spf13/cobra"
-  version = "0.0.3"
+  version = "0.0.4"
 
 [[constraint]]
-  name = "gopkg.in/yaml.v2"
-  version = "2.2.1"
-
-[[constraint]]
-  branch = "master"
   name = "github.com/lastbackend/lastbackend"
+  branch = "master"
 
 [[constraint]]
   branch = "master"
   name = "github.com/howeyc/gopass"
 
+[[constraint]]
+  name = "gopkg.in/yaml.v3"
+  branch = "v3"
+
 [prune]
   go-tests = true
   unused-packages = true

contrib/examples/job-build.yml

@@ -3,8 +3,8 @@ version: v1
 meta:
   name: build
   labels:
-    app: lastbackend
     type: job
+    app: lastbackend
 spec:
   enabled: true
   concurrency:
@@ -15,37 +15,38 @@ spec:
       endpoint: "http://127.0.0.1:2965/task/manifest"
       method: GET
       headers:
-        X-LASTBACKEND-AUTH: "lstbknd"
+        X-LASTBACKEND-AUTH: "11c9ae503b8a46c6abba315c3f5e07db"
   hook:
     http:
       endpoint: "http://127.0.0.1:2965/task/status"
       method: PUT
       headers:
-        X-LASTBACKEND-AUTH: "lstbknd"
+        X-LASTBACKEND-AUTH: "11c9ae503b8a46c6abba315c3f5e07db"
   task:
     runtime:
-      services: [dind]
+      #      services: [dind]
+      services: []
       tasks:
-        - name: "build"
-          container: "git"
-          commands:
-            - command: "docker build -t index.lstbknd.net/undassa/alpine github.com/undassa/alpine"
-        - name: "push"
-          container: "git"
-          commands:
-            - command: "docker push index.lstbknd.net/undassa/alpine"
+    #        - name: "build"
+    #          container: "git"
+    #          commands:
+    #            - command: "docker build -t index.lstbknd.net/undassa/alpine github.com/undassa/alpine"
+    #        - name: "push"
+    #          container: "git"
+    #          commands:
+    #            - command: "docker push index.lstbknd.net/undassa/alpine"
     template:
-      containers:
-        - name: dind
-          image:
-            name: docker:18.09.1-dind
-          restart:
-            policy: always
-          security:
-            privileged: true
-        - name: git
-          image:
-            name: docker:18.09.1-git
-          env:
-            - name: DOCKER_HOST
-              value: "tcp://127.0.0.1:2375"
+#      containers:
+#        - name: dind
+#          image:
+#            name: docker:18.09.1-dind
+#          restart:
+#            policy: always
+#          security:
+#            privileged: true
+#        - name: git
+#          image:
+#            name: docker:18.09.1-git
+#          env:
+#            - name: DOCKER_HOST
+#              value: "tcp://127.0.0.1:2375"

hack/build-cross.sh

@@ -1,12 +1,9 @@
 #!/bin/bash
 
-go get -u github.com/golang/dep/cmd/dep
-dep ensure
-
 mkdir -p build/linux && mkdir -p build/darwin
 
 ## declare an array of components variable
-declare -a arr=("kit" "node" "cli")
+declare -a arr=("cli")
 
 if [[ $1 != "" ]]; then
   arr=($1)

pkg/cli/cmd/cluster_del.go

@@ -49,8 +49,7 @@ var ClusterDelCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		name := args[0]
 
-		err := storage.DelLocalCluster(name)
-		if err != nil {
+		if err := storage.DelLocalCluster(name); err != nil {
 			panic(err)
 		}
 

pkg/cli/cmd/commands.go

@@ -161,6 +161,7 @@ var RootCmd = &cobra.Command{
 					return
 				}
 				host = cluster.Endpoint
+				config.Token = cluster.Token
 			case "r.":
 				config.Headers = make(map[string]string, 0)
 				config.Headers["X-Cluster-Name"] = cluster[2:]

pkg/cli/cmd/job_logs.go

@@ -31,7 +31,9 @@ import (
 )
 
 func init() {
-	jobLogsCmd.Flags().StringP("task", "t", "", "read logs for particular task")
+	jobLogsCmd.Flags().IntP("tail", "t", 0, "tail last n lines")
+	jobLogsCmd.Flags().BoolP("follow", "f", false, "follow logs")
+	jobLogsCmd.Flags().String("task", "", "read logs for particular task")
 	jobCmd.AddCommand(jobLogsCmd)
 }
 
@@ -58,6 +60,18 @@ var jobLogsCmd = &cobra.Command{
 			return
 		}
 
+		opts.Tail, err = cmd.Flags().GetInt("tail")
+		if err != nil {
+			fmt.Println(err.Error())
+			return
+		}
+
+		opts.Follow, err = cmd.Flags().GetBool("follow")
+		if err != nil {
+			fmt.Println(err.Error())
+			return
+		}
+
 		if task != types.EmptyString {
 			opts.Task = task
 		}
@@ -84,7 +98,9 @@ var jobLogsCmd = &cobra.Command{
 				os.Exit(1)
 			}
 
-			fmt.Println(">", doc.Selflink, doc.Data)
+			if doc.ContainerType == types.ContainerTypeRuntimeTask {
+				fmt.Println(doc.Data)
+			}
 		}
 	},
 }

pkg/cli/cmd/namespace_apply.go

@@ -31,7 +31,7 @@ import (
 	"github.com/lastbackend/lastbackend/pkg/api/types/v1"
 	"github.com/lastbackend/lastbackend/pkg/api/types/v1/request"
 	"github.com/spf13/cobra"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )
 
 const applyExample = `

pkg/cli/cmd/service_logs.go

@@ -30,6 +30,8 @@ import (
 )
 
 func init() {
+	serviceLogsCmd.Flags().IntP("tail", "t", 0, "tail last n lines")
+	serviceLogsCmd.Flags().BoolP("follow", "f", false, "follow logs")
 	serviceCmd.AddCommand(serviceLogsCmd)
 }
 
@@ -47,6 +49,20 @@ var serviceLogsCmd = &cobra.Command{
 
 		opts := new(request.ServiceLogsOptions)
 
+		var err error
+
+		opts.Tail, err = cmd.Flags().GetInt("tail")
+		if err != nil {
+			fmt.Println(err.Error())
+			return
+		}
+
+		opts.Follow, err = cmd.Flags().GetBool("follow")
+		if err != nil {
+			fmt.Println(err.Error())
+			return
+		}
+
 		namespace, name, err := serviceParseSelfLink(args[0])
 		checkError(err)