Merge pull request #960 from fluxcd/traefik-2.4

e2e: Update Traefik to 2.4.9
fluxcd · Jul 27, 2021 · df459c5 · df459c5
2 parents e6b5ee2 + d1d9c0e
commit df459c5
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git 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:

diff --git 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,20 +12,24 @@ 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
 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 \