Merge pull request #68 from stefanprodan/fix-docs

Add Getting Help section to readme

CHANGELOG.md

@@ -8,8 +8,8 @@ Adds support for custom metric checks, HTTP timeouts and HTTP retries
 
 #### Features
 
-- Allow custom promql queries in the canary analysis spec [##60](https://github.com/stefanprodan/flagger/pull/#60)
-- Add HTTP timeout and retries to canary service spec [##62](https://github.com/stefanprodan/flagger/pull/#62)
+- Allow custom promql queries in the canary analysis spec [#60](https://github.com/stefanprodan/flagger/pull/60)
+- Add HTTP timeout and retries to canary service spec [#62](https://github.com/stefanprodan/flagger/pull/62)
 
 ## 0.6.0 (2019-02-25)
 

README.md

@@ -175,3 +175,16 @@ When submitting bug reports please include as much details as possible:
 * which Kubernetes/Istio version
 * what configuration (canary, virtual service and workloads definitions)
 * what happened (Flagger, Istio Pilot and Proxy logs)
+
+### Getting Help
+
+If you have any questions about Flagger and progressive delivery:
+
+* Read the Flagger [docs](https://docs.flagger.app).
+* Invite yourself to the [Weave community slack](https://slack.weave.works/) 
+  and join the [#flagger](https://weave-community.slack.com/messages/flagger/) channel.
+* Join the [Weave User Group](https://www.meetup.com/pro/Weave/) and get invited to online talks, 
+  hands-on training and meetups in your area.
+* File an [issue](https://github.com/stefanprodan/flagger/issues/new).
+
+Your feedback is always welcome!

artifacts/routing/match.yaml

@@ -8,13 +8,17 @@ spec:
   - public-gateway.istio-system.svc.cluster.local
   - mesh
   hosts:
-  - podinfo.iowa.weavedx.com
+  - app.istio.weavedx.com
   - podinfo
   http:
   - match:
     - headers:
         user-agent:
           regex: ^(?!.*Chrome)(?=.*\bSafari\b).*$
+      uri:
+        prefix: "/version/"
+    rewrite:
+      uri: /api/info
     route:
     - destination:
         host: podinfo-primary
@@ -26,7 +30,12 @@ spec:
         port:
           number: 9898
       weight: 100
-  - route:
+  - match:
+      - uri:
+          prefix: "/version/"
+    rewrite:
+      uri: /api/info
+    route:
     - destination:
         host: podinfo-primary
         port:

docs/gitbook/how-it-works.md

@@ -131,13 +131,19 @@ metadata:
     # Istio virtual service host names (optional)
     hosts:
     - frontend.example.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: /
+    # timeout for HTTP requests (optional)
+    timeout: 5s
+    # retry policy when a HTTP request fails (optional)
+    retries:
+      attempts: 3
+      perTryTimeout: 3s
 ```
 
 For the above spec Flagger will generate the following virtual service:
@@ -168,6 +174,10 @@ spec:
             prefix: /
       rewrite:
         uri: /
+      timeout: 5s
+      retries:
+        attempts: 3
+        perTryTimeout: 3s
       route:
         - destination:
             host: frontend-primary