From c1b1d7d448225c519686d54be0f0b3b0f06ebdbe Mon Sep 17 00:00:00 2001
From: Stefan Prodan <stefan.prodan@gmail.com>
Date: Tue, 27 Jul 2021 11:16:21 +0300
Subject: [PATCH 1/2] e2e: Update Traefik to 2.4.9

Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
---
 test/traefik/install.sh | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/test/traefik/install.sh b/test/traefik/install.sh
index ff9fab41..dc0e06f1 100755
--- a/test/traefik/install.sh
+++ b/test/traefik/install.sh
@@ -2,7 +2,7 @@
 
 set -o errexit
 
-TRAEFIK_CHART_VERSION="9.11.0" # traefik 2.3.3
+TRAEFIK_CHART_VERSION="10.1.1" # traefik 2.4.9
 REPO_ROOT=$(git rev-parse --show-toplevel)
 
 mkdir -p ${REPO_ROOT}/bin
@@ -12,13 +12,15 @@ kubectl create ns traefik
 
 echo '>>> Installing Traefik'
 helm repo add traefik https://helm.traefik.io/traefik
-cat <<EOF | helm upgrade -i traefik traefik/traefik --version=${TRAEFIK_VERSION} --namespace traefik -f -
-additionalArguments:
-  - "--metrics.prometheus=true"
+cat <<EOF | helm upgrade -i traefik traefik/traefik --version=${TRAEFIK_CHART_VERSION} --wait --namespace traefik -f -
 deployment:
   podAnnotations:
-    "prometheus.io/port": "9000"
-    "prometheus.io/scrape": "true"
+    prometheus.io/port: "9100"
+    prometheus.io/scrape: "true"
+    prometheus.io/path: "/metrics"
+metrics:
+  prometheus:
+    entryPoint: metrics
 service:
   enabled: true
   type: NodePort
@@ -26,6 +28,8 @@ EOF
 
 kubectl -n traefik rollout status deployment/traefik
 kubectl -n traefik get all
+kubectl -n traefik get deployment/traefik -oyaml
+kubectl -n traefik get service/traefik -oyaml
 
 echo '>>> Installing Flagger'
 helm upgrade -i flagger ${REPO_ROOT}/charts/flagger \

From d1d9c0e2a95cb22cdd1278e891c5db7ff472dcad Mon Sep 17 00:00:00 2001
From: Stefan Prodan <stefan.prodan@gmail.com>
Date: Tue, 27 Jul 2021 12:34:27 +0300
Subject: [PATCH 2/2] Update Traefik docs with Prometheus annotations

Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
---
 .../tutorials/traefik-progressive-delivery.md      | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/docs/gitbook/tutorials/traefik-progressive-delivery.md b/docs/gitbook/tutorials/traefik-progressive-delivery.md
index 71146cb0..7a4be213 100644
--- a/docs/gitbook/tutorials/traefik-progressive-delivery.md
+++ b/docs/gitbook/tutorials/traefik-progressive-delivery.md
@@ -13,9 +13,17 @@ Install Traefik with Helm v3:
 ```bash
 helm repo add traefik https://helm.traefik.io/traefik
 kubectl create ns traefik
-helm upgrade -i traefik traefik/traefik \
---namespace traefik \
---set additionalArguments="{--metrics.prometheus=true}"
+
+cat <<EOF | helm upgrade -i traefik traefik/traefik --namespace traefik -f -
+deployment:
+  podAnnotations:
+    prometheus.io/port: "9100"
+    prometheus.io/scrape: "true"
+    prometheus.io/path: "/metrics"
+metrics:
+  prometheus:
+    entryPoint: metrics
+EOF
 ```
 
 Install Flagger and the Prometheus add-on in the same namespace as Traefik: