Skip to content

Commit d9dd67d

Browse files
phillebabaphillebaba
committed
Remove use of Spegel fork
1 parent 57482a1 commit d9dd67d

File tree

4 files changed

+32
-26
lines changed

4 files changed

+32
-26
lines changed

‎go.mod

+7-8
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ replace (
2424
github.com/quic-go/quic-go => github.com/quic-go/quic-go v0.38.2
2525
github.com/rancher/wrangler => github.com/rancher/wrangler v1.1.1-0.20230818201331-3604a6be798d
2626
github.com/ugorji/go => github.com/ugorji/go v1.2.11
27-
github.com/xenitab/spegel => github.com/k3s-io/spegel v0.0.17-0.20240109004735-9466a5529330 // k3s-main
2827
go.etcd.io/etcd/api/v3 => github.com/k3s-io/etcd/api/v3 v3.5.9-k3s1
2928
go.etcd.io/etcd/client/pkg/v3 => github.com/k3s-io/etcd/client/pkg/v3 v3.5.9-k3s1
3029
go.etcd.io/etcd/client/v2 => github.com/k3s-io/etcd/client/v2 v2.305.9-k3s1
@@ -148,18 +147,18 @@ require (
148147
github.com/stretchr/testify v1.8.4
149148
github.com/urfave/cli v1.22.14
150149
github.com/vishvananda/netlink v1.2.1-beta.2
151-
github.com/xenitab/spegel v0.0.16
150+
github.com/xenitab/spegel v0.0.18
152151
github.com/yl2chen/cidranger v1.0.2
153152
go.etcd.io/etcd/api/v3 v3.5.10
154153
go.etcd.io/etcd/client/pkg/v3 v3.5.10
155154
go.etcd.io/etcd/client/v3 v3.5.10
156155
go.etcd.io/etcd/etcdutl/v3 v3.5.9
157156
go.etcd.io/etcd/server/v3 v3.5.10
158157
go.uber.org/zap v1.26.0
159-
golang.org/x/crypto v0.17.0
158+
golang.org/x/crypto v0.18.0
160159
golang.org/x/net v0.19.0
161160
golang.org/x/sync v0.6.0
162-
golang.org/x/sys v0.15.0
161+
golang.org/x/sys v0.16.0
163162
google.golang.org/grpc v1.59.0
164163
gopkg.in/yaml.v2 v2.4.0
165164
inet.af/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252
@@ -334,7 +333,7 @@ require (
334333
github.com/josharian/intern v1.0.0 // indirect
335334
github.com/josharian/native v1.1.0 // indirect
336335
github.com/karrick/godirwalk v1.17.0 // indirect
337-
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
336+
github.com/klauspost/cpuid/v2 v2.2.6 // indirect
338337
github.com/koron/go-ssdp v0.0.4 // indirect
339338
github.com/kylelemons/godebug v1.1.0 // indirect
340339
github.com/leodido/go-urn v1.2.4 // indirect
@@ -389,7 +388,7 @@ require (
389388
github.com/mrunalp/fileutils v0.5.1 // indirect
390389
github.com/multiformats/go-base32 v0.1.0 // indirect
391390
github.com/multiformats/go-base36 v0.2.0 // indirect
392-
github.com/multiformats/go-multiaddr v0.12.0 // indirect
391+
github.com/multiformats/go-multiaddr v0.12.2 // indirect
393392
github.com/multiformats/go-multiaddr-dns v0.3.1 // indirect
394393
github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
395394
github.com/multiformats/go-multibase v0.2.0 // indirect
@@ -424,7 +423,7 @@ require (
424423
github.com/prometheus/procfs v0.12.0 // indirect
425424
github.com/quic-go/qpack v0.4.0 // indirect
426425
github.com/quic-go/qtls-go1-20 v0.3.3 // indirect
427-
github.com/quic-go/quic-go v0.38.0 // indirect
426+
github.com/quic-go/quic-go v0.38.2 // indirect
428427
github.com/quic-go/webtransport-go v0.5.3 // indirect
429428
github.com/raulk/go-watchdog v1.3.0 // indirect
430429
github.com/rs/xid v1.5.0 // indirect
@@ -481,7 +480,7 @@ require (
481480
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
482481
golang.org/x/mod v0.14.0 // indirect
483482
golang.org/x/oauth2 v0.15.0 // indirect
484-
golang.org/x/term v0.15.0 // indirect
483+
golang.org/x/term v0.16.0 // indirect
485484
golang.org/x/text v0.14.0 // indirect
486485
golang.org/x/time v0.5.0 // indirect
487486
golang.org/x/tools v0.16.1 // indirect

‎go.sum

+8-7
Original file line numberDiff line numberDiff line change
@@ -1033,8 +1033,6 @@ github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.29.1-k
10331033
github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.29.1-k3s1/go.mod h1:+i0KHF7uvjXRUVsTwepg6652j9mzsnS7YHrbldQ5pZ0=
10341034
github.com/k3s-io/runc v1.1.12-k3s1 h1:p2x48K2BbRdF8crLEB4xoJ1pdjSprlvNNGpYBBULHL4=
10351035
github.com/k3s-io/runc v1.1.12-k3s1/go.mod h1:S+lQwSfncpBha7XTy/5lBwWgm5+y5Ma/O44Ekby9FK8=
1036-
github.com/k3s-io/spegel v0.0.17-0.20240109004735-9466a5529330 h1:Tn9qxllPEzcyJqhqbYywUz0y0bFnZG3eMDLCb9UXeVM=
1037-
github.com/k3s-io/spegel v0.0.17-0.20240109004735-9466a5529330/go.mod h1:VwX+8hz21pU7YjrvMmLCv7G4ww2Ds3HPEw3oDalMkGM=
10381036
github.com/karrick/godirwalk v1.17.0 h1:b4kY7nqDdioR/6qnbHQyDvmA17u5G1cZ6J+CZXwSWoI=
10391037
github.com/karrick/godirwalk v1.17.0/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk=
10401038
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
@@ -1054,8 +1052,8 @@ github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQs
10541052
github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
10551053
github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
10561054
github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
1057-
github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
1058-
github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
1055+
github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc=
1056+
github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
10591057
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
10601058
github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
10611059
github.com/koron/go-ssdp v0.0.4 h1:1IDwrghSKYM7yLf7XCzbByg2sJ/JcNOZRXS2jczTwz0=
@@ -1251,8 +1249,8 @@ github.com/multiformats/go-base36 v0.2.0 h1:lFsAbNOGeKtuKozrtBsAkSVhv1p9D0/qedU9
12511249
github.com/multiformats/go-base36 v0.2.0/go.mod h1:qvnKE++v+2MWCfePClUEjE78Z7P2a1UV0xHgWc0hkp4=
12521250
github.com/multiformats/go-multiaddr v0.1.1/go.mod h1:aMKBKNEYmzmDmxfX88/vz+J5IU55txyt0p4aiWVohjo=
12531251
github.com/multiformats/go-multiaddr v0.2.0/go.mod h1:0nO36NvPpyV4QzvTLi/lafl2y95ncPj0vFwVF6k6wJ4=
1254-
github.com/multiformats/go-multiaddr v0.12.0 h1:1QlibTFkoXJuDjjYsMHhE73TnzJQl8FSWatk/0gxGzE=
1255-
github.com/multiformats/go-multiaddr v0.12.0/go.mod h1:WmZXgObOQOYp9r3cslLlppkrz1FYSHmE834dfz/lWu8=
1252+
github.com/multiformats/go-multiaddr v0.12.2 h1:9G9sTY/wCYajKa9lyfWPmpZAwe6oV+Wb1zcmMS1HG24=
1253+
github.com/multiformats/go-multiaddr v0.12.2/go.mod h1:GKyaTYjZRdcUhyOetrxTk9z0cW+jA/YrnqTOvKgi44M=
12561254
github.com/multiformats/go-multiaddr-dns v0.3.1 h1:QgQgR+LQVt3NPTjbrLLpsaT2ufAA2y0Mkk+QRVJbW3A=
12571255
github.com/multiformats/go-multiaddr-dns v0.3.1/go.mod h1:G/245BRQ6FJGmryJCrOuTdB37AMA5AMOVuO6NY3JwTk=
12581256
github.com/multiformats/go-multiaddr-fmt v0.1.0 h1:WLEFClPycPkp4fnIzoFoV9FVd49/eQsuaL3/CWe167E=
@@ -1671,6 +1669,8 @@ github.com/xenitab/pkg/channels v0.0.2 h1:nCMsjEyhJedmAimYPOobzJl/yj7byU9h6IHEPc
16711669
github.com/xenitab/pkg/channels v0.0.2/go.mod h1:/MCBlje0/98BdAF7LetkSK1+lXeUpScIbTENGaWjGRg=
16721670
github.com/xenitab/pkg/gin v0.0.9 h1:BGdxnKoXAJBkthQTwQdaRdN7jTiNO+/C8hIexBrasfU=
16731671
github.com/xenitab/pkg/gin v0.0.9/go.mod h1:8rzqJ8X5KJOo31PBOD4/Wtlt2ac8hCjN1mpOf1YAFs4=
1672+
github.com/xenitab/spegel v0.0.18 h1:bQqogI3J28OY4k6Mnkvk90BiQgV5rLcGpEehMwbHoUk=
1673+
github.com/xenitab/spegel v0.0.18/go.mod h1:wU8oDJpSWFtbRGY9PgNCI9L4en3T5CN2pSKzPzQELrY=
16741674
github.com/xhit/go-str2duration v1.2.0/go.mod h1:3cPSlfZlUHVlneIVfePFWcJZsuwf+P1v2SRTV4cUmp4=
16751675
github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU=
16761676
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
@@ -1907,8 +1907,9 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn
19071907
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
19081908
golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o=
19091909
golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
1910-
golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
19111910
golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
1911+
golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE=
1912+
golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
19121913
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
19131914
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
19141915
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

‎pkg/spegel/bootstrap.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func (s *selfBootstrapper) Run(_ context.Context, id string) error {
4343
return nil
4444
}
4545

46-
func (s *selfBootstrapper) GetAddress() (*peer.AddrInfo, error) {
46+
func (s *selfBootstrapper) Get() (*peer.AddrInfo, error) {
4747
return peer.AddrInfoFromString(s.id)
4848
}
4949

@@ -68,7 +68,7 @@ func (c *agentBootstrapper) Run(_ context.Context, _ string) error {
6868
return nil
6969
}
7070

71-
func (c *agentBootstrapper) GetAddress() (*peer.AddrInfo, error) {
71+
func (c *agentBootstrapper) Get() (*peer.AddrInfo, error) {
7272
if c.server == "" || c.token == "" {
7373
return nil, errors.New("cannot get addresses without server and token")
7474
}
@@ -131,7 +131,7 @@ func (s *serverBootstrapper) Run(_ context.Context, id string) error {
131131
return nil
132132
}
133133

134-
func (s *serverBootstrapper) GetAddress() (addrInfo *peer.AddrInfo, err error) {
134+
func (s *serverBootstrapper) Get() (addrInfo *peer.AddrInfo, err error) {
135135
if s.controlConfig.Runtime.Core == nil {
136136
return nil, errors.New("runtime core not ready")
137137
}
@@ -187,10 +187,10 @@ func (c *chainingBootstrapper) Run(ctx context.Context, id string) error {
187187
return merr.NewErrors(errs...)
188188
}
189189

190-
func (c *chainingBootstrapper) GetAddress() (*peer.AddrInfo, error) {
190+
func (c *chainingBootstrapper) Get() (*peer.AddrInfo, error) {
191191
errs := merr.Errors{}
192192
for _, b := range c.bootstrappers {
193-
addr, err := b.GetAddress()
193+
addr, err := b.Get()
194194
if err == nil {
195195
return addr, nil
196196
}

‎pkg/spegel/spegel.go

+12-6
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ const (
9696
resolveLatestTag = false
9797
resolveRetries = 0
9898
resolveTimeout = time.Second * 5
99-
registryScheme = "https"
10099
registryNamespace = "k8s.io"
101100
defaultRouterPort = "5001"
102101
)
@@ -188,12 +187,12 @@ func (c *Config) Start(ctx context.Context, nodeConfig *config.Node) error {
188187
libp2p.Identity(p2pKey),
189188
libp2p.Peerstore(ps),
190189
libp2p.PrivateNetwork(c.PSK),
191-
libp2p.PrometheusRegisterer(metrics.DefaultRegisterer),
192190
}
193-
router, err := routing.NewP2PRouter(ctx, routerAddr, c.Bootstrapper, c.RegistryPort, registryScheme, opts...)
191+
router, err := routing.NewP2PRouter(ctx, routerAddr, c.Bootstrapper, c.RegistryPort, opts...)
194192
if err != nil {
195193
return errors.Wrap(err, "failed to create p2p router")
196194
}
195+
go router.Run(ctx)
197196

198197
caCert, err := os.ReadFile(c.ServerCAFile)
199198
if err != nil {
@@ -202,7 +201,14 @@ func (c *Config) Start(ctx context.Context, nodeConfig *config.Node) error {
202201
localAddr := net.JoinHostPort(c.InternalAddress, c.RegistryPort)
203202
client := clientaccess.GetHTTPClient(caCert, c.ClientCertFile, c.ClientKeyFile)
204203
metrics.Register()
205-
reg := registry.NewRegistry(ociClient, router, localAddr, resolveRetries, resolveTimeout, resolveLatestTag, client.Transport)
204+
registryOpts := []registry.Option{
205+
registry.WithLocalAddress(localAddr),
206+
registry.WithResolveLatestTag(resolveLatestTag),
207+
registry.WithResolveRetries(resolveRetries),
208+
registry.WithResolveTimeout(resolveTimeout),
209+
registry.WithTransport(client.Transport),
210+
}
211+
reg := registry.NewRegistry(ociClient, router, registryOpts...)
206212
regSvr := reg.Server(":"+c.RegistryPort, logr.FromContextOrDiscard(ctx))
207213

208214
// Close router on shutdown
@@ -225,7 +231,7 @@ func (c *Config) Start(ctx context.Context, nodeConfig *config.Node) error {
225231
// Wait up to 5 seconds for the p2p network to find peers. This will return
226232
// immediately if the node is bootstrapping from itself.
227233
wait.PollImmediateWithContext(ctx, time.Second, resolveTimeout, func(_ context.Context) (bool, error) {
228-
return router.HasMirrors()
234+
return router.Ready()
229235
})
230236

231237
return nil
@@ -235,7 +241,7 @@ func (c *Config) Start(ctx context.Context, nodeConfig *config.Node) error {
235241
func (c *Config) peerInfo() http.HandlerFunc {
236242
return http.HandlerFunc(func(resp http.ResponseWriter, req *http.Request) {
237243
client, _, _ := net.SplitHostPort(req.RemoteAddr)
238-
info, err := c.Bootstrapper.GetAddress()
244+
info, err := c.Bootstrapper.Get()
239245
if err != nil {
240246
http.Error(resp, "Internal Error", http.StatusInternalServerError)
241247
return

0 commit comments

Comments
 (0)