diff --git a/plugins/traefik/e2e/docker-compose.yml b/plugins/traefik/e2e/docker/docker-compose.yml similarity index 97% rename from plugins/traefik/e2e/docker-compose.yml rename to plugins/traefik/e2e/docker/docker-compose.yml index ea8375c..e0b60dc 100644 --- a/plugins/traefik/e2e/docker-compose.yml +++ b/plugins/traefik/e2e/docker/docker-compose.yml @@ -12,7 +12,7 @@ services: - "8080:80" volumes: - '/var/run/docker.sock:/var/run/docker.sock' - - '../../..:/plugins-local/src/github.com/acouvreur/sablier' + - '../../../..:/plugins-local/src/github.com/acouvreur/sablier' - './dynamic-config.yml:/etc/traefik/dynamic-config.yml' restart: "no" diff --git a/plugins/traefik/e2e/dynamic-config.yml b/plugins/traefik/e2e/docker/dynamic-config.yml similarity index 100% rename from plugins/traefik/e2e/dynamic-config.yml rename to plugins/traefik/e2e/docker/dynamic-config.yml diff --git a/plugins/traefik/e2e/docker_classic.sh b/plugins/traefik/e2e/docker/run.sh similarity index 100% rename from plugins/traefik/e2e/docker_classic.sh rename to plugins/traefik/e2e/docker/run.sh diff --git a/plugins/traefik/e2e/docker-stack.yml b/plugins/traefik/e2e/docker_swarm/docker-stack.yml similarity index 98% rename from plugins/traefik/e2e/docker-stack.yml rename to plugins/traefik/e2e/docker_swarm/docker-stack.yml index a52419e..c0badf8 100644 --- a/plugins/traefik/e2e/docker-stack.yml +++ b/plugins/traefik/e2e/docker_swarm/docker-stack.yml @@ -16,7 +16,7 @@ services: mode: host # Won't work in github actions otherwise volumes: - '/var/run/docker.sock:/var/run/docker.sock' - - '../../..:/plugins-local/src/github.com/acouvreur/sablier' + - '../../../..:/plugins-local/src/github.com/acouvreur/sablier' deploy: labels: - traefik.http.services.traefik.loadbalancer.server.port=8080 diff --git a/plugins/traefik/e2e/docker_swarm.sh b/plugins/traefik/e2e/docker_swarm/run.sh similarity index 100% rename from plugins/traefik/e2e/docker_swarm.sh rename to plugins/traefik/e2e/docker_swarm/run.sh diff --git a/plugins/traefik/e2e/docker-kubernetes.yml b/plugins/traefik/e2e/kubernetes/docker-kubernetes.yml similarity index 89% rename from plugins/traefik/e2e/docker-kubernetes.yml rename to plugins/traefik/e2e/kubernetes/docker-kubernetes.yml index fb68599..fad9332 100644 --- a/plugins/traefik/e2e/docker-kubernetes.yml +++ b/plugins/traefik/e2e/kubernetes/docker-kubernetes.yml @@ -19,7 +19,7 @@ services: volumes: # This is just so that we get the kubeconfig file out - .:/output - - '../../..:/plugins-local/src/github.com/acouvreur/sablier' + - '../../../..:/plugins-local/src/github.com/acouvreur/sablier' ports: - 6443:6443 # Kubernetes API Server - 8080:80 # Ingress controller port 80 diff --git a/plugins/traefik/e2e/kubernetes.sh b/plugins/traefik/e2e/kubernetes/run.sh similarity index 100% rename from plugins/traefik/e2e/kubernetes.sh rename to plugins/traefik/e2e/kubernetes/run.sh diff --git a/plugins/traefik/e2e/values.yaml b/plugins/traefik/e2e/kubernetes/values.yaml similarity index 100% rename from plugins/traefik/e2e/values.yaml rename to plugins/traefik/e2e/kubernetes/values.yaml