Skip to content

Commit fe94f3c

Browse files
coadlercoadler
committed
chore: upgrade tailscale
1 parent fff2b1d commit fe94f3c

File tree

4 files changed

+108
-442
lines changed

4 files changed

+108
-442
lines changed

‎coderd/healthcheck/derp.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func (r *DERPReport) Run(ctx context.Context, opts *DERPReportOptions) {
9999
r.mu.Unlock()
100100
}
101101
nc := &netcheck.Client{
102-
PortMapper: portmapper.NewClient(tslogger.WithPrefix(ncLogf, "portmap: "), nil),
102+
PortMapper: portmapper.NewClient(tslogger.WithPrefix(ncLogf, "portmap: "), nil, nil),
103103
Logf: tslogger.WithPrefix(ncLogf, "netcheck: "),
104104
}
105105
r.Netcheck, r.NetcheckErr = nc.GetReport(ctx, opts.DERPMap)

‎go.mod

+27-18
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ replace github.com/dlclark/regexp2 => github.com/dlclark/regexp2 v1.7.0
3636

3737
// There are a few minor changes we make to Tailscale that we're slowly upstreaming. Compare here:
3838
// https://github.com/tailscale/tailscale/compare/main...coder:tailscale:main
39-
replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20230418202606-ed9307cf1b22
39+
replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20230419174344-108bab9314c6
4040

4141
// Switch to our fork that imports fixes from http://github.com/tailscale/ssh.
4242
// See: https://github.com/coder/coder/issues/3371
@@ -90,7 +90,7 @@ require (
9090
github.com/go-chi/httprate v0.7.1
9191
github.com/go-chi/render v1.0.1
9292
github.com/go-jose/go-jose/v3 v3.0.0
93-
github.com/go-logr/logr v1.2.3
93+
github.com/go-logr/logr v1.2.4
9494
github.com/go-ping/ping v1.1.0
9595
github.com/go-playground/validator/v10 v10.12.0
9696
github.com/gofrs/flock v0.8.1
@@ -120,15 +120,15 @@ require (
120120
github.com/mitchellh/mapstructure v1.5.0
121121
github.com/moby/moby v20.10.23+incompatible
122122
github.com/muesli/reflow v0.3.0
123-
github.com/open-policy-agent/opa v0.44.0
123+
github.com/open-policy-agent/opa v0.51.0
124124
github.com/ory/dockertest/v3 v3.9.1
125125
github.com/pion/udp v0.1.2
126126
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
127127
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e
128128
github.com/pkg/sftp v1.13.6-0.20221018182125-7da137aa03f0
129129
github.com/prometheus/client_golang v1.14.0
130130
github.com/prometheus/client_model v0.3.0
131-
github.com/prometheus/common v0.40.0
131+
github.com/prometheus/common v0.41.0
132132
github.com/quasilyte/go-ruleguard/dsl v0.3.21
133133
github.com/robfig/cron/v3 v3.0.1
134134
github.com/spf13/afero v1.9.3
@@ -154,20 +154,20 @@ require (
154154
go4.org/netipx v0.0.0-20220725152314-7e7bdc8411bf
155155
golang.org/x/crypto v0.7.0
156156
golang.org/x/exp v0.0.0-20221205204356-47842c84f3db
157-
golang.org/x/mod v0.8.0
157+
golang.org/x/mod v0.9.0
158158
golang.org/x/oauth2 v0.5.0
159159
golang.org/x/sync v0.1.0
160160
golang.org/x/sys v0.7.0
161161
golang.org/x/term v0.6.0
162-
golang.org/x/tools v0.6.0
162+
golang.org/x/tools v0.7.0
163163
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2
164164
golang.zx2c4.com/wireguard v0.0.0-20230223181233-21636207a675
165165
google.golang.org/api v0.108.0
166-
google.golang.org/grpc v1.53.0
167-
google.golang.org/protobuf v1.28.2-0.20230118093459-a9481185b34d
166+
google.golang.org/grpc v1.54.0
167+
google.golang.org/protobuf v1.30.0
168168
gopkg.in/natefinch/lumberjack.v2 v2.0.0
169169
gopkg.in/yaml.v3 v3.0.1
170-
gvisor.dev/gvisor v0.0.0-20221203005347-703fd9b7fbc0
170+
gvisor.dev/gvisor v0.0.0-20230328175328-162ed5ef888d
171171
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
172172
nhooyr.io/websocket v1.8.7
173173
storj.io/drpc v0.0.33-0.20220622181519-9206537a4db7
@@ -191,6 +191,18 @@ require (
191191
github.com/alexbrainman/sspi v0.0.0-20210105120005-909beea2cc74 // indirect
192192
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
193193
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
194+
github.com/aws/aws-sdk-go-v2 v1.17.3 // indirect
195+
github.com/aws/aws-sdk-go-v2/config v1.11.0 // indirect
196+
github.com/aws/aws-sdk-go-v2/credentials v1.6.4 // indirect
197+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.8.2 // indirect
198+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.27 // indirect
199+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.21 // indirect
200+
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.2 // indirect
201+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.5.2 // indirect
202+
github.com/aws/aws-sdk-go-v2/service/ssm v1.35.0 // indirect
203+
github.com/aws/aws-sdk-go-v2/service/sso v1.6.2 // indirect
204+
github.com/aws/aws-sdk-go-v2/service/sts v1.11.1 // indirect
205+
github.com/aws/smithy-go v1.13.5 // indirect
194206
github.com/aymanbagabas/go-osc52 v1.2.1 // indirect
195207
github.com/aymerick/douceur v0.2.0 // indirect
196208
github.com/beorn7/perks v1.0.1 // indirect
@@ -204,7 +216,6 @@ require (
204216
github.com/containerd/continuity v0.3.0 // indirect
205217
github.com/coreos/go-iptables v0.6.0 // indirect
206218
github.com/davecgh/go-spew v1.1.1 // indirect
207-
github.com/dgraph-io/badger/v3 v3.2103.5 // indirect
208219
github.com/dlclark/regexp2 v1.8.1 // indirect
209220
github.com/docker/cli v20.10.17+incompatible // indirect
210221
github.com/docker/docker v20.10.24+incompatible // indirect
@@ -230,7 +241,7 @@ require (
230241
github.com/gogo/protobuf v1.3.2 // indirect
231242
github.com/golang/glog v1.0.0 // indirect
232243
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
233-
github.com/golang/protobuf v1.5.2 // indirect
244+
github.com/golang/protobuf v1.5.3 // indirect
234245
github.com/google/btree v1.1.2 // indirect
235246
github.com/google/flatbuffers v23.1.21+incompatible // indirect
236247
github.com/google/go-cmp v0.5.9 // indirect
@@ -255,11 +266,11 @@ require (
255266
github.com/illarion/gonotify v1.0.1 // indirect
256267
github.com/imdario/mergo v0.3.13 // indirect
257268
github.com/insomniacslk/dhcp v0.0.0-20221215072855-de60144f33f8 // indirect
269+
github.com/jmespath/go-jmespath v0.4.0 // indirect
258270
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect
259271
github.com/josharian/intern v1.0.0 // indirect
260272
github.com/josharian/native v1.1.1-0.20230202152459-5c7d0dd6ab86 // indirect
261273
github.com/jsimonetti/rtnetlink v1.1.2-0.20220408201609-d380b505068b // indirect
262-
github.com/json-iterator/go v1.1.12 // indirect
263274
github.com/juju/errors v1.0.0 // indirect
264275
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
265276
github.com/kortschak/wol v0.0.0-20200729010619-da482cc4850a // indirect
@@ -273,9 +284,9 @@ require (
273284
github.com/mattn/go-sqlite3 v1.14.15 // indirect
274285
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
275286
github.com/mdlayher/genetlink v1.2.0 // indirect
276-
github.com/mdlayher/netlink v1.6.2 // indirect
287+
github.com/mdlayher/netlink v1.7.1 // indirect
277288
github.com/mdlayher/sdnotify v1.0.0 // indirect
278-
github.com/mdlayher/socket v0.2.3 // indirect
289+
github.com/mdlayher/socket v0.4.0 // indirect
279290
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
280291
github.com/microcosm-cc/bluemonday v1.0.23 // indirect
281292
github.com/miekg/dns v1.1.45 // indirect
@@ -284,16 +295,14 @@ require (
284295
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
285296
github.com/mitchellh/reflectwalk v1.0.2 // indirect
286297
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
287-
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
288-
github.com/modern-go/reflect2 v1.0.2 // indirect
289298
github.com/muesli/ansi v0.0.0-20221106050444-61f0cd9a192a // indirect
290299
github.com/muesli/cancelreader v0.2.2 // indirect
291300
github.com/muesli/termenv v0.14.0 // indirect
292301
github.com/niklasfasching/go-org v1.6.5 // indirect
293302
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
294303
github.com/olekukonko/tablewriter v0.0.5 // indirect
295304
github.com/opencontainers/go-digest v1.0.0 // indirect
296-
github.com/opencontainers/image-spec v1.0.3-0.20220114050600-8b9d41f48198 // indirect
305+
github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
297306
github.com/opencontainers/runc v1.1.5 // indirect
298307
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
299308
github.com/pion/transport v0.14.1 // indirect
@@ -312,7 +321,7 @@ require (
312321
github.com/tailscale/golang-x-crypto v0.0.0-20221102133106-bc99ab8c2d17 // indirect
313322
github.com/tailscale/goupnp v1.0.1-0.20210804011211-c64d0f06ea05 // indirect
314323
github.com/tailscale/netlink v1.1.1-0.20211101221916-cabfb018fe85 // indirect
315-
github.com/tailscale/wireguard-go v0.0.0-20221219190806-4fa124729667 // indirect
324+
github.com/tailscale/wireguard-go v0.0.0-20230410165232-af172621b4dd // indirect
316325
github.com/tchap/go-patricia/v2 v2.3.1 // indirect
317326
github.com/tcnksm/go-httpstat v0.2.0 // indirect
318327
github.com/tdewolff/parse/v2 v2.6.4 // indirect

0 commit comments

Comments
 (0)