From acfd612bc08eadff811d68c119e65ed38f4511ec Mon Sep 17 00:00:00 2001 From: Alexis Couvreur Date: Wed, 23 Oct 2024 21:13:56 -0400 Subject: [PATCH] ci: fix pipelines (#418) * ci: fix pipelines * fix(proxywasm): bump to go 1.23 and tinygo 0.33 * ci: move to sablierapp/sablier * ci: replace sablierapp/whoami with acouvreur/whoami This will use mimic later * fix wrong whoami image * update nginx docker image for proxywasm --- .github/workflows/docker.yaml | 8 ++--- .github/workflows/dockerhub-description.yml | 4 +-- .github/workflows/plugins.yml | 2 +- .github/workflows/release.yml | 2 +- docs/getting-started.md | 8 ++--- docs/plugins/traefik.md | 4 +-- docs/providers/docker.md | 2 +- docs/providers/docker_swarm.md | 2 +- docs/providers/kubernetes.md | 2 +- go.work.sum | 12 +++++++ plugins/caddy/e2e/docker/docker-compose.yml | 2 +- .../caddy/e2e/docker_swarm/docker-stack.yml | 2 +- plugins/nginx/e2e/docker/docker-compose.yml | 2 +- .../nginx/e2e/docker_swarm/docker-stack.yml | 2 +- .../e2e/kubernetes/manifests/deployment.yml | 2 +- plugins/nginx/e2e/kubernetes/run.sh | 2 +- plugins/proxywasm/Dockerfile | 2 +- plugins/proxywasm/Makefile | 2 +- .../e2e/apacheapisix/docker/compose.yaml | 2 +- .../proxywasm/e2e/apacheapisix/docker/run.sh | 2 +- .../proxywasm/e2e/envoy/docker/compose.yaml | 2 +- plugins/proxywasm/e2e/envoy/docker/run.sh | 2 +- .../istio/kubernetes/manifests/sablier.yml | 2 +- plugins/proxywasm/e2e/istio/kubernetes/run.sh | 6 ++-- plugins/proxywasm/e2e/nginx/Dockerfile | 4 +-- .../proxywasm/e2e/nginx/docker/compose.yaml | 2 +- plugins/proxywasm/e2e/nginx/docker/run.sh | 2 +- plugins/proxywasm/go.mod | 5 +-- plugins/proxywasm/go.sum | 33 +++---------------- plugins/traefik/README.md | 8 ++--- .../traefik/e2e/docker_swarm/docker-stack.yml | 2 +- .../e2e/kubernetes/manifests/deployment.yml | 2 +- plugins/traefik/e2e/kubernetes/run.sh | 4 +-- 33 files changed, 63 insertions(+), 77 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 7a13613..37bc39d 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -83,8 +83,8 @@ jobs: - name: Login to Docker Hub uses: docker/login-action@v3 with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} - name: Build and push by digest id: build @@ -158,8 +158,8 @@ jobs: - name: Login to Docker Hub uses: docker/login-action@v3 with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} - name: Create manifest list and push working-directory: /tmp/digests diff --git a/.github/workflows/dockerhub-description.yml b/.github/workflows/dockerhub-description.yml index 084d663..a596d07 100644 --- a/.github/workflows/dockerhub-description.yml +++ b/.github/workflows/dockerhub-description.yml @@ -10,6 +10,6 @@ jobs: - name: Docker Hub Description uses: peter-evans/dockerhub-description@v4 with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} short-description: ${{ github.event.repository.description }} \ No newline at end of file diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml index 0d44b3f..d4ef217 100644 --- a/.github/workflows/plugins.yml +++ b/.github/workflows/plugins.yml @@ -221,7 +221,7 @@ jobs: - name: Setup TinyGo uses: acifani/setup-tinygo@v2 with: - tinygo-version: '0.32.0' + tinygo-version: '0.33.0' - name: Build run: make proxywasm diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d8dbdcc..52387d5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,7 +29,7 @@ jobs: - name: Setup TinyGo uses: acifani/setup-tinygo@v2 with: - tinygo-version: '0.32.0' + tinygo-version: '0.33.0' - name: Release env: diff --git a/docs/getting-started.md b/docs/getting-started.md index 95d4944..a8080dc 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -43,7 +43,7 @@ services: - ./Caddyfile:/etc/caddy/Caddyfile:ro whoami: - image: sablierapp/whoami:v1.10.2 + image: acouvreur/whoami:v1.10.2 ``` #### **Caddyfile** @@ -75,7 +75,7 @@ services: - ./Caddyfile:/etc/caddy/Caddyfile:ro whoami: - image: sablierapp/whoami:v1.10.2 + image: acouvreur/whoami:v1.10.2 sablier: image: sablierapp/sablier:1.8.1-beta.22 @@ -110,7 +110,7 @@ services: - ./Caddyfile:/etc/caddy/Caddyfile:ro whoami: - image: sablierapp/whoami:v1.10.2 + image: acouvreur/whoami:v1.10.2 sablier: image: sablierapp/sablier:1.8.1-beta.22 @@ -139,7 +139,7 @@ services: - ./Caddyfile:/etc/caddy/Caddyfile:ro whoami: - image: sablierapp/whoami:v1.10.2 + image: acouvreur/whoami:v1.10.2 labels: - sablier.enable=true - sablier.group=demo diff --git a/docs/plugins/traefik.md b/docs/plugins/traefik.md index 8355161..b66e7b8 100644 --- a/docs/plugins/traefik.md +++ b/docs/plugins/traefik.md @@ -26,7 +26,7 @@ You have to use the dynamic config file provider instead. ```yaml whoami: - image: sablierapp/whoami:v1.10.2 + image: acouvreur/whoami:v1.10.2 labels: - traefik.enable - traefik.http.routers.whoami.rule=PathPrefix(`/whoami`) @@ -66,7 +66,7 @@ See also [`traefik.docker.lbswarm`](https://doc.traefik.io/traefik/routing/provi ```yaml services: whoami: - image: sablierapp/whoami:v1.10.2 + image: acouvreur/whoami:v1.10.2 deploy: replicas: 0 labels: diff --git a/docs/providers/docker.md b/docs/providers/docker.md index 2649cef..e999137 100644 --- a/docs/providers/docker.md +++ b/docs/providers/docker.md @@ -51,7 +51,7 @@ You have to register your containers by opting-in with labels. ```yaml services: whoami: - image: sablierapp/whoami:v1.10.2 + image: acouvreur/whoami:v1.10.2 labels: - sablier.enable=true - sablier.group=mygroup diff --git a/docs/providers/docker_swarm.md b/docs/providers/docker_swarm.md index d721df2..c8c99be 100644 --- a/docs/providers/docker_swarm.md +++ b/docs/providers/docker_swarm.md @@ -52,7 +52,7 @@ You have to register your services by opting-in with labels. ```yaml services: whoami: - image: sablierapp/whoami:v1.10.2 + image: acouvreur/whoami:v1.10.2 deploy: labels: - sablier.enable=true diff --git a/docs/providers/kubernetes.md b/docs/providers/kubernetes.md index f8a59f4..3de3f83 100644 --- a/docs/providers/kubernetes.md +++ b/docs/providers/kubernetes.md @@ -88,7 +88,7 @@ spec: spec: containers: - name: whoami - image: sablierapp/whoami:v1.10.2 + image: acouvreur/whoami:v1.10.2 ``` ## How does Sablier knows when a deployment is ready? diff --git a/go.work.sum b/go.work.sum index 40ba96a..3521d20 100644 --- a/go.work.sum +++ b/go.work.sum @@ -351,6 +351,8 @@ golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= +golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= +golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs= golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= @@ -366,6 +368,8 @@ golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= +golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= +golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -375,6 +379,8 @@ golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= +golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2 h1:IRJeR9r1pYWsHKTRe/IInb7lYvbBVIqOgsX/u0mbOWY= golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457 h1:zf5N6UOrA487eEFacMePxjXAJctxKmyjKUsjA11Uzuk= @@ -383,9 +389,13 @@ golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk= golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4= golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= +golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24= +golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= +golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg= golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= @@ -395,6 +405,8 @@ golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg= golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI= golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE= golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg= +golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= +golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= golang.zx2c4.com/wintun v0.0.0-20211104114900-415007cec224 h1:Ug9qvr1myri/zFN6xL17LSCBGFDnphBBhzmILHsM5TY= diff --git a/plugins/caddy/e2e/docker/docker-compose.yml b/plugins/caddy/e2e/docker/docker-compose.yml index 42b04c3..a77d16b 100644 --- a/plugins/caddy/e2e/docker/docker-compose.yml +++ b/plugins/caddy/e2e/docker/docker-compose.yml @@ -19,7 +19,7 @@ services: - '/var/run/docker.sock:/var/run/docker.sock' whoami: - image: sablierapp/whoami:v1.10.2 + image: acouvreur/whoami:v1.10.2 healthcheck: test: [ "CMD", "curl", "-f", "http://localhost" ] interval: 5s diff --git a/plugins/caddy/e2e/docker_swarm/docker-stack.yml b/plugins/caddy/e2e/docker_swarm/docker-stack.yml index 811ad9d..770934d 100644 --- a/plugins/caddy/e2e/docker_swarm/docker-stack.yml +++ b/plugins/caddy/e2e/docker_swarm/docker-stack.yml @@ -24,7 +24,7 @@ services: - '/var/run/docker.sock:/var/run/docker.sock' whoami: - image: sablierapp/whoami:v1.10.2 + image: acouvreur/whoami:v1.10.2 healthcheck: test: [ "CMD", "curl", "-f", "http://localhost" ] interval: 5s diff --git a/plugins/nginx/e2e/docker/docker-compose.yml b/plugins/nginx/e2e/docker/docker-compose.yml index 1177a05..744d04a 100644 --- a/plugins/nginx/e2e/docker/docker-compose.yml +++ b/plugins/nginx/e2e/docker/docker-compose.yml @@ -23,7 +23,7 @@ services: - '/var/run/docker.sock:/var/run/docker.sock' whoami: - image: sablierapp/whoami:v1.10.2 + image: acouvreur/whoami:v1.10.2 healthcheck: test: [ "CMD", "curl", "-f", "http://localhost" ] interval: 5s diff --git a/plugins/nginx/e2e/docker_swarm/docker-stack.yml b/plugins/nginx/e2e/docker_swarm/docker-stack.yml index 71e88db..9328122 100644 --- a/plugins/nginx/e2e/docker_swarm/docker-stack.yml +++ b/plugins/nginx/e2e/docker_swarm/docker-stack.yml @@ -26,7 +26,7 @@ services: - '/var/run/docker.sock:/var/run/docker.sock' whoami: - image: sablierapp/whoami:v1.10.2 + image: acouvreur/whoami:v1.10.2 healthcheck: test: [ "CMD", "curl", "-f", "http://localhost" ] interval: 5s diff --git a/plugins/nginx/e2e/kubernetes/manifests/deployment.yml b/plugins/nginx/e2e/kubernetes/manifests/deployment.yml index 6bd2ecc..ee3c723 100644 --- a/plugins/nginx/e2e/kubernetes/manifests/deployment.yml +++ b/plugins/nginx/e2e/kubernetes/manifests/deployment.yml @@ -18,7 +18,7 @@ spec: spec: containers: - name: whoami - image: sablierapp/whoami:v1.10.2 + image: acouvreur/whoami:v1.10.2 --- apiVersion: v1 kind: Service diff --git a/plugins/nginx/e2e/kubernetes/run.sh b/plugins/nginx/e2e/kubernetes/run.sh index ac08419..bc73380 100644 --- a/plugins/nginx/e2e/kubernetes/run.sh +++ b/plugins/nginx/e2e/kubernetes/run.sh @@ -45,7 +45,7 @@ run_kubernetes_deployment_test() { prepare_deployment sleep 10 go clean -testcache - if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/acouvreur/sablier/e2e; then + if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/sablierapp/sablier/e2e; then errors=1 kubectl -n kube-system logs deployments/sablier-deployment # kubectl -n kube-system logs deployments/nginx diff --git a/plugins/proxywasm/Dockerfile b/plugins/proxywasm/Dockerfile index 2c9aae2..5622d6a 100644 --- a/plugins/proxywasm/Dockerfile +++ b/plugins/proxywasm/Dockerfile @@ -1,6 +1,6 @@ FROM golang:1.23 AS build -ADD https://github.com/tinygo-org/tinygo/releases/download/v0.32.0/tinygo_0.32.0_amd64.deb tinygo_amd64.deb +ADD https://github.com/tinygo-org/tinygo/releases/download/v0.33.0/tinygo_0.33.0_amd64.deb tinygo_amd64.deb RUN dpkg -i tinygo_amd64.deb WORKDIR /go/src/sablier/plugins/proxywasm diff --git a/plugins/proxywasm/Makefile b/plugins/proxywasm/Makefile index de28a1c..ce434ff 100644 --- a/plugins/proxywasm/Makefile +++ b/plugins/proxywasm/Makefile @@ -3,4 +3,4 @@ build: tinygo build -o sablierproxywasm.wasm -scheduler=none -target=wasi ./ docker: - docker build -t acouvreur/sablier-proxy-wasm:latest . \ No newline at end of file + docker build -t sablierapp/sablier-proxy-wasm:latest . \ No newline at end of file diff --git a/plugins/proxywasm/e2e/apacheapisix/docker/compose.yaml b/plugins/proxywasm/e2e/apacheapisix/docker/compose.yaml index 70d50b8..54e7386 100644 --- a/plugins/proxywasm/e2e/apacheapisix/docker/compose.yaml +++ b/plugins/proxywasm/e2e/apacheapisix/docker/compose.yaml @@ -10,7 +10,7 @@ services: - "8080:9080/tcp" sablier: - image: acouvreur/sablier:local + image: sablierapp/sablier:local command: - start - --provider.name=docker diff --git a/plugins/proxywasm/e2e/apacheapisix/docker/run.sh b/plugins/proxywasm/e2e/apacheapisix/docker/run.sh index c51d3bd..90e470d 100644 --- a/plugins/proxywasm/e2e/apacheapisix/docker/run.sh +++ b/plugins/proxywasm/e2e/apacheapisix/docker/run.sh @@ -22,7 +22,7 @@ run_docker_classic_test() { prepare_docker_classic sleep 2 go clean -testcache - if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/acouvreur/sablier/e2e; then + if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/sablierapp/sablier/e2e; then errors=1 docker compose -f ${DOCKER_COMPOSE_FILE} -p ${DOCKER_COMPOSE_PROJECT_NAME} logs sablier apisix fi diff --git a/plugins/proxywasm/e2e/envoy/docker/compose.yaml b/plugins/proxywasm/e2e/envoy/docker/compose.yaml index 7769af9..92a174c 100644 --- a/plugins/proxywasm/e2e/envoy/docker/compose.yaml +++ b/plugins/proxywasm/e2e/envoy/docker/compose.yaml @@ -9,7 +9,7 @@ services: - "8080:8080" sablier: - image: acouvreur/sablier:local + image: sablierapp/sablier:local command: - start - --provider.name=docker diff --git a/plugins/proxywasm/e2e/envoy/docker/run.sh b/plugins/proxywasm/e2e/envoy/docker/run.sh index fcaaaf6..1095108 100644 --- a/plugins/proxywasm/e2e/envoy/docker/run.sh +++ b/plugins/proxywasm/e2e/envoy/docker/run.sh @@ -22,7 +22,7 @@ run_docker_classic_test() { prepare_docker_classic sleep 2 go clean -testcache - if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/acouvreur/sablier/e2e; then + if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/sablierapp/sablier/e2e; then errors=1 docker compose -f ${DOCKER_COMPOSE_FILE} -p ${DOCKER_COMPOSE_PROJECT_NAME} logs sablier envoy fi diff --git a/plugins/proxywasm/e2e/istio/kubernetes/manifests/sablier.yml b/plugins/proxywasm/e2e/istio/kubernetes/manifests/sablier.yml index f15c719..15a33de 100644 --- a/plugins/proxywasm/e2e/istio/kubernetes/manifests/sablier.yml +++ b/plugins/proxywasm/e2e/istio/kubernetes/manifests/sablier.yml @@ -23,7 +23,7 @@ spec: serviceAccountName: sablier containers: - name: sablier - image: acouvreur/sablier:local + image: sablierapp/sablier:local args: ["start", "--provider.name=kubernetes", "--logging.level=trace"] ports: - containerPort: 10000 diff --git a/plugins/proxywasm/e2e/istio/kubernetes/run.sh b/plugins/proxywasm/e2e/istio/kubernetes/run.sh index c9a5972..42ef008 100644 --- a/plugins/proxywasm/e2e/istio/kubernetes/run.sh +++ b/plugins/proxywasm/e2e/istio/kubernetes/run.sh @@ -13,8 +13,8 @@ docker version prepare_kubernetes() { docker compose -f $DOCKER_COMPOSE_FILE -p $DOCKER_COMPOSE_PROJECT_NAME up -d until kubectl get nodes | grep " Ready "; do sleep 1; done - echo "Loading acouvreur/sablier:local into k3s..." - docker save acouvreur/sablier:local | docker exec -i ${DOCKER_COMPOSE_PROJECT_NAME}-server-1 ctr images import - + echo "Loading sablierapp/sablier:local into k3s..." + docker save sablierapp/sablier:local | docker exec -i ${DOCKER_COMPOSE_PROJECT_NAME}-server-1 ctr images import - echo "Loading succeeded." } @@ -47,7 +47,7 @@ run_kubernetes_test() { prepare_manifests sleep 10 go clean -testcache - if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/acouvreur/sablier/e2e; then + if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/sablierapp/sablier/e2e; then errors=1 kubectl -n kube-system logs deployments/sablier-deployment # kubectl -n kube-system logs deployments/traefik TODO: Log istio diff --git a/plugins/proxywasm/e2e/nginx/Dockerfile b/plugins/proxywasm/e2e/nginx/Dockerfile index 20fa98a..b1ce6eb 100644 --- a/plugins/proxywasm/e2e/nginx/Dockerfile +++ b/plugins/proxywasm/e2e/nginx/Dockerfile @@ -1,6 +1,6 @@ -FROM ubuntu:24.04 +FROM ubuntu:24.10 -RUN apt update && apt install libatomic1 +RUN apt update && apt install -y libatomic1 ADD https://github.com/Kong/ngx_wasm_module/releases/download/prerelease-0.3.0/wasmx-prerelease-0.3.0-v8-x86_64-ubuntu22.04.tar.gz wasmx.tar.gz diff --git a/plugins/proxywasm/e2e/nginx/docker/compose.yaml b/plugins/proxywasm/e2e/nginx/docker/compose.yaml index bf4d116..b4c95df 100644 --- a/plugins/proxywasm/e2e/nginx/docker/compose.yaml +++ b/plugins/proxywasm/e2e/nginx/docker/compose.yaml @@ -10,7 +10,7 @@ services: - "8080:8080" sablier: - image: acouvreur/sablier:local + image: sablierapp/sablier:local command: - start - --provider.name=docker diff --git a/plugins/proxywasm/e2e/nginx/docker/run.sh b/plugins/proxywasm/e2e/nginx/docker/run.sh index 468409e..486699e 100644 --- a/plugins/proxywasm/e2e/nginx/docker/run.sh +++ b/plugins/proxywasm/e2e/nginx/docker/run.sh @@ -22,7 +22,7 @@ run_docker_classic_test() { prepare_docker_classic sleep 2 go clean -testcache - if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/acouvreur/sablier/e2e; then + if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/sablierapp/sablier/e2e; then errors=1 docker compose -f ${DOCKER_COMPOSE_FILE} -p ${DOCKER_COMPOSE_PROJECT_NAME} logs sablier reverseproxy fi diff --git a/plugins/proxywasm/go.mod b/plugins/proxywasm/go.mod index 6e658dc..2791f9f 100644 --- a/plugins/proxywasm/go.mod +++ b/plugins/proxywasm/go.mod @@ -2,7 +2,7 @@ module github.com/sablierapp/sablier/plugins/proxy-wasm go 1.22.0 -toolchain go1.23.2 +toolchain go1.22.3 require ( github.com/json-iterator/tinygo v0.0.0-20211221071957-84b5b690c8a0 @@ -15,8 +15,5 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/tetratelabs/wazero v1.7.2 // indirect - github.com/tidwall/gjson v1.17.1 // indirect - github.com/tidwall/match v1.1.1 // indirect - github.com/tidwall/pretty v1.2.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/plugins/proxywasm/go.sum b/plugins/proxywasm/go.sum index 99bcab1..6585b70 100644 --- a/plugins/proxywasm/go.sum +++ b/plugins/proxywasm/go.sum @@ -4,42 +4,19 @@ github.com/json-iterator/tinygo v0.0.0-20211221071957-84b5b690c8a0 h1:/cd98gHSKn github.com/json-iterator/tinygo v0.0.0-20211221071957-84b5b690c8a0/go.mod h1:sR5SXbtbtp8PxPu3yGjZug4AS5aAur8jQZl9DXYTpP0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/tetratelabs/proxy-wasm-go-sdk v0.23.0 h1:e0dm/ypyd1xudIrg8VTsd8dawuYaSy2gqewH5zD4rU8= -github.com/tetratelabs/proxy-wasm-go-sdk v0.23.0/go.mod h1:YqR8JZaY3Ev9ihXgjzAQAMkXEzPKKmy4Q5rsVWt4XGk= github.com/tetratelabs/proxy-wasm-go-sdk v0.24.0 h1:Xuwzknb4+OHBSYFXif0aBdV0F4MShL8L5YYFda9uUIs= github.com/tetratelabs/proxy-wasm-go-sdk v0.24.0/go.mod h1:niJQcnEDtftzrVC0/qqlSs2Kzr1dwb7VxpIPHBO2XXk= -github.com/tetratelabs/wazero v1.6.0 h1:z0H1iikCdP8t+q341xqepY4EWvHEw8Es7tlqiVzlP3g= -github.com/tetratelabs/wazero v1.6.0/go.mod h1:0U0G41+ochRKoPKCJlh0jMg1CHkyfK8kDqiirMmKY8A= github.com/tetratelabs/wazero v1.7.2 h1:1+z5nXJNwMLPAWaTePFi49SSTL0IMx/i3Fg8Yc25GDc= github.com/tetratelabs/wazero v1.7.2/go.mod h1:ytl6Zuh20R/eROuyDaGPkp82O9C/DJfXAwJfQ3X6/7Y= -github.com/tidwall/gjson v1.14.4/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= -github.com/tidwall/gjson v1.17.1 h1:wlYEnwqAHgzmhNUFfw7Xalt2JzQvsMx2Se4PcoFCT/U= -github.com/tidwall/gjson v1.17.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= -github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= -github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= -github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= -github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4= -github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= -golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f h1:99ci1mjWVBWwJiEKYY6jWa4d2nTQVIEhZIptnrVb1XY= -golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI= -golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY= -golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI= -golang.org/x/exp v0.0.0-20240707233637-46b078467d37 h1:uLDX+AfeFCct3a2C7uIWBKMJIR3CJMhcgfrUAqjRK6w= -golang.org/x/exp v0.0.0-20240707233637-46b078467d37/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= -golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= -golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= -golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa h1:ELnwvuAXPNtPk1TJRuGkI9fDTwym6AYBu0qzT8AcHdI= -golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= -golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 h1:kx6Ds3MlpiUHKj7syVnbp57++8WpuKPcR5yjLBjvLEA= -golang.org/x/exp v0.0.0-20240823005443-9b4947da3948/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= -golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e h1:I88y4caeGeuDQxgdoFPUq097j7kNfw6uvuiNxUBfcBk= -golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= +github.com/tetratelabs/wazero v1.8.1 h1:NrcgVbWfkWvVc4UtT4LRLDf91PsOzDzefMdwhLfA550= +github.com/tetratelabs/wazero v1.8.1/go.mod h1:yAI0XTsMBhREkM/YDAK/zNou3GoiAce1P6+rp/wQhjs= golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk= golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY= +golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c h1:7dEasQXItcW1xKJ2+gg5VOiBnqWrJc+rq0DPKyvvdbY= +golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c/go.mod h1:NQtJDoLvd6faHhE7m4T/1IY708gDefGGjR/iUW8yQQ8= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/plugins/traefik/README.md b/plugins/traefik/README.md index 9c64e9e..233d35c 100644 --- a/plugins/traefik/README.md +++ b/plugins/traefik/README.md @@ -71,7 +71,7 @@ services: - --entryPoints.http.address=:80 - --providers.docker=true - --providers.file.filename=/etc/traefik/dynamic-config.yml - - --experimental.plugins.sablier.moduleName=github.com/acouvreur/sablier/plugins/traefik + - --experimental.plugins.sablier.moduleName=github.com/sablierapp/sablier/plugins/traefik - --experimental.plugins.sablier.version=v1.8.1-beta.22 ports: - "8080:80" @@ -80,7 +80,7 @@ services: - './dynamic-config.yml:/etc/traefik/dynamic-config.yml' sablier: - image: acouvreur/sablier:1.8.0-beta.22 + image: sablierapp/sablier:1.8.0 command: - start - --provider.name=docker @@ -166,14 +166,14 @@ services: traefik: image: traefik:2.9.1 command: - - --experimental.localPlugins.sablier.moduleName=github.com/acouvreur/sablier + - --experimental.localPlugins.sablier.moduleName=github.com/sablierapp/sablier - --entryPoints.http.address=:80 - --providers.docker=true ports: - "8080:80" volumes: - '/var/run/docker.sock:/var/run/docker.sock' - - '../../..:/plugins-local/src/github.com/acouvreur/sablier' + - '../../..:/plugins-local/src/github.com/sablierapp/sablier' - './dynamic-config.yml:/etc/traefik/dynamic-config.yml' ``` diff --git a/plugins/traefik/e2e/docker_swarm/docker-stack.yml b/plugins/traefik/e2e/docker_swarm/docker-stack.yml index 0e46d6c..b88d2c7 100644 --- a/plugins/traefik/e2e/docker_swarm/docker-stack.yml +++ b/plugins/traefik/e2e/docker_swarm/docker-stack.yml @@ -62,7 +62,7 @@ services: - traefik.http.services.sablier.loadbalancer.server.port=10000 whoami: - image: sablierapp/whoami:v1.10.2 + image: acouvreur/whoami:v1.10.2 healthcheck: test: [ "CMD", "curl", "-f", "http://localhost" ] interval: 5s diff --git a/plugins/traefik/e2e/kubernetes/manifests/deployment.yml b/plugins/traefik/e2e/kubernetes/manifests/deployment.yml index ea03dd2..b655aad 100644 --- a/plugins/traefik/e2e/kubernetes/manifests/deployment.yml +++ b/plugins/traefik/e2e/kubernetes/manifests/deployment.yml @@ -18,7 +18,7 @@ spec: spec: containers: - name: whoami - image: sablierapp/whoami:v1.10.2 + image: acouvreur/whoami:v1.10.2 livenessProbe: httpGet: path: /health diff --git a/plugins/traefik/e2e/kubernetes/run.sh b/plugins/traefik/e2e/kubernetes/run.sh index e52c629..b80a97e 100644 --- a/plugins/traefik/e2e/kubernetes/run.sh +++ b/plugins/traefik/e2e/kubernetes/run.sh @@ -14,7 +14,7 @@ prepare_kubernetes() { docker compose -f $DOCKER_COMPOSE_FILE -p $DOCKER_COMPOSE_PROJECT_NAME up -d until kubectl get nodes | grep " Ready "; do sleep 1; done echo "Loading sablierapp/sablier:local into k3s..." - docker save acouvreur/sablier:local | docker exec -i ${DOCKER_COMPOSE_PROJECT_NAME}-server-1 ctr images import - + docker save sablierapp/sablier:local | docker exec -i ${DOCKER_COMPOSE_PROJECT_NAME}-server-1 ctr images import - echo "Loading succeeded." } @@ -51,7 +51,7 @@ run_kubernetes_deployment_test() { prepare_deployment sleep 10 go clean -testcache - if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/acouvreur/sablier/e2e; then + if ! go test -count=1 -tags e2e -timeout 30s -run ^${1}$ github.com/sablierapp/sablier/e2e; then errors=1 kubectl -n kube-system logs deployments/sablier-deployment kubectl -n kube-system logs deployments/traefik