Merge pull request #56 from platform9/kubewatcher

Kubewatcher: trigger functions from Kubernetes Watch callbacks

fission/common.go

@@ -19,6 +19,7 @@ package main
 import (
 	"fmt"
 	"os"
+	"strings"
 
 	"github.com/platform9/fission/controller/client"
 )
@@ -34,6 +35,8 @@ func getClient(serverUrl string) *client.Client {
 		fatal("Need --server or FISSION_URL set to your fission server.")
 	}
 
+	serverUrl = "http://" + strings.TrimPrefix(serverUrl, "http://")
+
 	return client.MakeClient(serverUrl)
 }
 

fission/main.go

@@ -49,7 +49,7 @@ func main() {
 	// httptriggers
 	htNameFlag := cli.StringFlag{Name: "name", Usage: "HTTP Trigger name"}
 	htMethodFlag := cli.StringFlag{Name: "method", Usage: "HTTP Method: GET|POST|PUT|DELETE|HEAD; defaults to GET"}
-	htUrlFlag := cli.StringFlag{Name: "url", Usage: "URL pattern (see TODO for supported patterns)"}
+	htUrlFlag := cli.StringFlag{Name: "url", Usage: "URL pattern (See gorilla/mux supported patterns)"}
 	htFnNameFlag := cli.StringFlag{Name: "function", Usage: "Function name"}
 	htFnUidFlag := cli.StringFlag{Name: "uid", Usage: "Function UID (optional; uses latest if unspecified)"}
 	htSubcommands := []cli.Command{
@@ -71,10 +71,26 @@ func main() {
 		{Name: "list", Usage: "List all environments", Flags: []cli.Flag{}, Action: envList},
 	}
 
+	// watches
+	wNameFlag := cli.StringFlag{Name: "name", Usage: "Watch name"}
+	wFnNameFlag := cli.StringFlag{Name: "function", Usage: "Function name"}
+	wFnUidFlag := cli.StringFlag{Name: "uid", Usage: "Function UID (optional; uses latest if unspecified)"}
+	wNamespaceFlag := cli.StringFlag{Name: "ns", Usage: "Namespace of resource to watch"}
+	wObjTypeFlag := cli.StringFlag{Name: "type", Usage: "Type of resource to watch (Pod, Service, etc.)"}
+	wLabelsFlag := cli.StringFlag{Name: "labels", Usage: "Label selector of the form a=b,c=d"}
+	wSubCommands := []cli.Command{
+		{Name: "create", Aliases: []string{"add"}, Usage: "Create a watch", Flags: []cli.Flag{wFnNameFlag, wFnUidFlag, wNamespaceFlag, wObjTypeFlag, wLabelsFlag}, Action: wCreate},
+		{Name: "get", Usage: "Get details about a watch", Flags: []cli.Flag{wNameFlag}, Action: wGet},
+		// TODO add update flag when supported
+		{Name: "delete", Usage: "Delete watch", Flags: []cli.Flag{wNameFlag}, Action: wDelete},
+		{Name: "list", Usage: "List all watches", Flags: []cli.Flag{}, Action: wList},
+	}
+
 	app.Commands = []cli.Command{
 		{Name: "function", Aliases: []string{"fn"}, Usage: "Create, update and manage functions", Subcommands: fnSubcommands},
 		{Name: "httptrigger", Aliases: []string{"ht", "route"}, Usage: "Manage HTTP triggers (routes) for functions", Subcommands: htSubcommands},
 		{Name: "environment", Aliases: []string{"env"}, Usage: "Manage environments", Subcommands: envSubcommands},
+		{Name: "watch", Aliases: []string{"w"}, Usage: "Manage watches", Subcommands: wSubCommands},
 
 		// Misc commands
 		{

fission/watch.go

@@ -0,0 +1,120 @@
+/*
+Copyright 2016 The Fission 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.
+*/
+
+package main
+
+import (
+	"fmt"
+	"os"
+	"text/tabwriter"
+
+	"github.com/satori/go.uuid"
+	"github.com/urfave/cli"
+
+	"github.com/platform9/fission"
+)
+
+func wCreate(c *cli.Context) error {
+	client := getClient(c.GlobalString("server"))
+
+	fnName := c.String("function")
+	if len(fnName) == 0 {
+		fatal("Need a function name to create a watch, use --function")
+	}
+	fnUid := c.String("uid")
+
+	namespace := c.String("ns")
+	if len(namespace) == 0 {
+		fmt.Println("Watch 'default' namespace. Use --ns <namespace> to override.")
+		namespace = "default"
+	}
+
+	objType := c.String("type")
+	if len(objType) == 0 {
+		fmt.Println("Object type unspecified, will watch pods.  Use --type <type> to override.")
+		objType = "pod"
+	}
+
+	labels := c.String("labels")
+	// empty 'labels' selects everything
+	if len(labels) == 0 {
+		fmt.Printf("Watching all objects of type '%v', use --labels to refine selection.\n", objType)
+	}
+
+	// automatically name watches
+	watchName := uuid.NewV4().String()
+
+	w := &fission.Watch{
+		Metadata: fission.Metadata{
+			Name: watchName,
+		},
+		Function: fission.Metadata{
+			Name: fnName,
+			Uid:  fnUid,
+		},
+		Namespace:     namespace,
+		ObjType:       objType,
+		LabelSelector: labels,
+		FieldSelector: "", // TODO
+	}
+
+	_, err := client.WatchCreate(w)
+	checkErr(err, "create watch")
+
+	fmt.Printf("watch '%v' created\n", w.Metadata.Name)
+	return err
+}
+
+func wGet(c *cli.Context) error {
+	return nil
+}
+
+func wUpdate(c *cli.Context) error {
+	return nil
+}
+
+func wDelete(c *cli.Context) error {
+	client := getClient(c.GlobalString("server"))
+
+	wName := c.String("name")
+	if len(wName) == 0 {
+		fatal("Need name of watch to delete, use --name")
+	}
+
+	err := client.WatchDelete(&fission.Metadata{Name: wName})
+	checkErr(err, "delete watch")
+
+	fmt.Printf("watch '%v' deleted\n", wName)
+	return nil
+}
+
+func wList(c *cli.Context) error {
+	client := getClient(c.GlobalString("server"))
+
+	ws, err := client.WatchList()
+	checkErr(err, "list watches")
+
+	w := tabwriter.NewWriter(os.Stdout, 0, 0, 1, ' ', 0)
+
+	fmt.Fprintf(w, "%v\t%v\t%v\t%v\t%v\t%v\n", "NAME", "NAMESPACE", "OBJTYPE", "LABELS", "FUNCTION_NAME", "FUNCTION_UID")
+	for _, wa := range ws {
+		fmt.Fprintf(w, "%v\t%v\t%v\t%v\t%v\t%v\n",
+			wa.Metadata.Name, wa.Namespace, wa.ObjType, wa.LabelSelector, wa.Function.Name, wa.Function.Uid)
+	}
+	w.Flush()
+
+	return nil
+}