Improve integration tests

Co-authored-by: Julien Salleyron <julien.salleyron@gmail.com>

integration/resources/compose/access_log.yml

@@ -40,7 +40,7 @@ services:
       traefik.http.routers.rt-authFrontend.entryPoints: httpFrontendAuth
       traefik.http.routers.rt-authFrontend.rule: Host(`frontend.auth.docker.local`)
       traefik.http.routers.rt-authFrontend.middlewares: basicauth
-      traefik.http.middlewares.basicauth.basicauth.users: test:$$apr1$$H6uskkkW$$IgXLP6ewTrSuBkTrqE8wj/
+      traefik.http.middlewares.basicauth.basicauth.users: "test:$apr1$H6uskkkW$IgXLP6ewTrSuBkTrqE8wj/"
       traefik.http.services.service3.loadbalancer.server.port: 80
 
   digestAuthMiddleware:
@@ -94,8 +94,3 @@ services:
       traefik.http.routers.rt-preflightCORS.middlewares: preflightCORS
       traefik.http.middlewares.preflightCORS.headers.accessControlAllowMethods: OPTIONS, GET
       traefik.http.services.preflightCORS.loadbalancer.server.port: 80
-
-networks:
-  default:
-    name: traefik-test-network
-    external: true

integration/resources/compose/allowlist.yml

@@ -34,8 +34,3 @@ services:
       traefik.http.routers.rt4.middlewares: wl4
       traefik.http.middlewares.wl4.ipallowlist.sourceRange: 8.8.8.8
       traefik.http.middlewares.wl4.ipallowlist.ipStrategy.excludedIPs: 10.0.0.1,10.0.0.2
-
-networks:
-  default:
-    name: traefik-test-network
-    external: true

integration/resources/compose/base.yml

@@ -11,8 +11,3 @@ services:
     image: traefik/whoami
     labels:
       traefik.enable: false
-
-networks:
-  default:
-    name: traefik-test-network
-    external: true

integration/resources/compose/consul.yml

@@ -4,8 +4,3 @@ services:
     image: consul:1.6
   whoami:
     image: traefik/whoami
-
-networks:
-  default:
-    name: traefik-test-network
-    external: true

integration/resources/compose/consul_catalog.yml

@@ -2,11 +2,24 @@ version: "3.8"
 services:
   consul:
     image: consul:1.6.2
-    command: agent -server -bootstrap -ui -client 0.0.0.0 -hcl 'connect { enabled = true }'
+    command:
+      - agent
+      - -server
+      - -bootstrap
+      - -ui
+      - -client
+      - 0.0.0.0
+      - -hcl
+      - 'connect { enabled = true }'
 
   consul-agent:
     image: consul:1.6.2
-    command: agent -retry-join consul -client 0.0.0.0
+    command:
+      - agent
+      - -retry-join
+      - consul
+      - -client
+      - 0.0.0.0
 
   whoami1:
     image: traefik/whoami
@@ -30,8 +43,3 @@ services:
       PORT: 443
       BIND: 0.0.0.0
       CONSUL_HTTP_ADDR: http://consul:8500
-
-networks:
-  default:
-    name: traefik-test-network
-    external: true

integration/resources/compose/docker.yml

@@ -36,8 +36,3 @@ services:
     labels:
       traefik.http.Routers.Super.Rule: Host(`my.super.host`)
       traefik.http.Services.powpow.LoadBalancer.server.Port: 2375
-
-networks:
-  default:
-    name: traefik-test-network
-    external: true

integration/resources/compose/error_pages.yml

@@ -1,12 +1,7 @@
 version: "3.8"
 services:
   nginx1:
-    image: nginx:1.13.8-alpine
+    image: nginx:1.25.3-alpine3.18
 
   nginx2:
-    image: nginx:1.13.8-alpine
-
-networks:
-  default:
-    name: traefik-test-network
-    external: true
+    image: nginx:1.25.3-alpine3.18

integration/resources/compose/etcd.yml

@@ -2,9 +2,9 @@ version: "3.8"
 services:
   etcd:
     image: quay.io/coreos/etcd:v3.3.18
-    command: etcd --listen-client-urls http://0.0.0.0:2379 --advertise-client-urls http://0.0.0.0:2380
-
-networks:
-  default:
-    name: traefik-test-network
-    external: true
+    command:
+      - etcd
+      - --listen-client-urls
+      - http://0.0.0.0:2379
+      - --advertise-client-urls
+      - http://0.0.0.0:2380

integration/resources/compose/file.yml

@@ -14,8 +14,3 @@ services:
 
   whoami5:
     image: traefik/whoami
-
-networks:
-  default:
-    name: traefik-test-network
-    external: true

integration/resources/compose/healthcheck.yml

@@ -11,8 +11,3 @@ services:
 
   whoami4:
     image: traefik/whoami
-
-networks:
-  default:
-    name: traefik-test-network
-    external: true

integration/resources/compose/hostresolver.yml

@@ -6,8 +6,3 @@ services:
       traefik.enable: true
       traefik.http.services.service1.loadbalancer.server.port: 80
       traefik.http.routers.router1.rule: Host(`github.com`)
-
-networks:
-  default:
-    name: traefik-test-network
-    external: true

integration/resources/compose/k8s.yml

@@ -2,9 +2,23 @@ version: "3.8"
 services:
   server:
     image: rancher/k3s:v1.20.15-k3s1
-    command: server --disable-agent --no-deploy coredns --no-deploy servicelb --no-deploy traefik --no-deploy local-storage --no-deploy metrics-server --log /output/k3s.log --bind-address=server --tls-san=server
+    privileged: true
+    command:
+      - server
+      - --disable-agent
+      - --disable=coredns
+      - --disable=servicelb
+      - --disable=traefik
+      - --disable=local-storage
+      - --disable=metrics-server
+      - --log=/output/k3s.log
+      - --bind-address=server
+      - --tls-san=server
+      - --tls-san=172.31.42.3
+      - --tls-san=172.31.42.4
     environment:
       K3S_CLUSTER_SECRET: somethingtotallyrandom
+      K3S_TOKEN: somethingtotallyrandom
       K3S_KUBECONFIG_OUTPUT: /output/kubeconfig.yaml
       K3S_KUBECONFIG_MODE: 666
     volumes:
@@ -15,10 +29,6 @@ services:
     image: rancher/k3s:v1.20.15-k3s1
     privileged: true
     environment:
+      K3S_TOKEN: somethingtotallyrandom
       K3S_URL: https://server:6443
       K3S_CLUSTER_SECRET: somethingtotallyrandom
-
-networks:
-  default:
-    name: traefik-test-network
-    external: true

integration/resources/compose/minimal.yml

@@ -3,12 +3,9 @@ services:
   whoami1:
     image: traefik/whoami
     labels:
-      traefik.http.Routers.RouterMini.Rule: PathPrefix(`/whoami`)
+      traefik.http.routers.router-mini.Rule: PathPrefix(`/whoami`)
+      traefik.http.routers.router-mini.service: service-mini
+      traefik.http.services.service-mini.loadbalancer.server.port: 80
       traefik.enable: true
     deploy:
       replicas: 2
-
-networks:
-  default:
-    name: traefik-test-network
-    external: true

integration/resources/compose/pebble.yml

@@ -2,14 +2,12 @@ version: "3.8"
 services:
   pebble:
     image: letsencrypt/pebble:v2.3.1
-    command: pebble --dnsserver traefik:5053
+    command:
+      - pebble
+      - --dnsserver
+      - host.docker.internal:5053
     environment:
       # https://github.com/letsencrypt/pebble#testing-at-full-speed
       PEBBLE_VA_NOSLEEP: 1
       # https://github.com/letsencrypt/pebble#invalid-anti-replay-nonce-errors
       PEBBLE_WFE_NONCEREJECT: 0
-
-networks:
-  default:
-    name: traefik-test-network
-    external: true

integration/resources/compose/proxy-protocol.yml

@@ -1,14 +1,4 @@
 version: "3.8"
 services:
-  haproxy:
-    image: haproxy:2.2
-    volumes:
-      - ./resources/haproxy/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg
-
   whoami:
     image: traefik/whoami
-
-networks:
-  default:
-    name: traefik-test-network
-    external: true

integration/resources/compose/ratelimit.yml

@@ -2,8 +2,3 @@ version: "3.8"
 services:
   whoami1:
     image: traefik/whoami
-
-networks:
-  default:
-    name: traefik-test-network
-    external: true

integration/resources/compose/redis.yml

@@ -2,8 +2,3 @@ version: "3.8"
 services:
   redis:
     image: redis:5.0
-
-networks:
-  default:
-    name: traefik-test-network
-    external: true

integration/resources/compose/redis_sentinel.yml

@@ -3,59 +3,51 @@ services:
   master:
     image: redis
     container_name: redis-master
-    command: redis-server --port 6380
-    ports:
-      - 6380:6380
-    healthcheck:
-      test: redis-cli -p 6380 ping
+    command:
+      - redis-server
+      - --port
+      - 6380
   node1:
     image: redis
     container_name: redis-node-1
-    ports:
-      - 6381:6381
-    command:  redis-server --port 6381 --slaveof redis-master 6380
-    healthcheck:
-      test: redis-cli -p 6381 ping
+    command:
+      - redis-server
+      - --port
+      - 6381
+      - --slaveof
+      - redis-master
+      - 6380
   node2:
     image: redis
     container_name: redis-node-2
-    ports:
-      - 6382:6382
-    command: redis-server --port 6382 --slaveof redis-master 6380
-    healthcheck:
-      test: redis-cli -p 6382 ping
+    command:
+      - redis-server
+      - --port
+      - 6382
+      - --slaveof
+      - redis-master
+      - 6380
   sentinel1:
     image: redis
     container_name: redis-sentinel-1
-    ports:
-      - 26379:26379
-    command: redis-sentinel /usr/local/etc/redis/conf/sentinel1.conf
-    healthcheck:
-      test: redis-cli -p 26379 ping
+    command:
+      - redis-sentinel
+      - /usr/local/etc/redis/conf/sentinel1.conf
     volumes:
       - ./resources/compose/config:/usr/local/etc/redis/conf
   sentinel2:
     image: redis
     container_name: redis-sentinel-2
-    ports:
-      - 36379:26379
-    command: redis-sentinel /usr/local/etc/redis/conf/sentinel2.conf
-    healthcheck:
-      test: redis-cli -p 36379 ping
+    command:
+      - redis-sentinel
+      - /usr/local/etc/redis/conf/sentinel2.conf
     volumes:
       - ./resources/compose/config:/usr/local/etc/redis/conf
   sentinel3:
     image: redis
     container_name: redis-sentinel-3
-    ports:
-      - 46379:26379
-    command: redis-sentinel /usr/local/etc/redis/conf/sentinel3.conf
-    healthcheck:
-      test: redis-cli -p 46379 ping
+    command:
+      - redis-sentinel
+      - /usr/local/etc/redis/conf/sentinel3.conf
     volumes:
       - ./resources/compose/config:/usr/local/etc/redis/conf
-
-networks:
-  default:
-    name: traefik-test-network
-    external: true

integration/resources/compose/reqacceptgrace.yml

@@ -2,8 +2,3 @@ version: "3.8"
 services:
   whoami:
     image: traefik/whoami
-
-networks:
-  default:
-    name: traefik-test-network
-    external: true

integration/resources/compose/rest.yml

@@ -2,8 +2,3 @@ version: "3.8"
 services:
   whoami1:
     image: traefik/whoami
-
-networks:
-  default:
-    name: traefik-test-network
-    external: true

integration/resources/compose/retry.yml

@@ -2,8 +2,3 @@ version: "3.8"
 services:
   whoami:
     image: traefik/whoami
-
-networks:
-  default:
-    name: traefik-test-network
-    external: true

integration/resources/compose/stats.yml

@@ -5,8 +5,3 @@ services:
 
   whoami2:
     image: traefik/whoami
-
-networks:
-  default:
-    name: traefik-test-network
-    external: true

integration/resources/compose/tailscale.yml

@@ -9,9 +9,5 @@ services:
     cap_add:                  # Required for tailscale to work
       - net_admin
       - sys_module
-    command: tailscaled
-
-networks:
-  default:
-    name: traefik-test-network
-    external: true
+    command:
+      - tailscaled

integration/resources/compose/tcp.yml

@@ -2,38 +2,58 @@ version: "3.8"
 services:
   whoami-a:
     image: traefik/whoamitcp
-    command: -name whoami-a -certFile /certs/whoami-a.crt -keyFile /certs/whoami-a.key
+    command:
+      - -name
+      - whoami-a
+      - -certFile
+      - /certs/whoami-a.crt
+      - -keyFile
+      - /certs/whoami-a.key
     volumes:
       - ./fixtures/tcp:/certs
 
   whoami-b:
     image: traefik/whoamitcp
-    command: -name whoami-b -certFile /certs/whoami-b.crt -keyFile /certs/whoami-b.key
+    command:
+      - -name
+      - whoami-b
+      - -certFile
+      - /certs/whoami-b.crt
+      - -keyFile
+      - /certs/whoami-b.key
     volumes:
       - ./fixtures/tcp:/certs
 
   whoami-ab:
     image: traefik/whoamitcp
-    command: -name whoami-ab -certFile /certs/whoami-b.crt -keyFile /certs/whoami-b.key
+    command:
+      - -name
+      - whoami-ab
+      - -certFile
+      - /certs/whoami-b.crt
+      - -keyFile
+      - /certs/whoami-b.key
     volumes:
       - ./fixtures/tcp:/certs
 
   whoami-no-cert:
     image: traefik/whoamitcp
-    command: -name whoami-no-cert
+    command:
+      - -name
+      - whoami-no-cert
 
   whoami-no-tls:
     image: traefik/whoamitcp
-    command: -name whoami-no-tls
+    command:
+      - -name
+      - whoami-no-tls
 
   whoami:
     image: traefik/whoami
 
   whoami-banner:
     image: traefik/whoamitcp
-    command: -name whoami-banner --banner
-
-networks:
-  default:
-    name: traefik-test-network
-    external: true
+    command:
+      - -name
+      - whoami-banner
+      - --banner

integration/resources/compose/timeout.yml

@@ -5,8 +5,3 @@ services:
     environment:
       PROTO: http
       PORT: 9000
-
-networks:
-  default:
-    name: traefik-test-network
-    external: true

integration/resources/compose/tlsclientheaders.yml

@@ -7,8 +7,3 @@ services:
       traefik.http.routers.route1.middlewares: passtls
       traefik.http.routers.route1.tls: true
       traefik.http.middlewares.passtls.passtlsclientcert.pem: true
-
-networks:
-  default:
-    name: traefik-test-network
-    external: true

integration/resources/compose/tracing.yml

@@ -13,8 +13,3 @@ services:
 
   whoami:
     image: traefik/whoami
-
-networks:
-  default:
-    name: traefik-test-network
-    external: true

integration/resources/compose/udp.yml

@@ -2,20 +2,21 @@ version: "3.8"
 services:
   whoami-a:
     image: traefik/whoamiudp:latest
-    command: -name whoami-a
+    command:
+      - -name
+      - whoami-a
 
   whoami-b:
     image: traefik/whoamiudp:latest
-    command: -name whoami-b
+    command:
+      - -name
+      - whoami-b
 
   whoami-c:
     image: traefik/whoamiudp:latest
-    command: -name whoami-c
+    command:
+      - -name
+      - whoami-c
 
   whoami-d:
     image: traefik/whoami
-
-networks:
-  default:
-    name: traefik-test-network
-    external: true

integration/resources/compose/zookeeper.yml

@@ -2,8 +2,3 @@ version: "3.8"
 services:
   zookeeper:
     image: zookeeper:3.5
-
-networks:
-  default:
-    name: traefik-test-network
-    external: true