Merge pull request #152 from weaveworks/release-v0.11.1

Prepare release v0.11.1
fluxcd · Apr 18, 2019 · c7539f6 · c7539f6
2 parents 3492b07 + 8cebc0a
commit c7539f6
Show file tree

Hide file tree

Showing 21 changed files with 108 additions and 35 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 All notable changes to this project are documented in this file.
 
+## 0.11.1 (2019-04-18) 
+
+Move Flagger and the load tester container images to Docker Hub
+
+#### Features
+
+- Add Bash Automated Testing System support to Flagger tester for running acceptance tests as pre-rollout hooks 
+
 ## 0.11.0 (2019-04-17) 
 
 Adds pre/post rollout [webhooks](https://docs.flagger.app/how-it-works#webhooks)

diff --git a/README.md b/README.md
@@ -118,13 +118,13 @@ spec:
     stepWeight: 5
     # Istio Prometheus checks
     metrics:
-    # builtin Istio checks
-    - name: istio_requests_total
+    # builtin checks
+    - name: request-success-rate
       # minimum req success rate (non 5xx responses)
       # percentage (0-100)
       threshold: 99
       interval: 1m
-    - name: istio_request_duration_seconds_bucket
+    - name: request-duration
       # maximum req duration P99
       # milliseconds
       threshold: 500

diff --git a/artifacts/ab-testing/canary.yaml b/artifacts/ab-testing/canary.yaml
@@ -43,12 +43,12 @@ spec:
           cookie:
             regex: "^(.*?;)?(type=insider)(;.*)?$"
     metrics:
-    - name: istio_requests_total
+    - name: request-success-rate
       # minimum req success rate (non 5xx responses)
       # percentage (0-100)
       threshold: 99
       interval: 1m
-    - name: istio_request_duration_seconds_bucket
+    - name: request-duration
       # maximum req duration P99
       # milliseconds
       threshold: 500

diff --git a/artifacts/appmesh/canary.yaml b/artifacts/appmesh/canary.yaml
@@ -36,7 +36,7 @@ spec:
     stepWeight: 5
     # App Mesh Prometheus checks
     metrics:
-    - name: envoy_cluster_upstream_rq
+    - name: request-success-rate
       # minimum req success rate (non 5xx responses)
       # percentage (0-100)
       threshold: 99

diff --git a/artifacts/canaries/canary.yaml b/artifacts/canaries/canary.yaml
@@ -56,12 +56,12 @@ spec:
     stepWeight: 5
     # Istio Prometheus checks
     metrics:
-    - name: istio_requests_total
+    - name: request-success-rate
       # minimum req success rate (non 5xx responses)
       # percentage (0-100)
       threshold: 99
       interval: 1m
-    - name: istio_request_duration_seconds_bucket
+    - name: request-duration
       # maximum req duration P99
       # milliseconds
       threshold: 500

diff --git a/artifacts/configs/canary.yaml b/artifacts/configs/canary.yaml
@@ -40,12 +40,12 @@ spec:
     stepWeight: 5
     # Istio Prometheus checks
     metrics:
-    - name: istio_requests_total
+    - name: request-success-rate
       # minimum req success rate (non 5xx responses)
       # percentage (0-100)
       threshold: 99
       interval: 1m
-    - name: istio_request_duration_seconds_bucket
+    - name: request-duration
       # maximum req duration P99
       # milliseconds
       threshold: 500

diff --git a/artifacts/flagger/deployment.yaml b/artifacts/flagger/deployment.yaml
@@ -22,7 +22,7 @@ spec:
       serviceAccountName: flagger
       containers:
       - name: flagger
-        image: weaveworks/flagger:0.11.0
+        image: weaveworks/flagger:0.11.1
         imagePullPolicy: IfNotPresent
         ports:
         - name: http

diff --git a/artifacts/loadtester/config.yaml b/artifacts/loadtester/config.yaml
@@ -0,0 +1,19 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: flagger-loadtester-bats
+data:
+  tests: |
+    #!/usr/bin/env bats
+
+    @test "check message" {
+      curl -sS http://${URL} | jq -r .message | {
+        run cut -d $' ' -f1
+        [ $output = "greetings" ]
+      }
+    }
+
+    @test "check headers" {
+      curl -sS http://${URL}/headers | grep X-Request-Id
+    }
diff --git a/artifacts/loadtester/deployment.yaml b/artifacts/loadtester/deployment.yaml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: loadtester
-          image: weaveworks/flagger-loadtester:0.2.0
+          image: weaveworks/flagger-loadtester:0.3.0
           imagePullPolicy: IfNotPresent
           ports:
             - name: http
@@ -57,3 +57,11 @@ spec:
           securityContext:
             readOnlyRootFilesystem: true
             runAsUser: 10001
+          volumeMounts:
+            - name: tests
+              mountPath: /bats
+              readOnly: true
+      volumes:
+        - name: tests
+          configMap:
+            name: flagger-loadtester-bats
diff --git a/charts/flagger/Chart.yaml b/charts/flagger/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: flagger
-version: 0.11.0
-appVersion: 0.11.0
+version: 0.11.1
+appVersion: 0.11.1
 kubeVersion: ">=1.11.0-0"
 engine: gotpl
 description: Flagger is a Kubernetes operator that automates the promotion of canary deployments using Istio routing for traffic shifting and Prometheus metrics for canary analysis.

diff --git a/charts/flagger/values.yaml b/charts/flagger/values.yaml
@@ -2,7 +2,7 @@
 
 image:
   repository: weaveworks/flagger
-  tag: 0.11.0
+  tag: 0.11.1
   pullPolicy: IfNotPresent
 
 metricsServer: "http://prometheus:9090"

diff --git a/charts/loadtester/Chart.yaml b/charts/loadtester/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: loadtester
-version: 0.2.0
-appVersion: 0.2.0
+version: 0.3.0
+appVersion: 0.3.0
 kubeVersion: ">=1.11.0-0"
 engine: gotpl
 description: Flagger's load testing services based on rakyll/hey that generates traffic during canary analysis when configured as a webhook.

diff --git a/charts/loadtester/values.yaml b/charts/loadtester/values.yaml
@@ -2,7 +2,7 @@ replicaCount: 1
 
 image:
   repository: quay.io/weaveworks/flagger-loadtester
-  tag: 0.2.0
+  tag: 0.3.0
   pullPolicy: IfNotPresent
 
 logLevel: info

diff --git a/charts/podinfo/Chart.yaml b/charts/podinfo/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-version: 2.0.0
+version: 2.0.1
 appVersion: 1.4.0
 name: podinfo
 engine: gotpl

diff --git a/charts/podinfo/templates/canary.yaml b/charts/podinfo/templates/canary.yaml
@@ -32,10 +32,10 @@ spec:
     maxWeight: {{ .Values.canary.analysis.maxWeight }}
     stepWeight: {{ .Values.canary.analysis.stepWeight }}
     metrics:
-    - name: istio_requests_total
+    - name: request-success-rate
       threshold: {{ .Values.canary.thresholds.successRate }}
       interval: 1m
-    - name: istio_request_duration_seconds_bucket
+    - name: request-duration
       threshold: {{ .Values.canary.thresholds.latency }}
       interval: 1m
     {{- if .Values.canary.loadtest.enabled }}

diff --git a/cmd/loadtester/main.go b/cmd/loadtester/main.go
@@ -10,7 +10,7 @@ import (
 	"time"
 )
 
-var VERSION = "0.2.0"
+var VERSION = "0.3.0"
 var (
 	logLevel          string
 	port              string

diff --git a/docs/gitbook/how-it-works.md b/docs/gitbook/how-it-works.md
@@ -56,14 +56,14 @@ spec:
     # canary increment step
     # percentage (0-100)
     stepWeight: 5
-    # Istio Prometheus checks
+    # Prometheus checks
     metrics:
-    - name: istio_requests_total
+    - name: request-success-rate
       # minimum req success rate (non 5xx responses)
       # percentage (0-100)
       threshold: 99
       interval: 1m
-    - name: istio_request_duration_seconds_bucket
+    - name: request-duration
       # maximum req duration P99
       # milliseconds
       threshold: 500
@@ -398,14 +398,14 @@ Spec:
 ```yaml
   canaryAnalysis:
     metrics:
-    - name: istio_requests_total
+    - name: request-success-rate
       # minimum req success rate (non 5xx responses)
       # percentage (0-100)
       threshold: 99
       interval: 1m
 ```
 
-Query:
+Istio query:
 
 ```javascript
 sum(
@@ -430,21 +430,44 @@ sum(
 )
 ```
 
+App Mesh query:
+
+```javascript
+sum(
+    rate(
+        envoy_cluster_upstream_rq{
+          kubernetes_namespace="$namespace",
+          kubernetes_pod_name=~"$workload",
+          response_code!~"5.*"
+        }[$interval]
+    )
+) 
+/ 
+sum(
+    rate(
+        envoy_cluster_upstream_rq{
+          kubernetes_namespace="$namespace",
+          kubernetes_pod_name=~"$workload"
+        }[$interval]
+    )
+)
+```
+
 **HTTP requests milliseconds duration P99**
 
 Spec:
 
 ```yaml
   canaryAnalysis:
     metrics:
-    - name: istio_request_duration_seconds_bucket
+    - name: request-duration
       # maximum req duration P99
       # milliseconds
       threshold: 500
       interval: 1m
 ```
 
-Query:
+Istio query:
 
 ```javascript
 histogram_quantile(0.99, 
@@ -460,6 +483,21 @@ histogram_quantile(0.99,
 )
 ```
 
+App Mesh query:
+
+```javascript
+histogram_quantile(0.99, 
+  sum(
+    irate(
+      envoy_cluster_upstream_rq_time_bucket{
+        kubernetes_pod_name=~"$workload",
+        kubernetes_namespace=~"$namespace"
+      }[$interval]
+    )
+  ) by (le)
+)
+```
+
 > **Note** that the metric interval should be lower or equal to the control loop interval.
 
 ### Custom Metrics

diff --git a/docs/gitbook/usage/ab-testing.md b/docs/gitbook/usage/ab-testing.md
@@ -80,12 +80,12 @@ spec:
           cookie:
             regex: "^(.*?;)?(type=insider)(;.*)?$"
     metrics:
-    - name: istio_requests_total
+    - name: request-success-rate
       # minimum req success rate (non 5xx responses)
       # percentage (0-100)
       threshold: 99
       interval: 1m
-    - name: istio_request_duration_seconds_bucket
+    - name: request-duration
       # maximum req duration P99
       # milliseconds
       threshold: 500

diff --git a/docs/gitbook/usage/appmesh-progressive-delivery.md b/docs/gitbook/usage/appmesh-progressive-delivery.md
@@ -85,7 +85,7 @@ spec:
     stepWeight: 5
     # App Mesh Prometheus checks
     metrics:
-    - name: envoy_cluster_upstream_rq
+    - name: request-success-rate
       # minimum req success rate (non 5xx responses)
       # percentage (0-100)
       threshold: 99

diff --git a/docs/gitbook/usage/progressive-delivery.md b/docs/gitbook/usage/progressive-delivery.md
@@ -70,12 +70,12 @@ spec:
     # percentage (0-100)
     stepWeight: 10
     metrics:
-    - name: istio_requests_total
+    - name: request-success-rate
       # minimum req success rate (non 5xx responses)
       # percentage (0-100)
       threshold: 99
       interval: 1m
-    - name: istio_request_duration_seconds_bucket
+    - name: request-duration
       # maximum req duration P99
       # milliseconds
       threshold: 500

diff --git a/pkg/version/version.go b/pkg/version/version.go
@@ -1,4 +1,4 @@
 package version
 
-var VERSION = "0.11.0"
+var VERSION = "0.11.1"
 var REVISION = "unknown"