Skip to content

Commit 68dc03b

Browse files
thallgrenthallgren
authored
Merge pull request #4026 from telepresenceio/thallgren/update-deps
Upgrade module dependencies.
2 parents 1bea4fa + 0301f02 commit 68dc03b

File tree

36 files changed

+511
-506
lines changed

36 files changed

+511
-506
lines changed

‎DEPENDENCIES.md‎

Lines changed: 52 additions & 51 deletions
Large diffs are not rendered by default.

‎build-aux/maintenance.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ update-dependencies: $(dir $(shell find . -name go.mod))
88
) || \
99
go get -u .);\
1010
done
11-
$(MAKE) clobber check-unit generate
11+
$(MAKE) clobber generate check-unit
1212

‎build-aux/tools.mk‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -81,29 +81,29 @@ $(TOOLSDIR)/$(PROTOLINT_TGZ):
8181
# ==========
8282
#
8383
tools/test-report = $(TOOLSBINDIR)/test-report$(EXE)
84-
$(TOOLSBINDIR)/test-report$(EXE): $(TOOLSSRCDIR)/test-report/*.go $(TOOLSSRCDIR)/test-report/go.*
85-
cd $(<D) && go mod tidy && GOOS= GOARCH= go build -o $(abspath $@) *.go
84+
$(TOOLSBINDIR)/test-report$(EXE): $(TOOLSSRCDIR)/test-report/*.go $(TOOLSSRCDIR)/test-report/go.* $(TOOLSSRCDIR)/test-report/go.sum
85+
cd $(<D) && GOOS= GOARCH= go build -o $(abspath $@) *.go
8686

8787
# TOC generator
8888
# ==========
8989
#
9090
tools/tocgen = $(TOOLSBINDIR)/tocgen$(EXE)
9191
$(TOOLSBINDIR)/tocgen$(EXE): $(TOOLSSRCDIR)/tocgen/*.go
92-
cd $(<D) && go mod tidy && GOOS= GOARCH= go build -o $(abspath $@) *.go
92+
cd $(<D) && GOOS= GOARCH= go build -o $(abspath $@) *.go
9393

9494
# Release Notes generator
9595
# ==========
9696
#
9797
tools/relnotesgen = $(TOOLSBINDIR)/relnotesgen$(EXE)
98-
$(TOOLSBINDIR)/relnotesgen$(EXE): $(TOOLSSRCDIR)/relnotesgen/**/*.go $(TOOLSSRCDIR)/relnotesgen/relnotes/relnotes.*
99-
(cd $(TOOLSSRCDIR)/relnotesgen && go mod tidy && GOOS= GOARCH= go build) && mv $(TOOLSSRCDIR)/relnotesgen/relnotesgen $(TOOLSBINDIR)
98+
$(TOOLSBINDIR)/relnotesgen$(EXE): $(TOOLSSRCDIR)/relnotesgen/**/*.go $(TOOLSSRCDIR)/relnotesgen/relnotes/relnotes.* $(TOOLSSRCDIR)/relnotesgen/go.sum
99+
(cd $(TOOLSSRCDIR)/relnotesgen && GOOS= GOARCH= go build) && mv $(TOOLSSRCDIR)/relnotesgen/relnotesgen $(TOOLSBINDIR)
100100

101101
# YAML to JSON
102102
# ==========
103103
#
104104
tools/y2j = $(TOOLSBINDIR)/y2j$(EXE)
105-
$(TOOLSBINDIR)/y2j$(EXE): $(TOOLSSRCDIR)/y2j/*
106-
(cd $(TOOLSSRCDIR)/y2j && go mod tidy && GOOS= GOARCH= go build) && mv $(TOOLSSRCDIR)/y2j/y2j $(TOOLSBINDIR)
105+
$(TOOLSBINDIR)/y2j$(EXE): $(TOOLSSRCDIR)/y2j/*.go $(TOOLSSRCDIR)/y2j/go.sum
106+
(cd $(TOOLSSRCDIR)/y2j && GOOS= GOARCH= go build) && mv $(TOOLSSRCDIR)/y2j/y2j $(TOOLSBINDIR)
107107

108108
# Shellcheck
109109
# ==========
@@ -151,7 +151,11 @@ $(TOOLSDIR)/$(notdir $(HELM_TGZ)):
151151
# avoid them polluting our main go.mod file.
152152
tools/protoc-gen-go = $(TOOLSBINDIR)/protoc-gen-go$(EXE)
153153
tools/protoc-gen-go-grpc = $(TOOLSBINDIR)/protoc-gen-go-grpc$(EXE)
154-
tools/ko = $(TOOLSBINDIR)/ko$(EXE)
155154
tools/go-mkopensource = $(TOOLSBINDIR)/go-mkopensource$(EXE)
156-
$(TOOLSBINDIR)/%$(EXE): $(TOOLSSRCDIR)/%/go.mod $(TOOLSSRCDIR)/%/pin.go
157-
cd $(<D) && go mod tidy && GOOS= GOARCH= go build -o $(abspath $@) $$(sed -En 's,^import "(.*)".*,\1,p' pin.go)
155+
tools/test-report = $(TOOLSBINDIR)/test-report$(EXE)
156+
tools/y2j = $(TOOLSBINDIR)/y2j$(EXE)
157+
$(TOOLSBINDIR)/%$(EXE): $(TOOLSSRCDIR)/%/go.sum $(TOOLSSRCDIR)/%/pin.go
158+
cd $(<D) && GOOS= GOARCH= go build -o $(abspath $@) $$(sed -En 's,^import "(.*)".*,\1,p' pin.go)
159+
160+
$(TOOLSSRCDIR)/%/go.sum: $(TOOLSSRCDIR)/%/go.mod
161+
cd $(<D) && go mod tidy

‎cmd/teleroute/go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ require (
77
github.com/docker/go-plugins-helpers v0.0.0-20240701071450-45e2431495c8
88
github.com/puzpuzpuz/xsync/v4 v4.2.0
99
github.com/sirupsen/logrus v1.9.3
10-
github.com/telepresenceio/telepresence/rpc/v2 v2.25.0
11-
google.golang.org/grpc v1.76.0
12-
google.golang.org/protobuf v1.36.10
10+
github.com/telepresenceio/telepresence/rpc/v2 v2.25.2
11+
google.golang.org/grpc v1.78.0
12+
google.golang.org/protobuf v1.36.11
1313
)
1414

1515
require (
1616
github.com/Microsoft/go-winio v0.6.2 // indirect
1717
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
1818
github.com/docker/go-connections v0.6.0 // indirect
19-
golang.org/x/net v0.46.0 // indirect
20-
golang.org/x/sys v0.38.0 // indirect
21-
golang.org/x/text v0.30.0 // indirect
22-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251110190251-83f479183930 // indirect
19+
golang.org/x/net v0.48.0 // indirect
20+
golang.org/x/sys v0.39.0 // indirect
21+
golang.org/x/text v0.32.0 // indirect
22+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b // indirect
2323
)
2424

2525
replace github.com/telepresenceio/telepresence/rpc/v2 => ./rpc

‎cmd/teleroute/go.sum‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -30,33 +30,33 @@ github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVs
3030
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
3131
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
3232
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
33-
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
34-
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
35-
go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ=
36-
go.opentelemetry.io/otel v1.37.0/go.mod h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I=
37-
go.opentelemetry.io/otel/metric v1.37.0 h1:mvwbQS5m0tbmqML4NqK+e3aDiO02vsf/WgbsdpcPoZE=
38-
go.opentelemetry.io/otel/metric v1.37.0/go.mod h1:04wGrZurHYKOc+RKeye86GwKiTb9FKm1WHtO+4EVr2E=
39-
go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI=
40-
go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg=
41-
go.opentelemetry.io/otel/sdk/metric v1.37.0 h1:90lI228XrB9jCMuSdA0673aubgRobVZFhbjxHHspCPc=
42-
go.opentelemetry.io/otel/sdk/metric v1.37.0/go.mod h1:cNen4ZWfiD37l5NhS+Keb5RXVWZWpRE+9WyVCpbo5ps=
43-
go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4=
44-
go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=
45-
golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
46-
golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
33+
go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
34+
go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
35+
go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=
36+
go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM=
37+
go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA=
38+
go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI=
39+
go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E=
40+
go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg=
41+
go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM=
42+
go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA=
43+
go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE=
44+
go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
45+
golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
46+
golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
4747
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
48-
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
49-
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
50-
golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
51-
golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
48+
golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
49+
golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
50+
golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
51+
golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
5252
gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
5353
gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
54-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251110190251-83f479183930 h1:tK4fkUnnRhig9TsTp4otV1FxwBFYgbKUq1RY0V6KZ4U=
55-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251110190251-83f479183930/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
56-
google.golang.org/grpc v1.76.0 h1:UnVkv1+uMLYXoIz6o7chp59WfQUYA2ex/BXQ9rHZu7A=
57-
google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c=
58-
google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
59-
google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
54+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b h1:Mv8VFug0MP9e5vUxfBcE3vUkV6CImK3cMNMIDFjmzxU=
55+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ=
56+
google.golang.org/grpc v1.78.0 h1:K1XZG/yGDJnzMdd/uZHAkVqJE+xIDOcmdSFZkBUicNc=
57+
google.golang.org/grpc v1.78.0/go.mod h1:I47qjTo4OKbMkjA/aOOwxDIiPSBofUtQUI5EfpWvW7U=
58+
google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
59+
google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
6060
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
6161
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
6262
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎cmd/traffic/cmd/agent/agent.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
"github.com/datawire/dlib/dgroup"
2525
"github.com/datawire/dlib/dlog"
26-
ftp "github.com/datawire/go-ftpserver"
26+
ftp "github.com/telepresenceio/go-ftpserver"
2727
"github.com/telepresenceio/telepresence/rpc/v2/agent"
2828
rpc "github.com/telepresenceio/telepresence/rpc/v2/manager"
2929
"github.com/telepresenceio/telepresence/v2/pkg/agentconfig"

‎cmd/traffic/cmd/manager/state/state.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ func NewState(ctx context.Context, g *dgroup.Group) *State {
107107
intercepts: cache.NewMap[string, *Intercept](interceptEqual, 5*time.Millisecond, xsync.WithGrowOnly()),
108108
agents: cache.NewMap[tunnel.SessionID, *AgentSession](agentsEqual, 5*time.Millisecond, xsync.WithGrowOnly()),
109109
clients: xsync.NewMap[tunnel.SessionID, *ClientSession](xsync.WithGrowOnly()),
110-
workloadWatchers: xsync.NewMap[string, workload.Watcher](xsync.WithGrowOnly()),
110+
workloadWatchers: xsync.NewMap[string, Watcher](xsync.WithGrowOnly()),
111111
timedLogLevel: log.NewTimedLevel(loglevel, log.SetLevel),
112112
llSubs: newLoglevelSubscribers(),
113113
}

0 commit comments

Comments
 (0)