From 7ecdd63ff284ac99cc82979b91ba7d3ca146df9d Mon Sep 17 00:00:00 2001 From: Leonardo Parente <23251360+leoparente@users.noreply.github.com> Date: Wed, 18 Dec 2024 11:52:25 -0300 Subject: [PATCH 1/3] chore: add extra-hosts to docker compose dev env to proper work on linux (#206) --- diode-server/docker/docker-compose.dev.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/diode-server/docker/docker-compose.dev.yaml b/diode-server/docker/docker-compose.dev.yaml index 29379ace..c34b6740 100644 --- a/diode-server/docker/docker-compose.dev.yaml +++ b/diode-server/docker/docker-compose.dev.yaml @@ -1,5 +1,8 @@ name: ${PROJECT_NAME:-diode} services: + diode-reconciler: + extra_hosts: + - "host.docker.internal:host-gateway" redis-commander: hostname: redis-commander image: ghcr.io/joeferner/redis-commander:latest From be6422d2db83e6555c236f24377ed332fa343c94 Mon Sep 17 00:00:00 2001 From: Michal Fiedorowicz Date: Thu, 19 Dec 2024 11:03:46 +0000 Subject: [PATCH 2/3] chore: bump golang.org/x/* (#207) Signed-off-by: Michal Fiedorowicz --- diode-server/go.mod | 4 ++-- diode-server/go.sum | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/diode-server/go.mod b/diode-server/go.mod index e551ed36..ba08939f 100644 --- a/diode-server/go.mod +++ b/diode-server/go.mod @@ -49,11 +49,11 @@ require ( github.com/yuin/gopher-lua v1.1.1 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/crypto v0.31.0 // indirect - golang.org/x/net v0.30.0 // indirect + golang.org/x/net v0.33.0 // indirect golang.org/x/sync v0.10.0 // indirect golang.org/x/sys v0.28.0 // indirect golang.org/x/text v0.21.0 // indirect - golang.org/x/tools v0.22.0 // indirect + golang.org/x/tools v0.28.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240513163218-0867130af1f8 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect diff --git a/diode-server/go.sum b/diode-server/go.sum index 1ca9ba18..272ba161 100644 --- a/diode-server/go.sum +++ b/diode-server/go.sum @@ -103,6 +103,8 @@ golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= 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/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -114,6 +116,8 @@ golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA= golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c= +golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8= +golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw= google.golang.org/genproto/googleapis/rpc v0.0.0-20240513163218-0867130af1f8 h1:mxSlqyb8ZAHsYDCfiXN1EDdNTdvjUJSLY+OnAUtYNYA= google.golang.org/genproto/googleapis/rpc v0.0.0-20240513163218-0867130af1f8/go.mod h1:I7Y+G38R2bu5j1aLzfFmQfTcU/WnFuqDwLZAbvKTKpM= google.golang.org/grpc v1.64.1 h1:LKtvyfbX3UGVPFcGqJ9ItpVWW6oN/2XqTxfAnwRRXiA= From b0f19efc72084fb4e2e9e53aaa8208985c2c196f Mon Sep 17 00:00:00 2001 From: Michal Fiedorowicz Date: Thu, 19 Dec 2024 11:09:02 +0000 Subject: [PATCH 3/3] chore: update CODEOWNERS (#208) Signed-off-by: Michal Fiedorowicz --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 47b67088..ab07f99b 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @leoparente @mfiedorowicz +* @leoparente @ltucker @mfiedorowicz