Skip to content

Commit 20bb52f

Browse files
cfergeaucfergeau
committed
9p: Share code with podman
The podman code is not upstream yet, but it's a small refactor of existing code. This removes most of the code added in the previous commit.
1 parent f0399d5 commit 20bb52f

File tree

226 files changed

+21575
-15668
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

226 files changed

+21575
-15668
lines changed

Diff for: ‎cmd/crc/cmd/daemon.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ import (
1414

1515
"github.com/containers/gvisor-tap-vsock/pkg/types"
1616
"github.com/containers/gvisor-tap-vsock/pkg/virtualnetwork"
17+
plan9 "github.com/containers/podman/v5/pkg/fileserver"
1718
"github.com/crc-org/crc/v2/pkg/crc/adminhelper"
1819
"github.com/crc-org/crc/v2/pkg/crc/api"
1920
"github.com/crc-org/crc/v2/pkg/crc/api/events"
2021
crcConfig "github.com/crc-org/crc/v2/pkg/crc/config"
2122
"github.com/crc-org/crc/v2/pkg/crc/constants"
2223
"github.com/crc-org/crc/v2/pkg/crc/daemonclient"
2324
"github.com/crc-org/crc/v2/pkg/crc/logging"
24-
plan9 "github.com/crc-org/crc/v2/pkg/crc/services/9p"
2525
"github.com/docker/go-units"
2626
"github.com/gorilla/handlers"
2727
"github.com/pkg/errors"
@@ -203,7 +203,7 @@ func run(configuration *types.Configuration) error {
203203

204204
// not sure if this should go over tcp or vsock
205205
// vsock on Windows needs more config (registry key, ..)
206-
ln9p, err := vn.Listen("tcp", net.JoinHostPort(configuration.GatewayIP, plan9.PortStr))
206+
ln9p, err := vn.Listen("tcp", net.JoinHostPort(configuration.GatewayIP, constants.Plan9PortStr))
207207
if err != nil {
208208
return err
209209
}

Diff for: ‎go.mod

+29-27
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/crc-org/crc/v2
22

3-
go 1.20
3+
go 1.21
4+
5+
toolchain go1.21.0
46

57
require (
68
github.com/AlecAivazis/survey/v2 v2.3.7
@@ -11,11 +13,12 @@ require (
1113
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
1214
github.com/cavaliergopher/grab/v3 v3.0.1
1315
github.com/cheggaaa/pb/v3 v3.1.5
14-
github.com/containers/common v0.58.1
15-
github.com/containers/gvisor-tap-vsock v0.7.4-0.20240320091526-a0238e52b61f
16-
github.com/containers/image/v5 v5.30.0
16+
github.com/containers/common v0.58.2
17+
github.com/containers/gvisor-tap-vsock v0.7.4-0.20240408151405-d744d71db363
18+
github.com/containers/image/v5 v5.30.1-0.20240411200840-dc519780d39f
1719
github.com/containers/libhvee v0.7.1
18-
github.com/coreos/go-systemd/v22 v22.5.0
20+
github.com/containers/podman/v5 v5.0.2
21+
github.com/coreos/go-systemd/v22 v22.5.1-0.20231103132048-7d375ecc2b09
1922
github.com/crc-org/admin-helper v0.5.2
2023
github.com/crc-org/machine v0.0.0-20221028075518-f9b43442196b
2124
github.com/crc-org/vfkit v0.5.1
@@ -26,12 +29,10 @@ require (
2629
github.com/gorilla/handlers v1.5.2
2730
github.com/h2non/filetype v1.1.3
2831
github.com/hectane/go-acl v0.0.0-20230122075934-ca0b05cb1adb
29-
github.com/hugelgupf/p9 v0.3.0
3032
github.com/jinzhu/copier v0.4.0
3133
github.com/klauspost/compress v1.17.8
3234
github.com/klauspost/cpuid/v2 v2.2.7
3335
github.com/kofalt/go-memoize v0.0.0-20220914132407-0b5d6a304579
34-
github.com/linuxkit/virtsock v0.0.0-20220523201153-1a23e78aa7a2
3536
github.com/mattn/go-colorable v0.1.13
3637
github.com/mdlayher/vsock v1.2.1
3738
github.com/onsi/ginkgo/v2 v2.17.1
@@ -81,16 +82,16 @@ require (
8182
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
8283
github.com/cloudflare/circl v1.3.7 // indirect
8384
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
84-
github.com/containers/ocicrypt v1.1.9 // indirect
85-
github.com/containers/storage v1.53.0 // indirect
85+
github.com/containers/ocicrypt v1.1.10 // indirect
86+
github.com/containers/storage v1.53.1-0.20240411065836-1fd0dc1d20e5 // indirect
8687
github.com/cucumber/gherkin/go/v26 v26.2.0 // indirect
8788
github.com/cucumber/messages/go/v21 v21.0.1 // indirect
8889
github.com/cyberphone/json-canonicalization v0.0.0-20231217050601-ba74d44ecf5f // indirect
8990
github.com/danieljoos/wincred v1.2.1 // indirect
9091
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
91-
github.com/distribution/reference v0.5.0 // indirect
92+
github.com/distribution/reference v0.6.0 // indirect
9293
github.com/docker/distribution v2.8.3+incompatible // indirect
93-
github.com/docker/docker v25.0.5+incompatible // indirect
94+
github.com/docker/docker v26.0.2+incompatible // indirect
9495
github.com/docker/docker-credential-helpers v0.8.1 // indirect
9596
github.com/docker/go-connections v0.5.0 // indirect
9697
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
@@ -101,17 +102,17 @@ require (
101102
github.com/go-logr/logr v1.4.1 // indirect
102103
github.com/go-ole/go-ole v1.3.0 // indirect
103104
github.com/go-openapi/analysis v0.21.4 // indirect
104-
github.com/go-openapi/errors v0.21.1 // indirect
105+
github.com/go-openapi/errors v0.22.0 // indirect
105106
github.com/go-openapi/jsonpointer v0.19.6 // indirect
106107
github.com/go-openapi/jsonreference v0.20.2 // indirect
107108
github.com/go-openapi/loads v0.21.2 // indirect
108109
github.com/go-openapi/runtime v0.26.0 // indirect
109110
github.com/go-openapi/spec v0.20.9 // indirect
110-
github.com/go-openapi/strfmt v0.22.2 // indirect
111-
github.com/go-openapi/swag v0.22.10 // indirect
111+
github.com/go-openapi/strfmt v0.23.0 // indirect
112+
github.com/go-openapi/swag v0.23.0 // indirect
112113
github.com/go-openapi/validate v0.22.1 // indirect
113114
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
114-
github.com/godbus/dbus/v5 v5.1.0 // indirect
115+
github.com/godbus/dbus/v5 v5.1.1-0.20230522191255-76236955d466 // indirect
115116
github.com/gofrs/uuid v4.3.1+incompatible // indirect
116117
github.com/gogo/protobuf v1.3.2 // indirect
117118
github.com/golang/protobuf v1.5.4 // indirect
@@ -124,12 +125,11 @@ require (
124125
github.com/google/pprof v0.0.0-20230323073829-e72429f035bd // indirect
125126
github.com/google/uuid v1.6.0 // indirect
126127
github.com/gorilla/mux v1.8.1 // indirect
127-
github.com/hashicorp/errwrap v1.1.0 // indirect
128128
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
129129
github.com/hashicorp/go-memdb v1.3.4 // indirect
130-
github.com/hashicorp/go-multierror v1.1.1 // indirect
131130
github.com/hashicorp/golang-lru v1.0.2 // indirect
132131
github.com/hashicorp/hcl v1.0.0 // indirect
132+
github.com/hugelgupf/p9 v0.3.1-0.20230822151754-54f5c5530921 // indirect
133133
github.com/imdario/mergo v0.3.13 // indirect
134134
github.com/inconshreveable/mousetrap v1.1.0 // indirect
135135
github.com/inetaf/tcpproxy v0.0.0-20240214030015-3ce58045626c // indirect
@@ -140,6 +140,7 @@ require (
140140
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
141141
github.com/klauspost/pgzip v1.2.6 // indirect
142142
github.com/letsencrypt/boulder v0.0.0-20230907030200-6d76a0f91e1e // indirect
143+
github.com/linuxkit/virtsock v0.0.0-20220523201153-1a23e78aa7a2 // indirect
143144
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
144145
github.com/magiconair/properties v1.8.7 // indirect
145146
github.com/mailru/easyjson v0.7.7 // indirect
@@ -173,7 +174,7 @@ require (
173174
github.com/shoenig/go-m1cpu v0.1.6 // indirect
174175
github.com/sigstore/fulcio v1.4.3 // indirect
175176
github.com/sigstore/rekor v1.2.2 // indirect
176-
github.com/sigstore/sigstore v1.8.2 // indirect
177+
github.com/sigstore/sigstore v1.8.3 // indirect
177178
github.com/sourcegraph/conc v0.3.0 // indirect
178179
github.com/spf13/afero v1.11.0 // indirect
179180
github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980 // indirect
@@ -184,20 +185,19 @@ require (
184185
github.com/tklauser/go-sysconf v0.3.12 // indirect
185186
github.com/tklauser/numcpus v0.6.1 // indirect
186187
github.com/u-root/uio v0.0.0-20230305220412-3e8cd9d6bf63 // indirect
187-
github.com/ulikunitz/xz v0.5.11 // indirect
188+
github.com/ulikunitz/xz v0.5.12 // indirect
188189
github.com/vbatts/tar-split v0.11.5 // indirect
189-
github.com/vbauerster/mpb/v8 v8.7.2 // indirect
190+
github.com/vbauerster/mpb/v8 v8.7.3 // indirect
190191
go.mongodb.org/mongo-driver v1.14.0 // indirect
191192
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect
192193
go.uber.org/multierr v1.11.0 // indirect
193-
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
194-
golang.org/x/mod v0.15.0 // indirect
195-
golang.org/x/oauth2 v0.18.0 // indirect
194+
golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0 // indirect
195+
golang.org/x/mod v0.17.0 // indirect
196+
golang.org/x/oauth2 v0.19.0 // indirect
196197
golang.org/x/time v0.5.0 // indirect
197-
golang.org/x/tools v0.18.0 // indirect
198-
google.golang.org/appengine v1.6.8 // indirect
199-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
200-
google.golang.org/grpc v1.59.0 // indirect
198+
golang.org/x/tools v0.20.0 // indirect
199+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
200+
google.golang.org/grpc v1.62.0 // indirect
201201
google.golang.org/protobuf v1.33.0 // indirect
202202
gopkg.in/cenkalti/backoff.v1 v1.1.0 // indirect
203203
gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect
@@ -212,3 +212,5 @@ require (
212212
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
213213
sigs.k8s.io/yaml v1.4.0 // indirect
214214
)
215+
216+
replace github.com/containers/podman/v5 => github.com/cfergeau/podman/v5 v5.0.0-20240423150536-f8898e383855

0 commit comments

Comments
 (0)