Skip to content

Commit

Permalink
build: Update gvisor-tap-vsock go module
Browse files Browse the repository at this point in the history 
Better to have containers/gvisor-tap-vsock#338
in as otherwise `inet.af/tcpproxy` is an indirect crc dependency, and
this module is no longer available.

Signed-off-by: Christophe Fergeau <[email protected]>
  • Loading branch information
@cfergeau @anjannath
cfergeau authored and anjannath committed Apr 1, 2024
1 parent 7b901a1 commit f22e901
Show file tree
Hide file tree
Showing 18 changed files with 29 additions and 29 deletions.
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
github.com/cavaliergopher/grab/v3 v3.0.1
github.com/cheggaaa/pb/v3 v3.1.5
github.com/containers/gvisor-tap-vsock v0.7.3
github.com/containers/gvisor-tap-vsock v0.7.4-0.20240320091526-a0238e52b61f
github.com/containers/image/v5 v5.30.0
github.com/coreos/go-systemd/v22 v22.5.0
github.com/crc-org/admin-helper v0.5.2
Expand Down Expand Up @@ -129,6 +129,7 @@ require (
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/inetaf/tcpproxy v0.0.0-20240214030015-3ce58045626c // indirect
github.com/insomniacslk/dhcp v0.0.0-20220504074936-1ca156eafb9f // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
Expand Down Expand Up @@ -200,7 +201,6 @@ require (
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gvisor.dev/gvisor v0.0.0-20231023213702-2691a8f9b1cf // indirect
inet.af/tcpproxy v0.0.0-20231102063150-2862066fc2a9 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ github.com/cheggaaa/pb/v3 v3.1.5/go.mod h1:CrxkeghYTXi1lQBEI7jSn+3svI3cuc19haAj6
github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
github.com/containers/gvisor-tap-vsock v0.7.3 h1:yORnf15sP+sLFhxLNLgmB5/lOhldn9dRMHx/tmYtSOQ=
github.com/containers/gvisor-tap-vsock v0.7.3/go.mod h1:NI1fLMtKXQZoDrrOeqryGz7x7j/XSFWRmQILva7Fu9c=
github.com/containers/gvisor-tap-vsock v0.7.4-0.20240320091526-a0238e52b61f h1:NOq4UwN3M4rvN44CPznCqQlOvim7Ja1RZ082ORAJjVQ=
github.com/containers/gvisor-tap-vsock v0.7.4-0.20240320091526-a0238e52b61f/go.mod h1:hZrvqbYhTIUQCREov+M8u7sMhzGbB6umiDuVpnwtJcI=
github.com/containers/image/v5 v5.30.0 h1:CmHeSwI6W2kTRWnUsxATDFY5TEX4b58gPkaQcEyrLIA=
github.com/containers/image/v5 v5.30.0/go.mod h1:gSD8MVOyqBspc0ynLsuiMR9qmt8UQ4jpVImjmK0uXfk=
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYglewc+UyGf6lc8Mj2UaPTHy/iF2De0/77CA=
Expand Down Expand Up @@ -263,6 +263,8 @@ github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
github.com/inetaf/tcpproxy v0.0.0-20240214030015-3ce58045626c h1:gYfYE403/nlrGNYj6BEOs9ucLCAGB9gstlSk92DttTg=
github.com/inetaf/tcpproxy v0.0.0-20240214030015-3ce58045626c/go.mod h1:Di7LXRyUcnvAcLicFhtM9/MlZl/TNgRSDHORM2c6CMI=
github.com/insomniacslk/dhcp v0.0.0-20220504074936-1ca156eafb9f h1:l1QCwn715k8nYkj4Ql50rzEog3WnMdrd4YYMMwemxEo=
github.com/insomniacslk/dhcp v0.0.0-20220504074936-1ca156eafb9f/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E=
github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8=
Expand Down Expand Up @@ -709,8 +711,6 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gvisor.dev/gvisor v0.0.0-20231023213702-2691a8f9b1cf h1:0A28IFBR6VcMacM0m6Rn5/nr8pk8xa2TyIkjSaFAOPc=
gvisor.dev/gvisor v0.0.0-20231023213702-2691a8f9b1cf/go.mod h1:8hmigyCdYtw5xJGfQDJzSH5Ju8XEIDBnpyi8+O6GRt8=
inet.af/tcpproxy v0.0.0-20231102063150-2862066fc2a9 h1:zomTWJvjwLbKRgGameQtpK6DNFUbZ2oNJuWhgUkGp3M=
inet.af/tcpproxy v0.0.0-20231102063150-2862066fc2a9/go.mod h1:Tojt5kmHpDIR2jMojxzZK2w2ZR7OILODmUo2gaSwjrk=
k8s.io/api v0.28.8 h1:G0/G7yX1puRAcon/+XPLsKXZ9A5L7Ds6oKbDIe027xw=
k8s.io/api v0.28.8/go.mod h1:rU8f1t9CNUAXlk/1j/wMJ7XnaxkR1g1AlZGQAOOL+sw=
k8s.io/apimachinery v0.28.8 h1:hi/nrxHwk4QLV+W/SHve1bypTE59HCDorLY1stBIxKQ=
Expand Down
2 changes: 1 addition & 1 deletion vendor/github.com/containers/gvisor-tap-vsock/pkg/services/dhcp/dhcp.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/containers/gvisor-tap-vsock/pkg/services/dns/dns.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions vendor/github.com/containers/gvisor-tap-vsock/pkg/services/forwarder/ports.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/github.com/containers/gvisor-tap-vsock/pkg/services/forwarder/tcp.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/containers/gvisor-tap-vsock/pkg/sshclient/bastion.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/containers/gvisor-tap-vsock/pkg/transport/dial_darwin.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions vendor/github.com/containers/gvisor-tap-vsock/pkg/virtualnetwork/mux.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 vendor/inet.af/tcpproxy/.travis.yml → ...or/github.com/inetaf/tcpproxy/.travis.yml
View file
File renamed without changes.
0 vendor/inet.af/tcpproxy/CONTRIBUTING.md → ...ithub.com/inetaf/tcpproxy/CONTRIBUTING.md
View file
File renamed without changes.
0 vendor/inet.af/tcpproxy/LICENSE → vendor/github.com/inetaf/tcpproxy/LICENSE
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion vendor/inet.af/tcpproxy/README.md → vendor/github.com/inetaf/tcpproxy/README.md
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 vendor/inet.af/tcpproxy/http.go → vendor/github.com/inetaf/tcpproxy/http.go
View file
File renamed without changes.
0 vendor/inet.af/tcpproxy/listener.go → ...or/github.com/inetaf/tcpproxy/listener.go
View file
File renamed without changes.
0 vendor/inet.af/tcpproxy/sni.go → vendor/github.com/inetaf/tcpproxy/sni.go
View file
File renamed without changes.
0 vendor/inet.af/tcpproxy/tcpproxy.go → ...or/github.com/inetaf/tcpproxy/tcpproxy.go
View file
File renamed without changes.
8 changes: 4 additions & 4 deletions vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ github.com/cloudflare/circl/math/mlsbset
github.com/cloudflare/circl/sign
github.com/cloudflare/circl/sign/ed25519
github.com/cloudflare/circl/sign/ed448
# github.com/containers/gvisor-tap-vsock v0.7.3
# github.com/containers/gvisor-tap-vsock v0.7.4-0.20240320091526-a0238e52b61f
## explicit; go 1.20
github.com/containers/gvisor-tap-vsock/pkg/client
github.com/containers/gvisor-tap-vsock/pkg/fs
Expand Down Expand Up @@ -433,6 +433,9 @@ github.com/imdario/mergo
# github.com/inconshreveable/mousetrap v1.1.0
## explicit; go 1.18
github.com/inconshreveable/mousetrap
# github.com/inetaf/tcpproxy v0.0.0-20240214030015-3ce58045626c
## explicit; go 1.16
github.com/inetaf/tcpproxy
# github.com/insomniacslk/dhcp v0.0.0-20220504074936-1ca156eafb9f
## explicit; go 1.13
github.com/insomniacslk/dhcp/dhcpv4
Expand Down Expand Up @@ -1081,9 +1084,6 @@ gvisor.dev/gvisor/pkg/tcpip/transport/tcp
gvisor.dev/gvisor/pkg/tcpip/transport/tcpconntrack
gvisor.dev/gvisor/pkg/tcpip/transport/udp
gvisor.dev/gvisor/pkg/waiter
# inet.af/tcpproxy v0.0.0-20231102063150-2862066fc2a9
## explicit; go 1.16
inet.af/tcpproxy
# k8s.io/api v0.28.8
## explicit; go 1.20
k8s.io/api/admissionregistration/v1
Expand Down

0 comments on commit f22e901

Please sign in to comment.