From ea89d76a46ed74225c8ecc641a3b6721c2028aae Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Thu, 11 May 2023 19:13:00 +0200 Subject: [PATCH 1/2] fix: use mtojek/gvisor to tweak RTO --- go.mod | 8 ++++---- go.sum | 6 ++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index fed0d2b11cd01..9a1617fccdcee 100644 --- a/go.mod +++ b/go.mod @@ -50,6 +50,8 @@ replace github.com/gliderlabs/ssh => github.com/coder/ssh v0.0.0-20230421140225- // Waiting on https://github.com/imulab/go-scim/pull/95 to merge. replace github.com/imulab/go-scim/pkg/v2 => github.com/coder/go-scim/pkg/v2 v2.0.0-20230221055123-1d63c1222136 +replace gvisor.dev/gvisor => github.com/mtojek/gvisor v0.0.0-20230511160450-8d30a6641e53 + require ( cdr.dev/slog v1.4.2 cloud.google.com/go/compute/metadata v0.2.3 @@ -87,6 +89,7 @@ require ( github.com/gliderlabs/ssh v0.3.4 github.com/go-chi/chi v1.5.4 github.com/go-chi/chi/v5 v5.0.7 + github.com/go-chi/cors v1.2.1 github.com/go-chi/httprate v0.7.1 github.com/go-chi/render v1.0.1 github.com/go-jose/go-jose/v3 v3.0.0 @@ -174,10 +177,7 @@ require ( tailscale.com v1.32.2 ) -require ( - github.com/armon/go-radix v1.0.0 // indirect - github.com/go-chi/cors v1.2.1 // indirect -) +require github.com/armon/go-radix v1.0.0 // indirect require ( cloud.google.com/go/compute v1.18.0 // indirect diff --git a/go.sum b/go.sum index 46c7093b28a0c..c45cefbb2d7ee 100644 --- a/go.sum +++ b/go.sum @@ -1283,6 +1283,8 @@ github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= +github.com/mtojek/gvisor v0.0.0-20230511160450-8d30a6641e53 h1:4/bqSMwS7+L+Pjhuv5dTrWnrLs2Pfo5thR49mmispig= +github.com/mtojek/gvisor v0.0.0-20230511160450-8d30a6641e53/go.mod h1:Dn5idtptoW1dIos9U6A2rpebLs/MtTwFacjKb8jLdQA= github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b/go.mod h1:fQuZ0gauxyBcmsdE3ZT4NasjaRdxmbCS0jRHsrWu3Ho= github.com/muesli/ansi v0.0.0-20221106050444-61f0cd9a192a h1:jlDOeO5TU0pYlbc/y6PFguab5IjANI0Knrpg3u/ton4= github.com/muesli/ansi v0.0.0-20221106050444-61f0cd9a192a/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo= @@ -2537,8 +2539,6 @@ gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= gotest.tools/v3 v3.1.0/go.mod h1:fHy7eyTmJFO5bQbUsEGQ1v4m2J3Jz9eWL54TP2/ZuYQ= gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= -gvisor.dev/gvisor v0.0.0-20221203005347-703fd9b7fbc0 h1:Wobr37noukisGxpKo5jAsLREcpj61RxrWYzD8uwveOY= -gvisor.dev/gvisor v0.0.0-20221203005347-703fd9b7fbc0/go.mod h1:Dn5idtptoW1dIos9U6A2rpebLs/MtTwFacjKb8jLdQA= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -2636,7 +2636,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZa sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= software.sslmate.com/src/go-pkcs12 v0.2.0 h1:nlFkj7bTysH6VkC4fGphtjXRbezREPgrHuJG20hBGPE= -storj.io/drpc v0.0.33-0.20220622181519-9206537a4db7 h1:6jIp39oQGZMjfrG3kiafK2tcL0Fbprh2kvaoJNfhvuM= -storj.io/drpc v0.0.33-0.20220622181519-9206537a4db7/go.mod h1:6rcOyR/QQkSTX/9L5ZGtlZaE2PtXTTZl8d+ulSeeYEg= storj.io/drpc v0.0.33-0.20230420154621-9716137f6037 h1:SYRl2YUthhsXNkrP30KwxkDGN9TESdNrbpr14rOxsnM= storj.io/drpc v0.0.33-0.20230420154621-9716137f6037/go.mod h1:vR804UNzhBa49NOJ6HeLjd2H3MakC1j5Gv8bsOQT6N4= From 9cdc1319d10cff2a52e74b96da152f5d8602b95a Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Fri, 12 May 2023 11:53:47 +0200 Subject: [PATCH 2/2] fix --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9a1617fccdcee..dde31a4eabc55 100644 --- a/go.mod +++ b/go.mod @@ -50,7 +50,7 @@ replace github.com/gliderlabs/ssh => github.com/coder/ssh v0.0.0-20230421140225- // Waiting on https://github.com/imulab/go-scim/pull/95 to merge. replace github.com/imulab/go-scim/pkg/v2 => github.com/coder/go-scim/pkg/v2 v2.0.0-20230221055123-1d63c1222136 -replace gvisor.dev/gvisor => github.com/mtojek/gvisor v0.0.0-20230511160450-8d30a6641e53 +replace gvisor.dev/gvisor => github.com/mtojek/gvisor v0.0.0-20230512095222-5d9248648316 require ( cdr.dev/slog v1.4.2 diff --git a/go.sum b/go.sum index c45cefbb2d7ee..6baa580260ed2 100644 --- a/go.sum +++ b/go.sum @@ -1283,8 +1283,8 @@ github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= -github.com/mtojek/gvisor v0.0.0-20230511160450-8d30a6641e53 h1:4/bqSMwS7+L+Pjhuv5dTrWnrLs2Pfo5thR49mmispig= -github.com/mtojek/gvisor v0.0.0-20230511160450-8d30a6641e53/go.mod h1:Dn5idtptoW1dIos9U6A2rpebLs/MtTwFacjKb8jLdQA= +github.com/mtojek/gvisor v0.0.0-20230512095222-5d9248648316 h1:hEnxYQU0E0OVICOtInxN8YzqPpvxhBJeiUndfbiL6ho= +github.com/mtojek/gvisor v0.0.0-20230512095222-5d9248648316/go.mod h1:Dn5idtptoW1dIos9U6A2rpebLs/MtTwFacjKb8jLdQA= github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b/go.mod h1:fQuZ0gauxyBcmsdE3ZT4NasjaRdxmbCS0jRHsrWu3Ho= github.com/muesli/ansi v0.0.0-20221106050444-61f0cd9a192a h1:jlDOeO5TU0pYlbc/y6PFguab5IjANI0Knrpg3u/ton4= github.com/muesli/ansi v0.0.0-20221106050444-61f0cd9a192a/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=