mirrors/talos
1
0
Fork 0
mirror of https://github.com/siderolabs/talos.git synced 2025-10-27 06:21:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump deps

Browse Source 
Bump github.com/siderolabs/grpc-proxy to v0.4.1 and replace deprecated calls to `grpc.CustomCodec`.

Signed-off-by: Dmitriy Matrenichev <dmitry.matrenichev@siderolabs.com>
This commit is contained in:
Dmitriy Matrenichev 2024-07-09 20:01:13 +03:00
parent 3bab15214d
commit fbde9c556f
No known key found for this signature in database
GPG Key ID: 94B473337258BFD5
6 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -143,7 +143,7 @@ require (
github.com/siderolabs/go-smbios v0.3.2 github.com/siderolabs/go-smbios v0.3.2
github.com/siderolabs/go-tail v0.1.1 github.com/siderolabs/go-tail v0.1.1
github.com/siderolabs/go-talos-support v0.1.1-0.20240521144823-69891cf04662 github.com/siderolabs/go-talos-support v0.1.1-0.20240521144823-69891cf04662
github.com/siderolabs/grpc-proxy v0.4.0 github.com/siderolabs/grpc-proxy v0.4.1
github.com/siderolabs/kms-client v0.1.0 github.com/siderolabs/kms-client v0.1.0
github.com/siderolabs/net v0.4.0 github.com/siderolabs/net v0.4.0
github.com/siderolabs/siderolink v0.3.9 github.com/siderolabs/siderolink v0.3.9

4
go.sum
View File

@ -670,8 +670,8 @@ github.com/siderolabs/go-tail v0.1.1 h1:3XeJgd97OHyFAIE7nQEMcRhOfnv7DvXbu0BRKbtT
github.com/siderolabs/go-tail v0.1.1/go.mod h1:IihAL39acadXHfb5fEAOKK2DaDFIrG2+VD3b2H/ziZ0= github.com/siderolabs/go-tail v0.1.1/go.mod h1:IihAL39acadXHfb5fEAOKK2DaDFIrG2+VD3b2H/ziZ0=
github.com/siderolabs/go-talos-support v0.1.1-0.20240521144823-69891cf04662 h1:TnpJ279GAgW8LLJGwjyB/ups0iJSAOGJtKXd3Kl9yP8= github.com/siderolabs/go-talos-support v0.1.1-0.20240521144823-69891cf04662 h1:TnpJ279GAgW8LLJGwjyB/ups0iJSAOGJtKXd3Kl9yP8=
github.com/siderolabs/go-talos-support v0.1.1-0.20240521144823-69891cf04662/go.mod h1:YRs6CWqvFmRnxTE3cuOPM23ZasuzaNGNEeyFajsI+tw= github.com/siderolabs/go-talos-support v0.1.1-0.20240521144823-69891cf04662/go.mod h1:YRs6CWqvFmRnxTE3cuOPM23ZasuzaNGNEeyFajsI+tw=
github.com/siderolabs/grpc-proxy v0.4.0 h1:zYrhqLYs8JlYoLHYeel7/XwXDZ4OJ5XyP9wX7JlbPew= github.com/siderolabs/grpc-proxy v0.4.1 h1:UTYviMqb65oKjnH7dy5D+U4zMJ6iCTjAN6x6K/Ss120=
github.com/siderolabs/grpc-proxy v0.4.0/go.mod h1:QDurYOwQD4H8BKyvCuUxMiuG/etYnb/++xaQB644NdU= github.com/siderolabs/grpc-proxy v0.4.1/go.mod h1:QwQuLUpJrlN08kpP0m63oO/SEeoz0dEhU9ndlBafc0Y=
github.com/siderolabs/kms-client v0.1.0 h1:rCDWzcDDsNlp6zdyLngOuuhchVILn+vwUQy3tk6rQps= github.com/siderolabs/kms-client v0.1.0 h1:rCDWzcDDsNlp6zdyLngOuuhchVILn+vwUQy3tk6rQps=
github.com/siderolabs/kms-client v0.1.0/go.mod h1:4UQkRhuEh3kaK7VhJxez4YyJLv6lPEff7g3Pa6Y9okg= github.com/siderolabs/kms-client v0.1.0/go.mod h1:4UQkRhuEh3kaK7VhJxez4YyJLv6lPEff7g3Pa6Y9okg=
github.com/siderolabs/net v0.4.0 h1:1bOgVay/ijPkJz4qct98nHsiB/ysLQU0KLoBC4qLm7I= github.com/siderolabs/net v0.4.0 h1:1bOgVay/ijPkJz4qct98nHsiB/ysLQU0KLoBC4qLm7I=

4
internal/app/apid/main.go
View File

@ -178,7 +178,7 @@ func apidMain() error {
grpc.Creds( grpc.Creds(
credentials.NewTLS(serverTLSConfig), credentials.NewTLS(serverTLSConfig),
), ),
grpc.CustomCodec(proxy.Codec()), //nolint:staticcheck grpc.ForceServerCodec(proxy.Codec()),
grpc.UnknownServiceHandler( grpc.UnknownServiceHandler(
proxy.TransparentHandler( proxy.TransparentHandler(
router.Director, router.Director,
@ -205,7 +205,7 @@ func apidMain() error {
router, router,
factory.WithDefaultLog(), factory.WithDefaultLog(),
factory.ServerOptions( factory.ServerOptions(
grpc.CustomCodec(proxy.Codec()), //nolint:staticcheck grpc.ForceServerCodec(proxy.Codec()),
grpc.UnknownServiceHandler( grpc.UnknownServiceHandler(
proxy.TransparentHandler( proxy.TransparentHandler(
router.Director, router.Director,

2
internal/app/apid/pkg/backend/apid.go
View File

@ -117,8 +117,8 @@ func (a *APID) GetConnection(ctx context.Context, fullMethodName string) (contex
}), }),
grpc.WithDefaultCallOptions( grpc.WithDefaultCallOptions(
grpc.MaxCallRecvMsgSize(constants.GRPCMaxMessageSize), grpc.MaxCallRecvMsgSize(constants.GRPCMaxMessageSize),
grpc.ForceCodec(proxy.Codec()),
), ),
grpc.WithCodec(proxy.Codec()), //nolint:staticcheck
grpc.WithSharedWriteBuffer(true), grpc.WithSharedWriteBuffer(true),
) )

2
pkg/grpc/proxy/backend/local.go
View File

@ -62,8 +62,8 @@ func (l *Local) GetConnection(ctx context.Context, fullMethodName string) (conte
grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithTransportCredentials(insecure.NewCredentials()),
grpc.WithDefaultCallOptions( grpc.WithDefaultCallOptions(
grpc.MaxCallRecvMsgSize(constants.GRPCMaxMessageSize), grpc.MaxCallRecvMsgSize(constants.GRPCMaxMessageSize),
grpc.ForceCodec(proxy.Codec()),
), ),
grpc.WithCodec(proxy.Codec()), //nolint:staticcheck
grpc.WithSharedWriteBuffer(true), grpc.WithSharedWriteBuffer(true),
) )

23
pkg/machinery/client/connection.go
View File

@ -12,6 +12,7 @@ import (
"fmt" "fmt"
"net" "net"
"net/url" "net/url"
"slices"
"strings" "strings"
"github.com/siderolabs/gen/xslices" "github.com/siderolabs/gen/xslices"
@ -40,16 +41,18 @@ func (c *Client) getConn(opts ...grpc.DialOption) (*grpcConnectionWrapper, error
constants.ApidPort), constants.ApidPort),
) )
dialOpts := []grpc.DialOption{ dialOpts := slices.Concat(
grpc.WithDefaultCallOptions( // enable compression by default []grpc.DialOption{
// TODO: enable compression for Talos 1.7+ grpc.WithDefaultCallOptions( // enable compression by default
// grpc.UseCompressor(gzip.Name), // TODO: enable compression for Talos 1.7+
grpc.MaxCallRecvMsgSize(constants.GRPCMaxMessageSize), // grpc.UseCompressor(gzip.Name),
), grpc.MaxCallRecvMsgSize(constants.GRPCMaxMessageSize),
grpc.WithSharedWriteBuffer(true), ),
} grpc.WithSharedWriteBuffer(true),
dialOpts = append(dialOpts, c.options.grpcDialOptions...) },
dialOpts = append(dialOpts, opts...) c.options.grpcDialOptions,
opts,
)
if c.options.unixSocketPath != "" { if c.options.unixSocketPath != "" {
conn, err := grpc.NewClient(target, dialOpts...) conn, err := grpc.NewClient(target, dialOpts...)