From ee61739914397ca83633364c666bb5cd90c8881b Mon Sep 17 00:00:00 2001 From: mloiseleur Date: Fri, 27 Sep 2024 09:56:26 +0000 Subject: [PATCH] chore: update tutorials --- WALKTHROUGH.md | 8 +++---- api-gateway/1-getting-started/README.md | 8 +++---- api-management/1-getting-started/README.md | 6 +++--- tests/apigateway/apigateway_test.go | 2 +- tests/go.mod | 4 ++-- tests/go.sum | 25 +++++++++++----------- tests/testhelpers/containers.go | 10 ++++----- tests/walkthrough/walkthrough_test.go | 6 +++--- 8 files changed, 34 insertions(+), 35 deletions(-) diff --git a/WALKTHROUGH.md b/WALKTHROUGH.md index 715e690..c66a273 100644 --- a/WALKTHROUGH.md +++ b/WALKTHROUGH.md @@ -71,7 +71,7 @@ helm repo add --force-update traefik https://traefik.github.io/charts kubectl create namespace traefik # Install the Helm chart helm install traefik -n traefik --wait \ - --version v31.1.1 \ + --version v32.0.0 \ --set ingressClass.enabled=false \ --set ingressRoute.dashboard.enabled=true \ --set ingressRoute.dashboard.matchRule='Host(`dashboard.docker.localhost`)' \ @@ -262,12 +262,12 @@ Then, upgrade Traefik Proxy to Traefik Hub using the same Helm chart: ```shell helm upgrade traefik -n traefik --wait \ - --version v31.1.1 \ + --version v32.0.0 \ --reuse-values \ --set hub.token=traefik-hub-license \ --set image.registry=ghcr.io \ --set image.repository=traefik/traefik-hub \ - --set image.tag=v3.4.1 \ + --set image.tag=v3.5.0 \ traefik/traefik ``` @@ -392,7 +392,7 @@ First, we enable API Management on Traefik Traefik Hub using the same Helm chart ```shell helm upgrade traefik -n traefik --wait \ - --version v31.1.1 \ + --version v32.0.0 \ --reuse-values \ --set hub.apimanagement.enabled=true \ traefik/traefik diff --git a/api-gateway/1-getting-started/README.md b/api-gateway/1-getting-started/README.md index fa86044..e1bc387 100644 --- a/api-gateway/1-getting-started/README.md +++ b/api-gateway/1-getting-started/README.md @@ -89,7 +89,7 @@ Install Traefik Hub API Gateway using Helm: helm repo add --force-update traefik https://traefik.github.io/charts # Install the Helm chart helm install traefik -n traefik --wait \ - --version v31.1.1 \ + --version v32.0.0 \ --set hub.token=traefik-hub-license \ --set ingressClass.enabled=false \ --set ingressRoute.dashboard.enabled=true \ @@ -97,7 +97,7 @@ helm install traefik -n traefik --wait \ --set ingressRoute.dashboard.entryPoints={web} \ --set image.registry=ghcr.io \ --set image.repository=traefik/traefik-hub \ - --set image.tag=v3.4.1 \ + --set image.tag=v3.5.0 \ --set ports.web.nodePort=30000 \ --set ports.websecure.nodePort=30001 \ traefik/traefik @@ -119,7 +119,7 @@ helm upgrade traefik -n traefik --wait \ --set ingressRoute.dashboard.entryPoints={web} \ --set image.registry=ghcr.io \ --set image.repository=traefik/traefik-hub \ - --set image.tag=v3.4.1 \ + --set image.tag=v3.5.0 \ --set ports.web.nodePort=30000 \ --set ports.websecure.nodePort=30001 \ traefik/traefik @@ -553,7 +553,7 @@ sudo usermod -aG docker traefik-hub sudo systemctl restart traefik-hub.service ``` -Now we can test the service with a simple [docker compose](linux/docker-compose.yaml) file: +Now we can test the service with a [docker compose](linux/docker-compose.yaml) file: ```shell sudo docker-compose -f $(pwd)/api-gateway/1-getting-started/linux/docker-compose.yaml up -d diff --git a/api-management/1-getting-started/README.md b/api-management/1-getting-started/README.md index 14d1423..baa1b51 100644 --- a/api-management/1-getting-started/README.md +++ b/api-management/1-getting-started/README.md @@ -82,7 +82,7 @@ Now, install Traefik Hub with Helm: helm repo add --force-update traefik https://traefik.github.io/charts # Install the Helm chart helm install traefik -n traefik --wait \ - --version v31.1.1 \ + --version v32.0.0 \ --set hub.token=traefik-hub-license \ --set hub.apimanagement.enabled=true \ --set ingressClass.enabled=false \ @@ -91,7 +91,7 @@ helm install traefik -n traefik --wait \ --set ingressRoute.dashboard.entryPoints={web} \ --set image.registry=ghcr.io \ --set image.repository=traefik/traefik-hub \ - --set image.tag=v3.4.1 \ + --set image.tag=v3.5.0 \ --set ports.web.nodePort=30000 \ --set ports.websecure.nodePort=30001 \ traefik/traefik @@ -114,7 +114,7 @@ helm upgrade traefik -n traefik --wait \ --set ingressRoute.dashboard.entryPoints={web} \ --set image.registry=ghcr.io \ --set image.repository=traefik/traefik-hub \ - --set image.tag=v3.4.1 \ + --set image.tag=v3.5.0 \ --set ports.web.nodePort=30000 \ --set ports.websecure.nodePort=30001 \ traefik/traefik diff --git a/tests/apigateway/apigateway_test.go b/tests/apigateway/apigateway_test.go index 8eb1bc6..56bfa15 100644 --- a/tests/apigateway/apigateway_test.go +++ b/tests/apigateway/apigateway_test.go @@ -139,7 +139,7 @@ func (s *APIGatewayTestSuite) TestSecureApplications() { var req *http.Request s.apply("src/manifests/hydra.yaml") - err = testhelpers.WaitForPodReady(s.ctx, s.T(), s.k8s, 90*time.Second, "app=hydra") + err = testhelpers.WaitForPodReady(s.ctx, s.T(), s.k8s, 120*time.Second, "app=hydra") s.Require().NoError(err) err = testhelpers.WaitForPodReady(s.ctx, s.T(), s.k8s, 90*time.Second, "app=consent") s.Require().NoError(err) diff --git a/tests/go.mod b/tests/go.mod index 893c2c8..06e585e 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -8,7 +8,7 @@ require ( github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.33.0 github.com/testcontainers/testcontainers-go/modules/k3s v0.33.0 - github.com/traefik/traefik/v3 v3.1.2 + github.com/traefik/traefik/v3 v3.1.4 k8s.io/api v0.31.0 k8s.io/apimachinery v0.31.0 k8s.io/client-go v0.31.0 @@ -82,7 +82,7 @@ require ( go.opentelemetry.io/otel/metric v1.30.0 // indirect go.opentelemetry.io/otel/trace v1.30.0 // indirect golang.org/x/crypto v0.27.0 // indirect - golang.org/x/net v0.28.0 // indirect + golang.org/x/net v0.29.0 // indirect golang.org/x/oauth2 v0.22.0 // indirect golang.org/x/sys v0.25.0 // indirect golang.org/x/term v0.24.0 // indirect diff --git a/tests/go.sum b/tests/go.sum index cb31d11..e96a4e9 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -53,7 +53,6 @@ github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4= github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -69,8 +68,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 h1:FKHo8hFI3A+7w0aUQuYXQ+6EN5stWmeY/AZqtM8xk9k= -github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= +github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134 h1:c5FlPPgxOn7kJz3VoPLkQYQXGBS3EklQ4Zfi57uOuqQ= +github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0= @@ -126,8 +125,8 @@ github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7P github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= -github.com/onsi/ginkgo/v2 v2.20.0 h1:PE84V2mHqoT1sglvHc8ZdQtPcwmvvt29WLEEO3xmdZw= -github.com/onsi/ginkgo/v2 v2.20.0/go.mod h1:lG9ey2Z29hR41WMVthyJBGUBcBhGOtoPF2VFMvBXFCI= +github.com/onsi/ginkgo/v2 v2.20.2 h1:7NVCeyIWROIAheY21RLS+3j2bb52W0W82tkberYytp4= +github.com/onsi/ginkgo/v2 v2.20.2/go.mod h1:K9gyxPIlb+aIvnZ8bd9Ak+YP18w3APlR+5coaZoE2ag= github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k= github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= @@ -169,8 +168,8 @@ github.com/tklauser/go-sysconf v0.3.14 h1:g5vzr9iPFFz24v2KZXs/pvpvh8/V9Fw6vQK5ZZ github.com/tklauser/go-sysconf v0.3.14/go.mod h1:1ym4lWMLUOhuBOPGtRcJm7tEGX4SCYNEEEtghGG/8uY= github.com/tklauser/numcpus v0.8.0 h1:Mx4Wwe/FjZLeQsK/6kt2EOepwwSl7SmJrK5bV/dXYgY= github.com/tklauser/numcpus v0.8.0/go.mod h1:ZJZlAY+dmR4eut8epnzf0u/VwodKmryxR8txiloSqBE= -github.com/traefik/traefik/v3 v3.1.2 h1:/jurlYE25dfr/miXYaoPcmAOytN+53XA7Xyp1a/rVeQ= -github.com/traefik/traefik/v3 v3.1.2/go.mod h1:L1LIJA7uS5Mkbbbdpl56vLv3ge3SEPr5PT7nBaTiMhs= +github.com/traefik/traefik/v3 v3.1.4 h1:mdQZPTYySnvEmegwK0iyggljQdSGhz6Y93HV/5Z4Oh8= +github.com/traefik/traefik/v3 v3.1.4/go.mod h1:xIgf0iO2/ZjlTvjXeP//PUe2iIDLuhcpoC4nd4c47ew= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -202,16 +201,16 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= 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/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-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk= +golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= -golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= +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/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA= golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -243,8 +242,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= -golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= +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/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/tests/testhelpers/containers.go b/tests/testhelpers/containers.go index 751f165..8e6c49b 100644 --- a/tests/testhelpers/containers.go +++ b/tests/testhelpers/containers.go @@ -92,7 +92,7 @@ func InstallTraefikProxy(ctx context.Context, t *testing.T, k8s client.Client) ( assert.NoError(t, err) LaunchHelmCommand(t, "install", "traefik", "-n", traefikNamespace, "--wait", - "--version", "v31.1.1", + "--version", "v32.0.0", "--set", "ingressClass.enabled=false", "--set", "ingressRoute.dashboard.enabled=true", "--set", "ingressRoute.dashboard.matchRule='Host(`dashboard.docker.localhost`)'", @@ -116,7 +116,7 @@ func InstallTraefikHubAPIGW(ctx context.Context, t *testing.T, k8s client.Client CreateSecretForTraefikHub(ctx, t, k8s) LaunchHelmCommand(t, "install", "traefik", "-n", traefikNamespace, "--wait", - "--version", "v31.1.1", + "--version", "v32.0.0", "--set", "hub.token=traefik-hub-license", "--set", "ingressClass.enabled=false", "--set", "ingressRoute.dashboard.enabled=true", @@ -124,7 +124,7 @@ func InstallTraefikHubAPIGW(ctx context.Context, t *testing.T, k8s client.Client "--set", "ingressRoute.dashboard.entryPoints={web}", "--set", "image.registry=ghcr.io", "--set", "image.repository=traefik/traefik-hub", - "--set", "image.tag=v3.4.1", + "--set", "image.tag=v3.5.0", "--set", "ports.web.nodePort=30000", "--set", "ports.websecure.nodePort=30001", "traefik/traefik") @@ -144,7 +144,7 @@ func InstallTraefikHubAPIM(ctx context.Context, t *testing.T, k8s client.Client) CreateSecretForTraefikHub(ctx, t, k8s) LaunchHelmCommand(t, "install", "traefik", "-n", traefikNamespace, "--wait", - "--version", "v31.1.1", + "--version", "v32.0.0", "--set", "hub.token=traefik-hub-license", "--set", "hub.apimanagement.enabled=true", "--set", "ingressClass.enabled=false", @@ -153,7 +153,7 @@ func InstallTraefikHubAPIM(ctx context.Context, t *testing.T, k8s client.Client) "--set", "ingressRoute.dashboard.entryPoints={web}", "--set", "image.registry=ghcr.io", "--set", "image.repository=traefik/traefik-hub", - "--set", "image.tag=v3.4.1", + "--set", "image.tag=v3.5.0", "--set", "ports.web.nodePort=30000", "--set", "ports.websecure.nodePort=30001", "traefik/traefik") diff --git a/tests/walkthrough/walkthrough_test.go b/tests/walkthrough/walkthrough_test.go index 492c7d6..6b86226 100644 --- a/tests/walkthrough/walkthrough_test.go +++ b/tests/walkthrough/walkthrough_test.go @@ -120,12 +120,12 @@ func (s *WalkthroughTestSuite) TestWalkthrough() { // STEP 2 testhelpers.CreateSecretForTraefikHub(s.ctx, s.T(), s.k8s) testhelpers.LaunchHelmCommand(s.T(), "upgrade", "traefik", "-n", "traefik", "--wait", - "--version", "v31.1.1", + "--version", "v32.0.0", "--reuse-values", "--set", "hub.token=traefik-hub-license", "--set", "image.registry=ghcr.io", "--set", "image.repository=traefik/traefik-hub", - "--set", "image.tag=v3.4.1", + "--set", "image.tag=v3.5.0", "traefik/traefik") req, err = http.NewRequest(http.MethodGet, "http://walkthrough.docker.localhost/basic-auth/weather", nil) @@ -150,7 +150,7 @@ func (s *WalkthroughTestSuite) TestWalkthrough() { // STEP 3 testhelpers.LaunchHelmCommand(s.T(), "upgrade", "traefik", "-n", "traefik", "--wait", - "--version", "v31.1.1", + "--version", "v32.0.0", "--reuse-values", "--set", "hub.apimanagement.enabled=true", "traefik/traefik")