added ingress controller

Author: lonelycode

cmd/inject.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/golang/glog"
+	"github.com/TykTechnologies/tyk-k8s/tyk"
 	"os"
 
 	"github.com/mitchellh/go-homedir"
@@ -63,8 +63,9 @@ func initConfig() {
 
 	// If a config file is found, read it in.
 	if err := viper.ReadInConfig(); err != nil {
-		glog.Fatal(err)
+		log.Fatal(err)
 	}
 
-	glog.Infof("Using config file: %v", viper.ConfigFileUsed())
+	log.Infof("Using config file: %v", viper.ConfigFileUsed())
+	tyk.Init()
 }

cmd/root.go

@@ -1,13 +1,19 @@
 package cmd
 
 import (
+	"github.com/TykTechnologies/tyk-k8s/ingress"
 	"github.com/TykTechnologies/tyk-k8s/injector"
+	"github.com/TykTechnologies/tyk-k8s/logger"
 	"github.com/TykTechnologies/tyk-k8s/webserver"
-	"github.com/golang/glog"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"os"
+	"os/signal"
+	"sync"
 )
 
+var log = logger.GetLogger("main")
+
 // startCmd represents the start command
 var startCmd = &cobra.Command{
 	Use:   "start",
@@ -21,39 +27,72 @@ the above example starts the sidecar injector and the tyk k8s ingress controller
 		sConf := &webserver.Config{}
 		err := viper.UnmarshalKey("Server", sConf)
 		if err != nil {
-			glog.Fatalf("no Server entry found in config file: %v", err)
+			log.Fatalf("no Server entry found in config file: %v", err)
 		}
 
 		// init config for the server
 		webserver.Server().Config(sConf)
-
+		ingressStarted := false
 		for _, a := range args {
 			switch a {
 			case "inject", "injector", "sidecar":
 				whConf := &injector.Config{}
 				err := viper.UnmarshalKey("Injector", whConf)
 				if err != nil {
-					glog.Fatalf("couldn't read injector config: %v", err)
+					log.Fatalf("couldn't read injector config: %v", err)
 				}
 				whs := &injector.WebhookServer{
 					SidecarConfig: whConf,
 				}
 
 				webserver.Server().AddRoute("POST", "/inject", whs.Serve)
 			case "ingress", "ing":
-				glog.Fatal("not implemented")
-				//TODO: add ingress controller
+				ingressStarted = true
+				ingress.NewController()
+				err := ingress.Controller().Start()
+				if err != nil {
+					log.Fatal(err)
+				}
+				log.Info("ingress controller started")
 			default:
-				glog.Error("use arguments like 'inject' or 'ingress' to start services")
+				log.Error("use arguments like 'inject' or 'ingress' to start services")
 				return
 
 			}
 		}
 
-		webserver.Server().Start()
+		go webserver.Server().Start()
+		log.Info("web server started")
+
+		WaitForCtrlC()
+
+		err = webserver.Server().Stop()
+		if err != nil {
+			log.Error(err)
+		}
+
+		if ingressStarted {
+			err = ingress.Controller().Stop()
+			if err != nil {
+				log.Error(err)
+			}
+		}
 	},
 }
 
 func init() {
 	rootCmd.AddCommand(startCmd)
 }
+
+func WaitForCtrlC() {
+	var end_waiter sync.WaitGroup
+	end_waiter.Add(1)
+	var signal_channel chan os.Signal
+	signal_channel = make(chan os.Signal, 1)
+	signal.Notify(signal_channel, os.Interrupt)
+	go func() {
+		<-signal_channel
+		end_waiter.Done()
+	}()
+	end_waiter.Wait()
+}

cmd/start.go

@@ -5,4 +5,4 @@ COPY files/build/tyk-k8s /opt/tyk-k8s/tyk-k8s
 
 WORKDIR /opt/tyk-k8s
 
-CMD ["/opt/goproxy/tyk-k8s", "start", "injector"]
+CMD ["/opt/goproxy/tyk-k8s", "start", "injector", "ingress"]