Updated Flagger

Signed-off-by: Viktor Farcic <[email protected]>
jenkins-x-buildpacks · Mar 19, 2020 · ac2c378 · ac2c378
1 parent 5987226
commit ac2c378
Show file tree

Hide file tree

Showing 46 changed files with 690 additions and 69 deletions.
diff --git a/packs/C++/charts/templates/canary.yaml b/packs/C++/charts/templates/canary.yaml
@@ -35,12 +35,39 @@ spec:
     - name: request-success-rate
       threshold: {{ .Values.canary.canaryAnalysis.metrics.requestSuccessRate.threshold }}
       interval: {{ .Values.canary.canaryAnalysis.metrics.requestSuccessRate.interval }}
-    - name: request-duration
-      threshold: {{ .Values.canary.canaryAnalysis.metrics.requestDuration.threshold }}
+    - name: latency
+      templateRef:
+        name: latency
+      thresholdRange:
+        max: {{ .Values.canary.canaryAnalysis.metrics.requestDuration.threshold }}
       interval: {{ .Values.canary.canaryAnalysis.metrics.requestDuration.interval }}
 
 ---
 
+apiVersion: flagger.app/v1beta1
+kind: MetricTemplate
+metadata:
+  name: latency
+spec:
+  provider:
+    type: prometheus
+    address: http://prometheus.istio-system:9090
+  query: |
+    histogram_quantile(
+        0.99,
+        sum(
+            rate(
+                istio_request_duration_milliseconds_bucket{
+                    reporter="destination",
+                    destination_workload_namespace="{{ "{{" }} namespace {{ "}}" }}",
+                    destination_workload=~"{{ "{{" }} target {{ "}}" }}"
+                }[{{ "{{" }} interval {{ "}}" }}]
+            )
+        ) by (le)
+    )
+
+---
+
 apiVersion: networking.istio.io/v1alpha3
 kind: Gateway
 metadata:

diff --git a/packs/C++/charts/values.yaml b/packs/C++/charts/values.yaml
@@ -22,7 +22,7 @@ hpa:
   memoryTargetAverageUtilization: 80
 
 # Canary deployments
-# If enabled, Istio and Flagger need to be installed in the cluster
+# If enabled, Istio v1.5+ and Flagger need to be installed in the cluster
 canary:
   enabled: false
   progressDeadlineSeconds: 60

diff --git a/packs/D/charts/templates/canary.yaml b/packs/D/charts/templates/canary.yaml
@@ -35,12 +35,39 @@ spec:
     - name: request-success-rate
       threshold: {{ .Values.canary.canaryAnalysis.metrics.requestSuccessRate.threshold }}
       interval: {{ .Values.canary.canaryAnalysis.metrics.requestSuccessRate.interval }}
-    - name: request-duration
-      threshold: {{ .Values.canary.canaryAnalysis.metrics.requestDuration.threshold }}
+    - name: latency
+      templateRef:
+        name: latency
+      thresholdRange:
+        max: {{ .Values.canary.canaryAnalysis.metrics.requestDuration.threshold }}
       interval: {{ .Values.canary.canaryAnalysis.metrics.requestDuration.interval }}
 
 ---
 
+apiVersion: flagger.app/v1beta1
+kind: MetricTemplate
+metadata:
+  name: latency
+spec:
+  provider:
+    type: prometheus
+    address: http://prometheus.istio-system:9090
+  query: |
+    histogram_quantile(
+        0.99,
+        sum(
+            rate(
+                istio_request_duration_milliseconds_bucket{
+                    reporter="destination",
+                    destination_workload_namespace="{{ "{{" }} namespace {{ "}}" }}",
+                    destination_workload=~"{{ "{{" }} target {{ "}}" }}"
+                }[{{ "{{" }} interval {{ "}}" }}]
+            )
+        ) by (le)
+    )
+
+---
+
 apiVersion: networking.istio.io/v1alpha3
 kind: Gateway
 metadata:

diff --git a/packs/D/charts/values.yaml b/packs/D/charts/values.yaml
@@ -22,7 +22,7 @@ hpa:
   memoryTargetAverageUtilization: 80
 
 # Canary deployments
-# If enabled, Istio and Flagger need to be installed in the cluster
+# If enabled, Istio v1.5+ and Flagger need to be installed in the cluster
 canary:
   enabled: false
   progressDeadlineSeconds: 60

diff --git a/packs/appserver/charts/templates/canary.yaml b/packs/appserver/charts/templates/canary.yaml
@@ -35,12 +35,39 @@ spec:
     - name: request-success-rate
       threshold: {{ .Values.canary.canaryAnalysis.metrics.requestSuccessRate.threshold }}
       interval: {{ .Values.canary.canaryAnalysis.metrics.requestSuccessRate.interval }}
-    - name: request-duration
-      threshold: {{ .Values.canary.canaryAnalysis.metrics.requestDuration.threshold }}
+    - name: latency
+      templateRef:
+        name: latency
+      thresholdRange:
+        max: {{ .Values.canary.canaryAnalysis.metrics.requestDuration.threshold }}
       interval: {{ .Values.canary.canaryAnalysis.metrics.requestDuration.interval }}
 
 ---
 
+apiVersion: flagger.app/v1beta1
+kind: MetricTemplate
+metadata:
+  name: latency
+spec:
+  provider:
+    type: prometheus
+    address: http://prometheus.istio-system:9090
+  query: |
+    histogram_quantile(
+        0.99,
+        sum(
+            rate(
+                istio_request_duration_milliseconds_bucket{
+                    reporter="destination",
+                    destination_workload_namespace="{{ "{{" }} namespace {{ "}}" }}",
+                    destination_workload=~"{{ "{{" }} target {{ "}}" }}"
+                }[{{ "{{" }} interval {{ "}}" }}]
+            )
+        ) by (le)
+    )
+
+---
+
 apiVersion: networking.istio.io/v1alpha3
 kind: Gateway
 metadata:

diff --git a/packs/appserver/charts/values.yaml b/packs/appserver/charts/values.yaml
@@ -22,7 +22,7 @@ hpa:
   memoryTargetAverageUtilization: 80
 
 # Canary deployments
-# If enabled, Istio and Flagger need to be installed in the cluster
+# If enabled, Istio v1.5+ and Flagger need to be installed in the cluster
 canary:
   enabled: false
   progressDeadlineSeconds: 60

diff --git a/packs/csharp/charts/templates/canary.yaml b/packs/csharp/charts/templates/canary.yaml
@@ -35,12 +35,39 @@ spec:
     - name: request-success-rate
       threshold: {{ .Values.canary.canaryAnalysis.metrics.requestSuccessRate.threshold }}
       interval: {{ .Values.canary.canaryAnalysis.metrics.requestSuccessRate.interval }}
-    - name: request-duration
-      threshold: {{ .Values.canary.canaryAnalysis.metrics.requestDuration.threshold }}
+    - name: latency
+      templateRef:
+        name: latency
+      thresholdRange:
+        max: {{ .Values.canary.canaryAnalysis.metrics.requestDuration.threshold }}
       interval: {{ .Values.canary.canaryAnalysis.metrics.requestDuration.interval }}
 
 ---
 
+apiVersion: flagger.app/v1beta1
+kind: MetricTemplate
+metadata:
+  name: latency
+spec:
+  provider:
+    type: prometheus
+    address: http://prometheus.istio-system:9090
+  query: |
+    histogram_quantile(
+        0.99,
+        sum(
+            rate(
+                istio_request_duration_milliseconds_bucket{
+                    reporter="destination",
+                    destination_workload_namespace="{{ "{{" }} namespace {{ "}}" }}",
+                    destination_workload=~"{{ "{{" }} target {{ "}}" }}"
+                }[{{ "{{" }} interval {{ "}}" }}]
+            )
+        ) by (le)
+    )
+
+---
+
 apiVersion: networking.istio.io/v1alpha3
 kind: Gateway
 metadata:

diff --git a/packs/csharp/charts/values.yaml b/packs/csharp/charts/values.yaml
@@ -22,7 +22,7 @@ hpa:
   memoryTargetAverageUtilization: 80
 
 # Canary deployments
-# If enabled, Istio and Flagger need to be installed in the cluster
+# If enabled, Istio v1.5+ and Flagger need to be installed in the cluster
 canary:
   enabled: false
   progressDeadlineSeconds: 60

diff --git a/packs/cwp/charts/templates/canary.yaml b/packs/cwp/charts/templates/canary.yaml
@@ -35,12 +35,39 @@ spec:
     - name: request-success-rate
       threshold: {{ .Values.canary.canaryAnalysis.metrics.requestSuccessRate.threshold }}
       interval: {{ .Values.canary.canaryAnalysis.metrics.requestSuccessRate.interval }}
-    - name: request-duration
-      threshold: {{ .Values.canary.canaryAnalysis.metrics.requestDuration.threshold }}
+    - name: latency
+      templateRef:
+        name: latency
+      thresholdRange:
+        max: {{ .Values.canary.canaryAnalysis.metrics.requestDuration.threshold }}
       interval: {{ .Values.canary.canaryAnalysis.metrics.requestDuration.interval }}
 
 ---
 
+apiVersion: flagger.app/v1beta1
+kind: MetricTemplate
+metadata:
+  name: latency
+spec:
+  provider:
+    type: prometheus
+    address: http://prometheus.istio-system:9090
+  query: |
+    histogram_quantile(
+        0.99,
+        sum(
+            rate(
+                istio_request_duration_milliseconds_bucket{
+                    reporter="destination",
+                    destination_workload_namespace="{{ "{{" }} namespace {{ "}}" }}",
+                    destination_workload=~"{{ "{{" }} target {{ "}}" }}"
+                }[{{ "{{" }} interval {{ "}}" }}]
+            )
+        ) by (le)
+    )
+
+---
+
 apiVersion: networking.istio.io/v1alpha3
 kind: Gateway
 metadata:

diff --git a/packs/cwp/charts/values.yaml b/packs/cwp/charts/values.yaml
@@ -22,7 +22,7 @@ hpa:
   memoryTargetAverageUtilization: 80
 
 # Canary deployments
-# If enabled, Istio and Flagger need to be installed in the cluster
+# If enabled, Istio v1.5+ and Flagger need to be installed in the cluster
 canary:
   enabled: false
   progressDeadlineSeconds: 60

diff --git a/packs/dropwizard/charts/templates/canary.yaml b/packs/dropwizard/charts/templates/canary.yaml
@@ -35,12 +35,39 @@ spec:
     - name: request-success-rate
       threshold: {{ .Values.canary.canaryAnalysis.metrics.requestSuccessRate.threshold }}
       interval: {{ .Values.canary.canaryAnalysis.metrics.requestSuccessRate.interval }}
-    - name: request-duration
-      threshold: {{ .Values.canary.canaryAnalysis.metrics.requestDuration.threshold }}
+    - name: latency
+      templateRef:
+        name: latency
+      thresholdRange:
+        max: {{ .Values.canary.canaryAnalysis.metrics.requestDuration.threshold }}
       interval: {{ .Values.canary.canaryAnalysis.metrics.requestDuration.interval }}
 
 ---
 
+apiVersion: flagger.app/v1beta1
+kind: MetricTemplate
+metadata:
+  name: latency
+spec:
+  provider:
+    type: prometheus
+    address: http://prometheus.istio-system:9090
+  query: |
+    histogram_quantile(
+        0.99,
+        sum(
+            rate(
+                istio_request_duration_milliseconds_bucket{
+                    reporter="destination",
+                    destination_workload_namespace="{{ "{{" }} namespace {{ "}}" }}",
+                    destination_workload=~"{{ "{{" }} target {{ "}}" }}"
+                }[{{ "{{" }} interval {{ "}}" }}]
+            )
+        ) by (le)
+    )
+
+---
+
 apiVersion: networking.istio.io/v1alpha3
 kind: Gateway
 metadata:

diff --git a/packs/dropwizard/charts/values.yaml b/packs/dropwizard/charts/values.yaml
@@ -22,7 +22,7 @@ hpa:
   memoryTargetAverageUtilization: 80
 
 # Canary deployments
-# If enabled, Istio and Flagger need to be installed in the cluster
+# If enabled, Istio v1.5+ and Flagger need to be installed in the cluster
 canary:
   enabled: false
   progressDeadlineSeconds: 60

diff --git a/packs/go-mongodb/charts/templates/canary.yaml b/packs/go-mongodb/charts/templates/canary.yaml
@@ -35,12 +35,39 @@ spec:
     - name: request-success-rate
       threshold: {{ .Values.canary.canaryAnalysis.metrics.requestSuccessRate.threshold }}
       interval: {{ .Values.canary.canaryAnalysis.metrics.requestSuccessRate.interval }}
-    - name: request-duration
-      threshold: {{ .Values.canary.canaryAnalysis.metrics.requestDuration.threshold }}
+    - name: latency
+      templateRef:
+        name: latency
+      thresholdRange:
+        max: {{ .Values.canary.canaryAnalysis.metrics.requestDuration.threshold }}
       interval: {{ .Values.canary.canaryAnalysis.metrics.requestDuration.interval }}
 
 ---
 
+apiVersion: flagger.app/v1beta1
+kind: MetricTemplate
+metadata:
+  name: latency
+spec:
+  provider:
+    type: prometheus
+    address: http://prometheus.istio-system:9090
+  query: |
+    histogram_quantile(
+        0.99,
+        sum(
+            rate(
+                istio_request_duration_milliseconds_bucket{
+                    reporter="destination",
+                    destination_workload_namespace="{{ "{{" }} namespace {{ "}}" }}",
+                    destination_workload=~"{{ "{{" }} target {{ "}}" }}"
+                }[{{ "{{" }} interval {{ "}}" }}]
+            )
+        ) by (le)
+    )
+
+---
+
 apiVersion: networking.istio.io/v1alpha3
 kind: Gateway
 metadata:

diff --git a/packs/go-mongodb/charts/values.yaml b/packs/go-mongodb/charts/values.yaml
@@ -22,7 +22,7 @@ hpa:
   memoryTargetAverageUtilization: 80
 
 # Canary deployments
-# If enabled, Istio and Flagger need to be installed in the cluster
+# If enabled, Istio v1.5+ and Flagger need to be installed in the cluster
 canary:
   enabled: false
   progressDeadlineSeconds: 60

diff --git a/packs/go/charts/templates/canary.yaml b/packs/go/charts/templates/canary.yaml
@@ -35,12 +35,39 @@ spec:
     - name: request-success-rate
       threshold: {{ .Values.canary.canaryAnalysis.metrics.requestSuccessRate.threshold }}
       interval: {{ .Values.canary.canaryAnalysis.metrics.requestSuccessRate.interval }}
-    - name: request-duration
-      threshold: {{ .Values.canary.canaryAnalysis.metrics.requestDuration.threshold }}
+    - name: latency
+      templateRef:
+        name: latency
+      thresholdRange:
+        max: {{ .Values.canary.canaryAnalysis.metrics.requestDuration.threshold }}
       interval: {{ .Values.canary.canaryAnalysis.metrics.requestDuration.interval }}
 
 ---
 
+apiVersion: flagger.app/v1beta1
+kind: MetricTemplate
+metadata:
+  name: latency
+spec:
+  provider:
+    type: prometheus
+    address: http://prometheus.istio-system:9090
+  query: |
+    histogram_quantile(
+        0.99,
+        sum(
+            rate(
+                istio_request_duration_milliseconds_bucket{
+                    reporter="destination",
+                    destination_workload_namespace="{{ "{{" }} namespace {{ "}}" }}",
+                    destination_workload=~"{{ "{{" }} target {{ "}}" }}"
+                }[{{ "{{" }} interval {{ "}}" }}]
+            )
+        ) by (le)
+    )
+
+---
+
 apiVersion: networking.istio.io/v1alpha3
 kind: Gateway
 metadata: