fluxcd · stefanprodan · Jun 12, 2019 · Jun 7, 2019 · Jun 7, 2019 · Jun 7, 2019
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 [![release](https://img.shields.io/github/release/weaveworks/flagger/all.svg)](https://github.com/weaveworks/flagger/releases)
 
 Flagger is a Kubernetes operator that automates the promotion of canary deployments
-using Istio, App Mesh or NGINX routing for traffic shifting and Prometheus metrics for canary analysis.
+using Istio, App Mesh, NGINX or Gloo routing for traffic shifting and Prometheus metrics for canary analysis.
 The canary analysis can be extended with webhooks for running acceptance tests,
 load tests or any other custom validation.
 
@@ -149,16 +149,27 @@ For more details on how the canary analysis and promotion works please [read the
 
 ## Features
 
-| Feature                                      | Istio              | App Mesh           | SuperGloo          | NGINX Ingress      |
-| -------------------------------------------- | ------------------ | ------------------ |------------------  |------------------  |
-| Canary deployments (weighted traffic)        | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
-| A/B testing (headers and cookies filters)    | :heavy_check_mark: | :heavy_minus_sign: | :heavy_minus_sign: | :heavy_check_mark: |
-| Load testing                                 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
-| Webhooks (custom acceptance tests)           | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
-| Request success rate check (L7 metric)       | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
-| Request duration check (L7 metric)           | :heavy_check_mark: | :heavy_minus_sign: | :heavy_check_mark: | :heavy_check_mark: |
-| Custom promql checks                         | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
-| Ingress gateway (CORS, retries and timeouts) | :heavy_check_mark: | :heavy_minus_sign: | :heavy_check_mark: | :heavy_check_mark: |
+| Service Mesh Feature                         | Istio              | App Mesh           | SuperGloo          |
+| -------------------------------------------- | ------------------ | ------------------ |------------------  |
+| Canary deployments (weighted traffic)        | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
+| A/B testing (headers and cookies filters)    | :heavy_check_mark: | :heavy_minus_sign: | :heavy_minus_sign: |
+| Load testing                                 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
+| Webhooks (acceptance testing)                | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
+| Request success rate check (L7 metric)       | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
+| Request duration check (L7 metric)           | :heavy_check_mark: | :heavy_minus_sign: | :heavy_check_mark: |
+| Custom promql checks                         | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
+| Ingress gateway (CORS, retries and timeouts) | :heavy_check_mark: | :heavy_minus_sign: | :heavy_check_mark: |
+
+| Ingress Controller Feature                   | NGINX              | Gloo               |
+| -------------------------------------------- | ------------------ | ------------------ |
+| Canary deployments (weighted traffic)        | :heavy_check_mark: | :heavy_check_mark: |
+| A/B testing (headers and cookies filters)    | :heavy_check_mark: | :heavy_minus_sign: |
+| Load testing                                 | :heavy_check_mark: | :heavy_check_mark: |
+| Webhooks (acceptance testing)                | :heavy_check_mark: | :heavy_check_mark: |
+| Request success rate check (L7 metric)       | :heavy_minus_sign: | :heavy_check_mark: |
+| Request duration check (L7 metric)           | :heavy_minus_sign: | :heavy_check_mark: |
+| Custom promql checks                         | :heavy_check_mark: | :heavy_check_mark: |
+
 
 ## Roadmap
 

diff --git a/artifacts/canaries/canary.yaml b/artifacts/canaries/canary.yaml
@@ -27,20 +27,19 @@ spec:
     # Istio virtual service host names (optional)
     hosts:
     - app.istio.weavedx.com
+    # Istio traffic policy (optional)
+    trafficPolicy:
+      loadBalancer:
+        simple: LEAST_CONN
     # HTTP match conditions (optional)
     match:
       - uri:
           prefix: /
     # HTTP rewrite (optional)
     rewrite:
       uri: /
-    # Envoy timeout and retry policy (optional)
-    headers:
-      request:
-        add:
-          x-envoy-upstream-rq-timeout-ms: "15000"
-          x-envoy-max-retries: "10"
-          x-envoy-retry-on: "gateway-error,connect-failure,refused-stream"
+    # HTTP timeout (optional)
+    timeout: 30s
   # promote the canary without analysing it (default false)
   skipAnalysis: false
   canaryAnalysis:
@@ -54,7 +53,7 @@ spec:
     # canary increment step
     # percentage (0-100)
     stepWeight: 5
-    # Istio Prometheus checks
+    # Prometheus checks
     metrics:
     - name: request-success-rate
       # minimum req success rate (non 5xx responses)

diff --git a/artifacts/flagger/account.yaml b/artifacts/flagger/account.yaml
@@ -48,6 +48,8 @@ rules:
     resources:
       - virtualservices
       - virtualservices/status
+      - destinationrules
+      - destinationrules/status
     verbs: ["*"]
   - apiGroups:
       - appmesh.k8s.aws

diff --git a/artifacts/workloads/canary-destination.yaml b/artifacts/workloads/canary-destination.yaml
@@ -0,0 +1,13 @@
+apiVersion: networking.istio.io/v1alpha3
+kind: DestinationRule
+metadata:
+  name: podinfo-canary
+  namespace: test
+spec:
+  host: podinfo-canary
+  trafficPolicy:
+    loadBalancer:
+      consistentHash:
+        httpCookie:
+          name: user
+          ttl: 0s
diff --git a/artifacts/workloads/canary-hpa.yaml b/artifacts/workloads/canary-hpa.yaml
@@ -9,7 +9,7 @@ spec:
     kind: Deployment
     name: podinfo
   minReplicas: 2
-  maxReplicas: 3
+  maxReplicas: 2
   metrics:
   - type: Resource
     resource:

diff --git a/artifacts/workloads/primary-destination.yaml b/artifacts/workloads/primary-destination.yaml
@@ -0,0 +1,13 @@
+apiVersion: networking.istio.io/v1alpha3
+kind: DestinationRule
+metadata:
+  name: podinfo-primary
+  namespace: test
+spec:
+  host: podinfo-primary
+  trafficPolicy:
+    loadBalancer:
+      consistentHash:
+        httpCookie:
+          name: user
+          ttl: 0s
diff --git a/artifacts/workloads/primary-hpa.yaml b/artifacts/workloads/primary-hpa.yaml
@@ -9,7 +9,7 @@ spec:
     kind: Deployment
     name: podinfo-primary
   minReplicas: 2
-  maxReplicas: 4
+  maxReplicas: 2
   metrics:
   - type: Resource
     resource:

diff --git a/artifacts/workloads/virtual-service.yaml b/artifacts/workloads/virtual-service.yaml
@@ -7,24 +7,17 @@ metadata:
     app: podinfo
 spec:
   gateways:
-  - public-gateway.istio-system.svc.cluster.local
   - mesh
+  - public-gateway.istio-system.svc.cluster.local
   hosts:
-  - podinfo.istio.weavedx.com
   - podinfo
+  - app.istio.weavedx.com
   http:
   - route:
     - destination:
         host: podinfo-primary
-        port:
-          number: 9898
-      weight: 100
+      weight: 50
     - destination:
-        host: podinfo
-        port:
-          number: 9898
-      weight: 0
-    timeout: 10s
-    retries:
-      attempts: 3
-      perTryTimeout: 2s
+        host: podinfo-canary
+      weight: 50
+    timeout: 5s
diff --git a/charts/flagger/templates/rbac.yaml b/charts/flagger/templates/rbac.yaml
@@ -44,6 +44,8 @@ rules:
     resources:
       - virtualservices
       - virtualservices/status
+      - destinationrules
+      - destinationrules/status
     verbs: ["*"]
   - apiGroups:
       - appmesh.k8s.aws

diff --git a/docs/gitbook/how-it-works.md b/docs/gitbook/how-it-works.md
@@ -103,9 +103,9 @@ the Istio Virtual Service. The container port from the target deployment should
 
 ### Istio routing
 
-Flagger creates an Istio Virtual Service based on the Canary service spec. The service configuration lets you expose 
-an app inside or outside the mesh.
-You can also define HTTP match conditions, URI rewrite rules, CORS policies, timeout and retries.
+Flagger creates an Istio Virtual Service and Destination Rules based on the Canary service spec. 
+The service configuration lets you expose an app inside or outside the mesh.
+You can also define traffic policies, HTTP match conditions, URI rewrite rules, CORS policies, timeout and retries.
 
 The following spec exposes the `frontend` workload inside the mesh on `frontend.test.svc.cluster.local:9898` 
 and outside the mesh on `frontend.example.com`. You'll have to specify an Istio ingress gateway for external hosts.
@@ -129,6 +129,10 @@ spec:
     # Istio virtual service host names (optional)
     hosts:
     - frontend.example.com
+    # Istio traffic policy (optional)
+    trafficPolicy:
+      loadBalancer:
+        simple: LEAST_CONN
     # HTTP match conditions (optional)
     match:
       - uri:
@@ -198,18 +202,40 @@ spec:
     route:
     - destination:
         host: podinfo-primary
-        port:
-          number: 9898
       weight: 100
     - destination:
         host: podinfo-canary
-        port:
-          number: 9898
       weight: 0
 ```
 
-Flagger keeps in sync the virtual service with the canary service spec. Any direct modification to the virtual 
-service spec will be overwritten.
+For each destination in the virtual service a rule is generated:
+
+```yaml
+apiVersion: networking.istio.io/v1alpha3
+kind: DestinationRule
+metadata:
+  name: frontend-primary
+  namespace: test
+spec:
+  host: frontend-primary
+  trafficPolicy:
+    loadBalancer:
+      simple: LEAST_CONN
+---
+apiVersion: networking.istio.io/v1alpha3
+kind: DestinationRule
+metadata:
+  name: frontend-canary
+  namespace: test
+spec:
+  host: frontend-canary
+  trafficPolicy:
+    loadBalancer:
+      simple: LEAST_CONN
+```
+
+Flagger keeps in sync the virtual service and destination rules with the canary service spec.
+Any direct modification to the virtual service spec will be overwritten.
 
 To expose a workload inside the mesh on `http://backend.test.svc.cluster.local:9898`,
 the service spec can contain only the container port:

diff --git a/docs/gitbook/usage/ab-testing.md b/docs/gitbook/usage/ab-testing.md
@@ -120,6 +120,8 @@ horizontalpodautoscaler.autoscaling/abtest-primary
 service/abtest
 service/abtest-canary
 service/abtest-primary
+destinationrule.networking.istio.io/abtest-canary
+destinationrule.networking.istio.io/abtest-primary
 virtualservice.networking.istio.io/abtest
 ```
 

diff --git a/docs/gitbook/usage/progressive-delivery.md b/docs/gitbook/usage/progressive-delivery.md
@@ -108,6 +108,8 @@ horizontalpodautoscaler.autoscaling/podinfo-primary
 service/podinfo
 service/podinfo-canary
 service/podinfo-primary
+destinationrule.networking.istio.io/podinfo-canary
+destinationrule.networking.istio.io/podinfo-primary
 virtualservice.networking.istio.io/podinfo
 ```
 

diff --git a/pkg/apis/flagger/v1alpha3/types.go b/pkg/apis/flagger/v1alpha3/types.go
@@ -115,17 +115,18 @@ type CanaryStatus struct {
 // CanaryService is used to create ClusterIP services
 // and Istio Virtual Service
 type CanaryService struct {
-	Port       int32                            `json:"port"`
-	PortName   string                           `json:"portName,omitempty"`
-	Match      []istiov1alpha3.HTTPMatchRequest `json:"match,omitempty"`
-	Rewrite    *istiov1alpha3.HTTPRewrite       `json:"rewrite,omitempty"`
-	Timeout    string                           `json:"timeout,omitempty"`
-	Retries    *istiov1alpha3.HTTPRetry         `json:"retries,omitempty"`
-	Headers    *istiov1alpha3.Headers           `json:"headers,omitempty"`
-	CorsPolicy *istiov1alpha3.CorsPolicy        `json:"corsPolicy,omitempty"`
-	//Istio
-	Gateways []string `json:"gateways,omitempty"`
-	Hosts    []string `json:"hosts,omitempty"`
+	Port     int32  `json:"port"`
+	PortName string `json:"portName,omitempty"`
+	Timeout  string `json:"timeout,omitempty"`
+	// Istio
+	Gateways      []string                         `json:"gateways,omitempty"`
+	Hosts         []string                         `json:"hosts,omitempty"`
+	TrafficPolicy *istiov1alpha3.TrafficPolicy     `json:"trafficPolicy,omitempty"`
+	Match         []istiov1alpha3.HTTPMatchRequest `json:"match,omitempty"`
+	Rewrite       *istiov1alpha3.HTTPRewrite       `json:"rewrite,omitempty"`
+	Retries       *istiov1alpha3.HTTPRetry         `json:"retries,omitempty"`
+	Headers       *istiov1alpha3.Headers           `json:"headers,omitempty"`
+	CorsPolicy    *istiov1alpha3.CorsPolicy        `json:"corsPolicy,omitempty"`
 	// App Mesh
 	MeshName string   `json:"meshName,omitempty"`
 	Backends []string `json:"backends,omitempty"`

diff --git a/pkg/apis/flagger/v1alpha3/zz_generated.deepcopy.go b/pkg/apis/flagger/v1alpha3/zz_generated.deepcopy.go