test(e2e): set middleware config to new standard

.gitignore

@@ -0,0 +1,3 @@
+.devcontainer
+config.yaml
+./plugins/traefik/e2e/kubeconfig.yaml

plugins/traefik/e2e/docker-compose.yml

@@ -21,30 +21,32 @@ services:
     command:
       - start
       - --provider.name=docker
+      - --logging.level=trace
     volumes:
       - '/var/run/docker.sock:/var/run/docker.sock'
     labels:
       - traefik.enable=true
       # Dynamic Middleware
-      - traefik.http.middlewares.dynamic.plugin.sablier.name=docker_classic_e2e-whoami-1
-      - traefik.http.middlewares.dynamic.plugin.sablier.serviceUrl=http://sablier:10000
-      - traefik.http.middlewares.dynamic.plugin.sablier.timeout=1m
-      - traefik.http.middlewares.dynamic.plugin.sablier.displayname=Dynamic Whoami
+      - traefik.http.middlewares.dynamic.plugin.sablier.names=docker_classic_e2e-whoami-1
+      - traefik.http.middlewares.dynamic.plugin.sablier.sablierUrl=http://sablier:10000
+      - traefik.http.middlewares.dynamic.plugin.sablier.sessionDuration=1m
+      - traefik.http.middlewares.dynamic.plugin.sablier.dynamic.DisplayName=Dynamic Whoami
+      - traefik.http.middlewares.dynamic.plugin.sablier.dynamic.theme=hacker-terminal
       # Blocking Middleware
-      - traefik.http.middlewares.blocking.plugin.sablier.name=docker_classic_e2e-whoami-1
-      - traefik.http.middlewares.blocking.plugin.sablier.waitui=false
-      - traefik.http.middlewares.blocking.plugin.sablier.serviceUrl=http://sablier:10000
-      - traefik.http.middlewares.blocking.plugin.sablier.timeout=1m
+      - traefik.http.middlewares.blocking.plugin.sablier.names=docker_classic_e2e-whoami-1
+      - traefik.http.middlewares.blocking.plugin.sablier.sablierUrl=http://sablier:10000
+      - traefik.http.middlewares.blocking.plugin.sablier.sessionDuration=1m
+      - traefik.http.middlewares.blocking.plugin.sablier.blocking.timeout=30s
       # Multiple Dynamic Middleware
       - traefik.http.middlewares.multiple.plugin.sablier.names=docker_classic_e2e-whoami-1,docker_classic_e2e-nginx-1
-      - traefik.http.middlewares.multiple.plugin.sablier.serviceUrl=http://sablier:10000
-      - traefik.http.middlewares.multiple.plugin.sablier.displayname=Multiple Whoami
-      - traefik.http.middlewares.multiple.plugin.sablier.timeout=1m
+      - traefik.http.middlewares.multiple.plugin.sablier.sablierUrl=http://sablier:10000
+      - traefik.http.middlewares.multiple.plugin.sablier.sessionDuration=1m
+      - traefik.http.middlewares.multiple.plugin.sablier.dynamic.displayName=Multiple Whoami
       # Healthy Middleware
-      - traefik.http.middlewares.healthy.plugin.sablier.name=docker_classic_e2e-nginx-1
-      - traefik.http.middlewares.healthy.plugin.sablier.serviceUrl=http://sablier:10000
-      - traefik.http.middlewares.healthy.plugin.sablier.displayname=Healthy Nginx
-      - traefik.http.middlewares.healthy.plugin.sablier.timeout=1m
+      - traefik.http.middlewares.healthy.plugin.sablier.names=docker_classic_e2e-nginx-1
+      - traefik.http.middlewares.healthy.plugin.sablier.sablierUrl=http://sablier:10000
+      - traefik.http.middlewares.healthy.plugin.sablier.sessionDuration=1m
+      - traefik.http.middlewares.healthy.plugin.sablier.dynamic.displayName=Healthy Nginx
 
   whoami:
     image: containous/whoami:v1.5.0

plugins/traefik/e2e/docker-stack.yml

@@ -28,31 +28,32 @@ services:
     command:
       - start
       - --provider.name=swarm
+      - --logging.level=trace
     volumes:
       - '/var/run/docker.sock:/var/run/docker.sock'
     deploy:
       labels:
         - traefik.enable=true
         # Dynamic Middleware
-        - traefik.http.middlewares.dynamic.plugin.sablier.name=DOCKER_SWARM_E2E_whoami
-        - traefik.http.middlewares.dynamic.plugin.sablier.serviceUrl=http://tasks.sablier:10000
-        - traefik.http.middlewares.dynamic.plugin.sablier.timeout=1m
-        - traefik.http.middlewares.dynamic.plugin.sablier.displayname=Dynamic Whoami
+        - traefik.http.middlewares.dynamic.plugin.sablier.names=DOCKER_SWARM_E2E_whoami
+        - traefik.http.middlewares.dynamic.plugin.sablier.sablierUrl=http://tasks.sablier:10000
+        - traefik.http.middlewares.dynamic.plugin.sablier.sessionDuration=1m
+        - traefik.http.middlewares.dynamic.plugin.sablier.dynamic.displayName=Dynamic Whoami
         # Blocking Middleware
-        - traefik.http.middlewares.blocking.plugin.sablier.name=DOCKER_SWARM_E2E_whoami
-        - traefik.http.middlewares.blocking.plugin.sablier.waitui=false
-        - traefik.http.middlewares.blocking.plugin.sablier.serviceUrl=http://tasks.sablier:10000
-        - traefik.http.middlewares.blocking.plugin.sablier.timeout=1m
+        - traefik.http.middlewares.blocking.plugin.sablier.names=DOCKER_SWARM_E2E_whoami
+        - traefik.http.middlewares.blocking.plugin.sablier.sablierUrl=http://tasks.sablier:10000
+        - traefik.http.middlewares.blocking.plugin.sablier.sessionDuration=1m
+        - traefik.http.middlewares.blocking.plugin.sablier.blocking.timeout=30s
         # Multiple Dynamic Middleware
         - traefik.http.middlewares.multiple.plugin.sablier.names=DOCKER_SWARM_E2E_whoami,DOCKER_SWARM_E2E_nginx
-        - traefik.http.middlewares.multiple.plugin.sablier.serviceUrl=http://tasks.sablier:10000
-        - traefik.http.middlewares.multiple.plugin.sablier.displayname=Multiple Whoami
-        - traefik.http.middlewares.multiple.plugin.sablier.timeout=1m
+        - traefik.http.middlewares.multiple.plugin.sablier.sablierUrl=http://tasks.sablier:10000
+        - traefik.http.middlewares.multiple.plugin.sablier.sessionDuration=1m
+        - traefik.http.middlewares.multiple.plugin.sablier.dynamic.displayName=Multiple Whoami
         # Healthy Middleware
-        - traefik.http.middlewares.healthy.plugin.sablier.name=DOCKER_SWARM_E2E_nginx
-        - traefik.http.middlewares.healthy.plugin.sablier.serviceUrl=http://tasks.sablier:10000
-        - traefik.http.middlewares.healthy.plugin.sablier.displayname=Healthy Nginx
-        - traefik.http.middlewares.healthy.plugin.sablier.timeout=1m
+        - traefik.http.middlewares.healthy.plugin.sablier.names=DOCKER_SWARM_E2E_nginx
+        - traefik.http.middlewares.healthy.plugin.sablier.sablierUrl=http://tasks.sablier:10000
+        - traefik.http.middlewares.healthy.plugin.sablier.sessionDuration=1m
+        - traefik.http.middlewares.healthy.plugin.sablier.dynamic.displayName=Healthy Nginx
         - traefik.http.services.sablier.loadbalancer.server.port=10000
 
   whoami:

plugins/traefik/e2e/manifests/deployment.yml

@@ -38,10 +38,11 @@ metadata:
 spec:
   plugin:
     sablier:
-      name: deployment_default_whoami-deployment_1
-      serviceUrl: 'http://sablier:10000'
-      timeout: 1m
-      displayname: 'Dynamic Whoami'
+      names: deployment_default_whoami-deployment_1
+      sablierUrl: 'http://sablier:10000'
+      sessionDuration: 1m
+      dynamic:
+        displayName: 'Dynamic Whoami'
 ---
 apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
@@ -51,10 +52,11 @@ metadata:
 spec:
   plugin:
     sablier:
-      name: deployment_default_whoami-deployment_1
-      serviceUrl: 'http://sablier:10000'
-      timeout: 1m
-      waitui: false
+      names: deployment_default_whoami-deployment_1
+      sablierUrl: 'http://sablier:10000'
+      sessionDuration: 1m
+      blocking:
+        timeout: 30s
 
 ---
 apiVersion: traefik.containo.us/v1alpha1
@@ -66,9 +68,10 @@ spec:
   plugin:
     sablier:
       names: deployment_default_whoami-deployment_1,deployment_default_nginx-deployment_1
-      serviceUrl: 'http://sablier:10000'
-      timeout: 1m
-      displayname: 'Multiple Whoami'
+      sablierUrl: 'http://sablier:10000'
+      sessionDuration: 1m
+      dynamic:
+        displayName: 'Multiple Whoami'
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
@@ -171,10 +174,11 @@ metadata:
 spec:
   plugin:
     sablier:
-      name: deployment_default_nginx-deployment_1
-      serviceUrl: 'http://sablier:10000'
-      timeout: 1m
-      displayname: 'Healthy Nginx'
+      names: deployment_default_nginx-deployment_1
+      sablierUrl: 'http://sablier:10000'
+      sessionDuration: 1m
+      dynamic:
+        displayName: 'Healthy Nginx'
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress

plugins/traefik/e2e/manifests/sablier.yml

@@ -20,7 +20,7 @@ spec:
       containers:
       - name: sablier
         image: ghcr.io/acouvreur/sablier:local
-        args: ["start", "--provider.name=kubernetes"]
+        args: ["start", "--provider.name=kubernetes", "--logging.level=trace"]
         ports:
         - containerPort: 10000
 ---