Merge pull request #5 from stefanprodan/appmesh-apis

Refactor controller and cmd

Author: stefanprodan

.github/workflows/build.yml

@@ -1,13 +1,23 @@
-name: CI
+name: build
 
 on: [push, pull_request]
 
 jobs:
-  kustomize:
+  test:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
-      - name: Validate manifests
+      - name: Go fmt
+        uses: stefanprodan/kube-tools@v1
+        with:
+          command: |
+            make go-fmt
+      - name: Go test
+        uses: stefanprodan/kube-tools@v1
+        with:
+          command: |
+            make test
+      - name: Validate kustomization
         uses: stefanprodan/kube-tools@v1
         with:
           command: |
@@ -17,7 +27,7 @@ jobs:
             kustomize build ./kustomize/test | kubeval --strict --ignore-missing-schemas
   build:
     runs-on: ubuntu-latest
-    needs: [kustomize]
+    needs: [test]
     steps:
       - uses: actions/checkout@v1
       - name: Build container

.github/workflows/release.yml

@@ -1,6 +1,11 @@
-name: PUSH
+name: release
 
-on: [push]
+on:
+  push:
+    branches-ignore:
+      - '**'
+    tags:
+      - 'v*.*.*'
 
 jobs:
   push-container:

Dockerfile

@@ -8,8 +8,6 @@ COPY . .
 
 RUN go mod download
 
-RUN go test -v -race ./...
-
 RUN CGO_ENABLED=0 GOOS=linux go build -a -o bin/appmesh-gateway cmd/appmesh-gateway/*
 
 FROM alpine:3.10

Makefile

@@ -10,13 +10,12 @@ build:
 test:
 	go test -v -race ./...
 
-run:
-	go run cmd/appmesh-gateway/*.go kubernetes --kubeconfig=$$HOME/.kube/config \
-		--port-name=http
+go-fmt:
+	gofmt -l pkg/* | grep ".*\.go"; if [ "$$?" = "0" ]; then exit 1; fi;
 
-appmesh:
-	go run cmd/appmesh-gateway/*.go appmesh --kubeconfig=$$HOME/.kube/config \
-		--gateway-mesh=appmesh --gateway-name=gateway --gateway-namespace=appmesh-gateway
+run:
+	go run cmd/appmesh-gateway/*.go --kubeconfig=$$HOME/.kube/config -v=4 \
+	--gateway-mesh=appmesh --gateway-name=gateway --gateway-namespace=appmesh-gateway
 
 envoy:
 	envoy -c envoy.yaml -l info

README.md

@@ -1,5 +1,5 @@
 # appmesh-gateway
-[![CI](https://github.com/stefanprodan/appmesh-gateway/workflows/CI/badge.svg)](https://github.com/stefanprodan/appmesh-gateway/actions)
+[![CI](https://github.com/stefanprodan/appmesh-gateway/workflows/build/badge.svg)](https://github.com/stefanprodan/appmesh-gateway/actions)
 [![report](https://goreportcard.com/badge/github.com/stefanprodan/appmesh-gateway)](https://goreportcard.com/report/github.com/stefanprodan/appmesh-gateway)
 
 App Mesh Gateway is an edge load balancer that exposes applications outside the mesh.
@@ -32,12 +32,35 @@ The gateway registers/de-registers virtual services automatically as they come a
 
 ### Install
 
+Requirements:
+* App Mesh CRDs, controller and inject [installed](https://github.com/aws/eks-charts#app-mesh)
+* A mesh called `appmesh`
+
 Install the API Gateway as NLB in `appmesh-gateway` namespace:
 
 ```sh
 kubectl apply -k github.com/stefanprodan/appmesh-gateway//kustomize/appmesh-gateway
 ```
 
+Wait for the deployment rollout to finish:
+
+```sh
+kubectl -n appmesh-gateway rollout status deploy/appmesh-gateway
+```
+
+When the gateway starts it will create a virtual node. You can verify the install with:
+
+```text
+watch kubectl -n appmesh-gateway describe virtualnode appmesh-gateway
+
+Status:
+  Conditions:
+    Status:                True
+    Type:                  VirtualNodeActive
+```
+
+### Example
+
 Deploy podinfo in the `test` namespace:
 
 ```sh
@@ -61,3 +84,12 @@ Access podinfo on its custom domain:
 ```sh
 curl -vH 'Host: podinfo.internal' localhost:8080
 ```
+
+Access podinfo using the gateway NLB address:
+
+```sh
+URL="http://$(kubectl -n appmesh-gateway get svc/appmesh-gateway -ojson | \
+jq -r ".status.loadBalancer.ingress[].hostname")"
+
+curl -vH 'Host: podinfo.internal' $URL
+```

cmd/appmesh-gateway/appmesh.go

@@ -1,22 +1,37 @@
 package main
 
 import (
+	"context"
+	goflag "flag"
 	"fmt"
 	"os"
 	"strings"
 
 	"github.com/spf13/cobra"
+	flag "github.com/spf13/pflag"
+	"k8s.io/client-go/dynamic"
+	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
+	"k8s.io/client-go/tools/clientcmd"
+	"k8s.io/klog"
+
+	"github.com/stefanprodan/appmesh-gateway/pkg/discovery"
+	"github.com/stefanprodan/appmesh-gateway/pkg/envoy"
+	"github.com/stefanprodan/appmesh-gateway/pkg/server"
+	"github.com/stefanprodan/appmesh-gateway/pkg/signals"
 )
 
 const VERSION = "0.3.0"
 
 var (
-	masterURL  string
-	kubeConfig string
-	port       int
-	namespace  string
-	ads        bool
-	optIn      bool
+	masterURL        string
+	kubeConfig       string
+	port             int
+	namespace        string
+	ads              bool
+	optIn            bool
+	gatewayMesh      string
+	gatewayName      string
+	gatewayNamespace string
 )
 
 func init() {
@@ -27,19 +42,75 @@ func init() {
 	pf.BoolVarP(&ads, "ads", "a", true, "ADS flag forces all Envoy resources to be explicitly named in the request.")
 	pf.StringVarP(&namespace, "namespace", "n", "", "Namespace to watch for Kubernetes objects, a blank value means all namespaces.")
 	pf.BoolVarP(&optIn, "opt-in", "", false, "When enabled only services with the 'expose' annotation will be discoverable.")
-
+	pf.StringVarP(&gatewayMesh, "gateway-mesh", "", "", "App Mesh mesh that this gateway belongs to.")
+	cobra.MarkFlagRequired(pf, "gateway-mesh")
+	pf.StringVarP(&gatewayName, "gateway-name", "", "", "Gateway Kubernetes service name.")
+	cobra.MarkFlagRequired(pf, "gateway-name")
+	pf.StringVarP(&gatewayNamespace, "gateway-namespace", "", "", "Gateway Kubernetes namespace.")
+	cobra.MarkFlagRequired(pf, "gateway-namespace")
 }
 
 var rootCmd = &cobra.Command{
-	Use:     "kxds",
+	Use:     "appmesh-gateway",
+	Long:    `appmesh-gateway is responsible for exposing services outside the mesh.`,
 	Version: VERSION,
+	RunE:    run,
 }
 
 func main() {
+	flag.CommandLine.Parse([]string{})
+	pf := rootCmd.PersistentFlags()
+	addKlogFlags(pf)
+
 	rootCmd.SetArgs(os.Args[1:])
 	if err := rootCmd.Execute(); err != nil {
 		e := err.Error()
 		fmt.Println(strings.ToUpper(e[:1]) + e[1:])
 		os.Exit(1)
 	}
 }
+
+func run(cmd *cobra.Command, args []string) error {
+	cfg, err := clientcmd.BuildConfigFromFlags(masterURL, kubeConfig)
+	if err != nil {
+		klog.Fatalf("error building kubeconfig: %v", err)
+	}
+
+	client, err := dynamic.NewForConfig(cfg)
+	if err != nil {
+		klog.Fatalf("error building kubernetes client: %v", err)
+	}
+
+	stopCh := signals.SetupSignalHandler()
+	ctx := context.Background()
+	cache := envoy.NewCache(ads)
+	snapshot := envoy.NewSnapshot(cache)
+
+	klog.Infof("starting xDS server on port %d", port)
+	srv := server.NewServer(port, cache)
+	go srv.Serve(ctx)
+
+	klog.Info("waiting for Envoy to connect to the xDS server")
+	srv.Report()
+
+	klog.Info("starting App Mesh discovery workers")
+	vsManager := discovery.NewVirtualServiceManager(client, optIn)
+	vnManager := discovery.NewVirtualNodeManager(client, gatewayMesh, gatewayName, gatewayNamespace)
+	kd := discovery.NewController(client, namespace, snapshot, vsManager, vnManager)
+	kd.Run(2, stopCh)
+
+	return nil
+}
+
+func addKlogFlags(fs *flag.FlagSet) {
+	local := goflag.NewFlagSet(os.Args[0], goflag.ExitOnError)
+	klog.InitFlags(local)
+	local.VisitAll(func(fl *goflag.Flag) {
+		fl.Name = normalizeFlag(fl.Name)
+		fs.AddGoFlag(fl)
+	})
+}
+
+func normalizeFlag(s string) string {
+	return strings.Replace(s, "_", "-", -1)
+}