From f09c5a60f17123fff5f08f17f95f45a6fac73c73 Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Sat, 2 Mar 2019 14:26:17 +0200
Subject: [PATCH] Add Envoy headers to e2e tests

---
 artifacts/canaries/canary.yaml | 12 ++++++++----
 docs/gitbook/how-it-works.md   |  3 +++
 test/e2e-tests.sh              |  4 ++++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/artifacts/canaries/canary.yaml b/artifacts/canaries/canary.yaml
index 74206c3c..28d5f299 100644
--- a/artifacts/canaries/canary.yaml
+++ b/artifacts/canaries/canary.yaml
@@ -26,15 +26,19 @@ spec:
     # Istio virtual service host names (optional)
     hosts:
     - app.istio.weavedx.com
-    # Istio virtual service HTTP match conditions (optional)
+    # HTTP match conditions (optional)
     match:
       - uri:
           prefix: /
-    # Istio virtual service HTTP rewrite (optional)
+    # HTTP rewrite (optional)
     rewrite:
       uri: /
-  # for emergency cases when you want to ship changes
-  # in production without analysing the canary
+    # Envoy timeout and retry policy (optional)
+    appendHeaders:
+      x-envoy-upstream-rq-timeout-ms: "15000"
+      x-envoy-max-retries: "10"
+      x-envoy-retry-on: "gateway-error,connect-failure,refused-stream"
+  # promote the canary without analysing it (default false)
   skipAnalysis: false
   canaryAnalysis:
     # schedule interval (default 60s)
diff --git a/docs/gitbook/how-it-works.md b/docs/gitbook/how-it-works.md
index 8952b2d0..38a77f21 100644
--- a/docs/gitbook/how-it-works.md
+++ b/docs/gitbook/how-it-works.md
@@ -134,6 +134,9 @@ metadata:
     match:
       - uri:
           prefix: /
+    # HTTP rewrite (optional)
+    rewrite:
+      uri: /
     # Envoy timeout and retry policy (optional)
     appendHeaders:
       x-envoy-upstream-rq-timeout-ms: "15000"
diff --git a/test/e2e-tests.sh b/test/e2e-tests.sh
index 39f306dd..f2ccce58 100755
--- a/test/e2e-tests.sh
+++ b/test/e2e-tests.sh
@@ -33,6 +33,10 @@ spec:
   progressDeadlineSeconds: 60
   service:
     port: 9898
+    appendHeaders:
+      x-envoy-upstream-rq-timeout-ms: "15000"
+      x-envoy-max-retries: "10"
+      x-envoy-retry-on: "gateway-error,connect-failure,refused-stream"
   canaryAnalysis:
     interval: 15s
     threshold: 15