From 919dafa5671f65b251828f49dd096747a1aae5ff Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Wed, 24 Jul 2019 12:02:44 +0300 Subject: [PATCH] Add gate halt and approve endpoints --- artifacts/loadtester/deployment.yaml | 2 +- charts/loadtester/Chart.yaml | 4 ++-- charts/loadtester/values.yaml | 2 +- cmd/loadtester/main.go | 2 +- kustomize/tester/deployment.yaml | 2 +- pkg/loadtester/server.go | 8 ++++++++ 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/artifacts/loadtester/deployment.yaml b/artifacts/loadtester/deployment.yaml index c5f1004d..33615515 100644 --- a/artifacts/loadtester/deployment.yaml +++ b/artifacts/loadtester/deployment.yaml @@ -17,7 +17,7 @@ spec: spec: containers: - name: loadtester - image: weaveworks/flagger-loadtester:0.5.0 + image: weaveworks/flagger-loadtester:0.6.0 imagePullPolicy: IfNotPresent ports: - name: http diff --git a/charts/loadtester/Chart.yaml b/charts/loadtester/Chart.yaml index 53f5c232..3e651a04 100644 --- a/charts/loadtester/Chart.yaml +++ b/charts/loadtester/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: loadtester -version: 0.5.0 -appVersion: 0.5.0 +version: 0.6.0 +appVersion: 0.6.0 kubeVersion: ">=1.11.0-0" engine: gotpl description: Flagger's load testing services based on rakyll/hey and bojand/ghz that generates traffic during canary analysis when configured as a webhook. diff --git a/charts/loadtester/values.yaml b/charts/loadtester/values.yaml index 486ab92b..3a03a5cc 100644 --- a/charts/loadtester/values.yaml +++ b/charts/loadtester/values.yaml @@ -2,7 +2,7 @@ replicaCount: 1 image: repository: weaveworks/flagger-loadtester - tag: 0.4.0 + tag: 0.6.0 pullPolicy: IfNotPresent logLevel: info diff --git a/cmd/loadtester/main.go b/cmd/loadtester/main.go index a042f3b7..4e29ffa4 100644 --- a/cmd/loadtester/main.go +++ b/cmd/loadtester/main.go @@ -10,7 +10,7 @@ import ( "time" ) -var VERSION = "0.5.0" +var VERSION = "0.6.0" var ( logLevel string port string diff --git a/kustomize/tester/deployment.yaml b/kustomize/tester/deployment.yaml index c5f1004d..33615515 100644 --- a/kustomize/tester/deployment.yaml +++ b/kustomize/tester/deployment.yaml @@ -17,7 +17,7 @@ spec: spec: containers: - name: loadtester - image: weaveworks/flagger-loadtester:0.5.0 + image: weaveworks/flagger-loadtester:0.6.0 imagePullPolicy: IfNotPresent ports: - name: http diff --git a/pkg/loadtester/server.go b/pkg/loadtester/server.go index c8ce4c1d..ca907756 100644 --- a/pkg/loadtester/server.go +++ b/pkg/loadtester/server.go @@ -21,6 +21,14 @@ func ListenAndServe(port string, timeout time.Duration, logger *zap.SugaredLogge w.WriteHeader(http.StatusOK) w.Write([]byte("OK")) }) + mux.HandleFunc("/gate/approve", func(w http.ResponseWriter, r *http.Request) { + w.WriteHeader(http.StatusOK) + w.Write([]byte("OK")) + }) + mux.HandleFunc("/gate/halt", func(w http.ResponseWriter, r *http.Request) { + w.WriteHeader(http.StatusForbidden) + w.Write([]byte("Forbidden")) + }) mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { body, err := ioutil.ReadAll(r.Body) if err != nil {