From dca812526323164d9580a782f38c1d46bd38ddec Mon Sep 17 00:00:00 2001 From: Spike Curtis Date: Tue, 5 Dec 2023 14:30:19 +0400 Subject: [PATCH] fix: update tailscale to include fix to prevent race (#11032) fixes #10876 --- go.mod | 2 +- go.sum | 4 ++-- helm/provisioner/charts/libcoder-0.1.0.tgz | Bin 3012 -> 3013 bytes 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2ff6929199..4dce6f3687 100644 --- a/go.mod +++ b/go.mod @@ -33,7 +33,7 @@ replace github.com/dlclark/regexp2 => github.com/dlclark/regexp2 v1.7.0 // There are a few minor changes we make to Tailscale that we're slowly upstreaming. Compare here: // https://github.com/tailscale/tailscale/compare/main...coder:tailscale:main -replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20231106123012-ba3acaa26275 +replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20231205095743-61c97bad8c8b // Fixes a race-condition in coder/wgtunnel. // Upstream PR: https://github.com/WireGuard/wireguard-go/pull/85 diff --git a/go.sum b/go.sum index 5fb0330ea4..47c63ca870 100644 --- a/go.sum +++ b/go.sum @@ -232,8 +232,8 @@ github.com/coder/retry v1.5.1 h1:iWu8YnD8YqHs3XwqrqsjoBTAVqT9ml6z9ViJ2wlMiqc= github.com/coder/retry v1.5.1/go.mod h1:blHMk9vs6LkoRT9ZHyuZo360cufXEhrxqvEzeMtRGoY= github.com/coder/ssh v0.0.0-20231128192721-70855dedb788 h1:YoUSJ19E8AtuUFVYBpXuOD6a/zVP3rcxezNsoDseTUw= github.com/coder/ssh v0.0.0-20231128192721-70855dedb788/go.mod h1:aGQbuCLyhRLMzZF067xc84Lh7JDs1FKwCmF1Crl9dxQ= -github.com/coder/tailscale v1.1.1-0.20231106123012-ba3acaa26275 h1:FhaWxLBGCPaX6+0yRy98OrmsDK6mr/jvwBilCW42otE= -github.com/coder/tailscale v1.1.1-0.20231106123012-ba3acaa26275/go.mod h1:L8tPrwSi31RAMEMV8rjb0vYTGs7rXt8rAHbqY/p41j4= +github.com/coder/tailscale v1.1.1-0.20231205095743-61c97bad8c8b h1:ut/aL6oI8TjGdg4JI8+bKB9w5j73intbe0dJAmcmYyQ= +github.com/coder/tailscale v1.1.1-0.20231205095743-61c97bad8c8b/go.mod h1:L8tPrwSi31RAMEMV8rjb0vYTGs7rXt8rAHbqY/p41j4= github.com/coder/terraform-provider-coder v0.12.2 h1:KsnJLHyTtELvV1Rzkm75iCQ7npXjL0KcoU3NTreagZU= github.com/coder/terraform-provider-coder v0.12.2/go.mod h1:+BHer8AX5Y0QqZS9viau+ZkDTaOCOE3ga1lx1QIJDrk= github.com/coder/wgtunnel v0.1.13-0.20231127054351-578bfff9b92a h1:KhR9LUVllMZ+e9lhubZ1HNrtJDgH5YLoTvpKwmrGag4= diff --git a/helm/provisioner/charts/libcoder-0.1.0.tgz b/helm/provisioner/charts/libcoder-0.1.0.tgz index 136a99f3a01de3de6a0513d238ca94f04c2e959e..939508140df952a07a34051605d05484d4dcaea4 100644 GIT binary patch delta 2875 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 Z_3%7A4^Q*?PXGV_|Nn3`zybg|005GuyJP?W delta 2874 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