diff --git a/go.mod b/go.mod index d93b33bc8b..5bb5c7082e 100644 --- a/go.mod +++ b/go.mod @@ -81,7 +81,6 @@ require ( github.com/go-sql-driver/mysql v1.4.1 github.com/golangplus/testing v1.0.0 // indirect github.com/google/cadvisor v0.39.0 - github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2 github.com/google/uuid v1.2.0 github.com/gorilla/mux v1.8.0 github.com/gorilla/websocket v1.4.2 @@ -117,6 +116,7 @@ require ( golang.org/x/sys v0.0.0-20210426230700-d19ff857e887 google.golang.org/grpc v1.37.0 gopkg.in/yaml.v2 v2.4.0 + inet.af/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252 k8s.io/api v0.21.2 k8s.io/apimachinery v0.21.2 k8s.io/apiserver v0.21.2 diff --git a/go.sum b/go.sum index 9b8a918539..568c187d66 100644 --- a/go.sum +++ b/go.sum @@ -427,8 +427,6 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= -github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2 h1:AtvtonGEH/fZK0XPNNBdB6swgy7Iudfx88wzyIpwqJ8= -github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2/go.mod h1:DavVbd41y+b7ukKDmlnPR4nGYmkWXR6vHUkjQNiHPBs= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -501,6 +499,8 @@ github.com/imdario/mergo v0.3.8 h1:CGgOkSJeqMRmt0D9XLWExdT4m4F1vd3FV3VPt+0VxkQ= github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +inet.af/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252 h1:gmJCKidOfjKDUHF1jjke+I+2iQIyE3HNNxu2OKO/FUI= +inet.af/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252/go.mod h1:zq+R+tLcdHugi7Jt+FtIQY6m6wtX34lr2CdQVH2fhW0= github.com/insomniacslk/dhcp v0.0.0-20210120172423-cc9239ac6294/go.mod h1:TKl4jN3Voofo4UJIicyNhWGp/nlQqQkFxmwIFTvBkKI= github.com/ishidawataru/sctp v0.0.0-20190723014705-7c296d48a2b5/go.mod h1:DM4VvS+hD/kDi1U1QsX2fnZowwBhqD0Dk3bRPKF/Oc8= github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA= diff --git a/pkg/agent/loadbalancer/loadbalancer.go b/pkg/agent/loadbalancer/loadbalancer.go index 39dec7ef68..6e648ffba0 100644 --- a/pkg/agent/loadbalancer/loadbalancer.go +++ b/pkg/agent/loadbalancer/loadbalancer.go @@ -8,9 +8,9 @@ import ( "strconv" "sync" - "github.com/google/tcpproxy" "github.com/rancher/k3s/pkg/version" "github.com/sirupsen/logrus" + "inet.af/tcpproxy" ) type LoadBalancer struct { diff --git a/vendor/github.com/google/tcpproxy/README.md b/vendor/github.com/google/tcpproxy/README.md deleted file mode 100644 index 374f52c9ee..0000000000 --- a/vendor/github.com/google/tcpproxy/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# tcpproxy - -For library usage, see https://godoc.org/github.com/google/tcpproxy/ - -For CLI usage, see https://github.com/google/tcpproxy/blob/master/cmd/tlsrouter/README.md diff --git a/vendor/github.com/google/tcpproxy/.gitignore b/vendor/inet.af/tcpproxy/.gitignore similarity index 100% rename from vendor/github.com/google/tcpproxy/.gitignore rename to vendor/inet.af/tcpproxy/.gitignore diff --git a/vendor/github.com/google/tcpproxy/.travis.yml b/vendor/inet.af/tcpproxy/.travis.yml similarity index 95% rename from vendor/github.com/google/tcpproxy/.travis.yml rename to vendor/inet.af/tcpproxy/.travis.yml index 9c94088fa3..56aafcbe73 100644 --- a/vendor/github.com/google/tcpproxy/.travis.yml +++ b/vendor/inet.af/tcpproxy/.travis.yml @@ -1,6 +1,7 @@ language: go go: -- 1.8 +- "1.12" +- "1.13" - tip os: - linux @@ -17,7 +18,7 @@ script: jobs: include: - stage: deploy - go: 1.8 + go: "1.13" install: - gem install fpm script: @@ -27,7 +28,7 @@ jobs: --vendor "David Anderson " --maintainer "David Anderson " --description "TLS SNI router" - --url "https://github.com/google/tlsrouter" + --url "https://github.com/inetaf/tcpproxy/tree/master/cmd/tlsrouter" ./tlsrouter=/usr/bin/tlsrouter ./systemd/tlsrouter.service=/lib/systemd/system/tlsrouter.service deploy: diff --git a/vendor/github.com/google/tcpproxy/CONTRIBUTING.md b/vendor/inet.af/tcpproxy/CONTRIBUTING.md similarity index 100% rename from vendor/github.com/google/tcpproxy/CONTRIBUTING.md rename to vendor/inet.af/tcpproxy/CONTRIBUTING.md diff --git a/vendor/github.com/google/tcpproxy/LICENSE b/vendor/inet.af/tcpproxy/LICENSE similarity index 100% rename from vendor/github.com/google/tcpproxy/LICENSE rename to vendor/inet.af/tcpproxy/LICENSE diff --git a/vendor/inet.af/tcpproxy/README.md b/vendor/inet.af/tcpproxy/README.md new file mode 100644 index 0000000000..f526c213a9 --- /dev/null +++ b/vendor/inet.af/tcpproxy/README.md @@ -0,0 +1,5 @@ +# tcpproxy + +For library usage, see https://godoc.org/inet.af/tcpproxy/ + +For CLI usage, see https://github.com/inetaf/tcpproxy/blob/master/cmd/tlsrouter/README.md diff --git a/vendor/github.com/google/tcpproxy/http.go b/vendor/inet.af/tcpproxy/http.go similarity index 100% rename from vendor/github.com/google/tcpproxy/http.go rename to vendor/inet.af/tcpproxy/http.go diff --git a/vendor/github.com/google/tcpproxy/listener.go b/vendor/inet.af/tcpproxy/listener.go similarity index 100% rename from vendor/github.com/google/tcpproxy/listener.go rename to vendor/inet.af/tcpproxy/listener.go diff --git a/vendor/github.com/google/tcpproxy/sni.go b/vendor/inet.af/tcpproxy/sni.go similarity index 100% rename from vendor/github.com/google/tcpproxy/sni.go rename to vendor/inet.af/tcpproxy/sni.go diff --git a/vendor/github.com/google/tcpproxy/tcpproxy.go b/vendor/inet.af/tcpproxy/tcpproxy.go similarity index 100% rename from vendor/github.com/google/tcpproxy/tcpproxy.go rename to vendor/inet.af/tcpproxy/tcpproxy.go diff --git a/vendor/modules.txt b/vendor/modules.txt index e39bb4852b..511623a855 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -616,9 +616,6 @@ github.com/google/go-containerregistry/pkg/name github.com/google/gofuzz # github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 github.com/google/shlex -# github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2 -## explicit -github.com/google/tcpproxy # github.com/google/uuid v1.2.0 ## explicit github.com/google/uuid @@ -1446,6 +1443,9 @@ gopkg.in/warnings.v0 gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b gopkg.in/yaml.v3 +# inet.af/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252 +## explicit +inet.af/tcpproxy # k8s.io/api v0.21.2 => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.21.2-k3s1 ## explicit k8s.io/api/admission/v1