Skip to content

Commit ca4dd7a

Browse files
spikecurtisspikecurtis
committed
chore: remove legacy wsconncache
1 parent 4dc08bc commit ca4dd7a

23 files changed

+34
-1252
lines changed

‎.vscode/settings.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@
170170
"workspaceapps",
171171
"workspacebuilds",
172172
"workspacename",
173-
"wsconncache",
174173
"wsjson",
175174
"xerrors",
176175
"xlarge",

‎agent/agent.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -869,11 +869,7 @@ func (a *agent) run(ctx context.Context) error {
869869
func (a *agent) wireguardAddresses(agentID uuid.UUID) []netip.Prefix {
870870
if len(a.addresses) == 0 {
871871
return []netip.Prefix{
872-
// This is the IP that should be used primarily.
873872
netip.PrefixFrom(tailnet.IPFromUUID(agentID), 128),
874-
// We also listen on the legacy codersdk.WorkspaceAgentIP. This
875-
// allows for a transition away from wsconncache.
876-
netip.PrefixFrom(codersdk.WorkspaceAgentIP, 128),
877873
}
878874
}
879875

‎coderd/apidoc/docs.go

Lines changed: 0 additions & 49 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

Lines changed: 0 additions & 45 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/coderd.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ import (
6565
"github.com/coder/coder/v2/coderd/updatecheck"
6666
"github.com/coder/coder/v2/coderd/util/slice"
6767
"github.com/coder/coder/v2/coderd/workspaceapps"
68-
"github.com/coder/coder/v2/coderd/wsconncache"
6968
"github.com/coder/coder/v2/codersdk"
7069
"github.com/coder/coder/v2/codersdk/drpc"
7170
"github.com/coder/coder/v2/provisionerd/proto"
@@ -481,7 +480,6 @@ func New(options *Options) *API {
481480
func(context.Context) (tailnet.MultiAgentConn, error) {
482481
return (*api.TailnetCoordinator.Load()).ServeMultiAgent(uuid.New()), nil
483482
},
484-
wsconncache.New(api._dialWorkspaceAgentTailnet, 0),
485483
api.TracerProvider,
486484
)
487485
if err != nil {

‎coderd/tailnet.go

Lines changed: 13 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"cdr.dev/slog"
2323
"github.com/coder/coder/v2/coderd/tracing"
2424
"github.com/coder/coder/v2/coderd/workspaceapps"
25-
"github.com/coder/coder/v2/coderd/wsconncache"
2625
"github.com/coder/coder/v2/codersdk"
2726
"github.com/coder/coder/v2/site"
2827
"github.com/coder/coder/v2/tailnet"
@@ -41,16 +40,14 @@ func init() {
4140

4241
var _ workspaceapps.AgentProvider = (*ServerTailnet)(nil)
4342

44-
// NewServerTailnet creates a new tailnet intended for use by coderd. It
45-
// automatically falls back to wsconncache if a legacy agent is encountered.
43+
// NewServerTailnet creates a new tailnet intended for use by coderd.
4644
func NewServerTailnet(
4745
ctx context.Context,
4846
logger slog.Logger,
4947
derpServer *derp.Server,
5048
derpMapFn func() *tailcfg.DERPMap,
5149
derpForceWebSockets bool,
5250
getMultiAgent func(context.Context) (tailnet.MultiAgentConn, error),
53-
cache *wsconncache.Cache,
5451
traceProvider trace.TracerProvider,
5552
) (*ServerTailnet, error) {
5653
logger = logger.Named("servertailnet")
@@ -97,7 +94,6 @@ func NewServerTailnet(
9794
conn: conn,
9895
coordinatee: conn,
9996
getMultiAgent: getMultiAgent,
100-
cache: cache,
10197
agentConnectionTimes: map[uuid.UUID]time.Time{},
10298
agentTickets: map[uuid.UUID]map[uuid.UUID]struct{}{},
10399
transport: tailnetTransport.Clone(),
@@ -299,7 +295,6 @@ type ServerTailnet struct {
299295

300296
getMultiAgent func(context.Context) (tailnet.MultiAgentConn, error)
301297
agentConn atomic.Pointer[tailnet.MultiAgentConn]
302-
cache *wsconncache.Cache
303298
nodesMu sync.Mutex
304299
// agentConnectionTimes is a map of agent tailnetNodes the server wants to
305300
// keep a connection to. It contains the last time the agent was connected
@@ -311,7 +306,7 @@ type ServerTailnet struct {
311306
transport *http.Transport
312307
}
313308

314-
func (s *ServerTailnet) ReverseProxy(targetURL, dashboardURL *url.URL, agentID uuid.UUID) (_ *httputil.ReverseProxy, release func(), _ error) {
309+
func (s *ServerTailnet) ReverseProxy(targetURL, dashboardURL *url.URL, agentID uuid.UUID) *httputil.ReverseProxy {
315310
proxy := httputil.NewSingleHostReverseProxy(targetURL)
316311
proxy.ErrorHandler = func(w http.ResponseWriter, r *http.Request, err error) {
317312
site.RenderStaticErrorPage(w, r, site.ErrorPageData{
@@ -325,7 +320,7 @@ func (s *ServerTailnet) ReverseProxy(targetURL, dashboardURL *url.URL, agentID u
325320
proxy.Director = s.director(agentID, proxy.Director)
326321
proxy.Transport = s.transport
327322

328-
return proxy, func() {}, nil
323+
return proxy
329324
}
330325

331326
type agentIDKey struct{}
@@ -387,28 +382,17 @@ func (s *ServerTailnet) AgentConn(ctx context.Context, agentID uuid.UUID) (*code
387382
ret func()
388383
)
389384

390-
if s.getAgentConn().AgentIsLegacy(agentID) {
391-
s.logger.Debug(s.ctx, "acquiring legacy agent", slog.F("agent_id", agentID))
392-
cconn, release, err := s.cache.Acquire(agentID)
393-
if err != nil {
394-
return nil, nil, xerrors.Errorf("acquire legacy agent conn: %w", err)
395-
}
396-
397-
conn = cconn.WorkspaceAgentConn
398-
ret = release
399-
} else {
400-
s.logger.Debug(s.ctx, "acquiring agent", slog.F("agent_id", agentID))
401-
err := s.ensureAgent(agentID)
402-
if err != nil {
403-
return nil, nil, xerrors.Errorf("ensure agent: %w", err)
404-
}
405-
ret = s.acquireTicket(agentID)
406-
407-
conn = codersdk.NewWorkspaceAgentConn(s.conn, codersdk.WorkspaceAgentConnOptions{
408-
AgentID: agentID,
409-
CloseFunc: func() error { return codersdk.ErrSkipClose },
410-
})
385+
s.logger.Debug(s.ctx, "acquiring agent", slog.F("agent_id", agentID))
386+
err := s.ensureAgent(agentID)
387+
if err != nil {
388+
return nil, nil, xerrors.Errorf("ensure agent: %w", err)
411389
}
390+
ret = s.acquireTicket(agentID)
391+
392+
conn = codersdk.NewWorkspaceAgentConn(s.conn, codersdk.WorkspaceAgentConnOptions{
393+
AgentID: agentID,
394+
CloseFunc: func() error { return codersdk.ErrSkipClose },
395+
})
412396

413397
// Since we now have an open conn, be careful to close it if we error
414398
// without returning it to the user.
@@ -458,7 +442,6 @@ func (c *netConnCloser) Close() error {
458442

459443
func (s *ServerTailnet) Close() error {
460444
s.cancel()
461-
_ = s.cache.Close()
462445
_ = s.conn.Close()
463446
s.transport.CloseIdleConnections()
464447
<-s.derpMapUpdaterClosed

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy