Merge branch 'master' into feature/update-go

Gopkg.toml

@@ -20,21 +20,25 @@
 
 [[constraint]]
   name = "github.com/topfreegames/extensions"
-  version = "6.2.4"
+  version = "8.0.5"
 
 [[constraint]]
   name = "github.com/go-gorp/gorp"
   version = "2.1"
 
-[[constraint]]
-  name = "gopkg.in/olivere/elastic.v5"
-  version = "5.0.39"
-
-
 [[constraint]]
   name = "github.com/mailru/easyjson"
   branch = "master"
 
+[[override]]
+  name = "github.com/jrallison/go-workers"
+  source = "github.com/topfreegames/go-workers"
+  version = "1.0.0"
+
+[[override]]
+  name = "github.com/spf13/viper"
+  revision = "25b30aa063fc18e48662b86996252eabdcf2f0c7"
+
 [prune]
   go-tests = true
   unused-packages = true

Makefile

@@ -76,14 +76,14 @@ run-verbose:
 
 run:
 	@echo "Khan running at http://localhost:8888/"
-	@go run main.go start -q -c ./config/local.yaml
+	@go run main.go start -c ./config/local.yaml
 
 worker:
 	@echo "Khan Worker running at http://localhost:9999/"
 	@go run main.go worker -d -c ./config/local.yaml
 
 run-fast:
-	@go run main.go start -q --fast -c ./config/local.yaml
+	@go run main.go start --fast -c ./config/local.yaml
 
 build-docker:
 	@docker build -t khan .

README.md

@@ -71,3 +71,7 @@ Getting coverage data can be achieved with `make coverage`, while reading the ac
 Khan goes through some static analysis tools for go. To run them just use `make static`.
 
 Right now, gocyclo can't process the vendor folder, so we just ignore the exit code for it, while maintaining the output for anything not in the vendor folder.
+
+## Security
+
+If you have found a security vulnerability, please email security@tfgco.com

Sidecarfile

@@ -3,7 +3,30 @@ cmd:
   command:
   - /go/bin/agent-linux
   - --collector.host-port=jaeger-collector.jaeger.svc.cluster.local:14267
-  image: jaegertracing/jaeger-agent:1.1
+  image: jaegertracing/jaeger-agent:1.10
+  imagePullPolicy: IfNotPresent
+  ports:
+  - containerPort: 5775
+    protocol: UDP
+  - containerPort: 5778
+    protocol: TCP
+  - containerPort: 6831
+    protocol: UDP
+  - containerPort: 6832
+    protocol: UDP
+  resources:
+    limits:
+      cpu: 50m
+      memory: 50Mi
+    requests:
+      cpu: 25m
+      memory: 15Mi
+worker:
+- name: jaeger-agent
+  command:
+  - /go/bin/agent-linux
+  - --collector.host-port=jaeger-collector.jaeger.svc.cluster.local:14267
+  image: jaegertracing/jaeger-agent:1.10
   imagePullPolicy: IfNotPresent
   ports:
   - containerPort: 5775