-
Notifications
You must be signed in to change notification settings - Fork 531
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
chore: bump grpc library and fix ALPN issue #9486
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
// This Source Code Form is subject to the terms of the Mozilla Public | ||
// License, v. 2.0. If a copy of the MPL was not distributed with this | ||
// file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
|
||
// Package acompat provides compatibility with gRPC 1.67.0 and later. | ||
package acompat | ||
|
||
import "os" | ||
|
||
func init() { | ||
if err := os.Setenv("GRPC_ENFORCE_ALPN_ENABLED", "false"); err != nil { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this will unfortunately be something we need more of: as the Talos cluster is upgraded, worker nodes talk to There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done in #9504 |
||
panic(err) | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -139,7 +139,7 @@ require ( | |
github.com/ryanuber/go-glob v1.0.0 | ||
github.com/safchain/ethtool v0.4.1 | ||
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30 | ||
github.com/siderolabs/crypto v0.4.4 | ||
github.com/siderolabs/crypto v0.5.0 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can we split up this PR into the piece which only bumps crypto and fixes ALPN (which we can backport to 1.8), and another PR which does the rest of updates? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Will do. |
||
github.com/siderolabs/discovery-api v0.1.4 | ||
github.com/siderolabs/discovery-client v0.1.9 | ||
github.com/siderolabs/gen v0.5.0 | ||
|
@@ -161,7 +161,7 @@ require ( | |
github.com/siderolabs/go-smbios v0.3.3 | ||
github.com/siderolabs/go-tail v0.1.1 | ||
github.com/siderolabs/go-talos-support v0.1.1 | ||
github.com/siderolabs/grpc-proxy v0.4.1 | ||
github.com/siderolabs/grpc-proxy v0.5.1 | ||
github.com/siderolabs/kms-client v0.1.0 | ||
github.com/siderolabs/net v0.4.0 | ||
github.com/siderolabs/protoenc v0.2.1 | ||
|
@@ -181,16 +181,16 @@ require ( | |
go.etcd.io/etcd/etcdutl/v3 v3.5.16 | ||
go.uber.org/zap v1.27.0 | ||
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba | ||
golang.org/x/net v0.29.0 | ||
golang.org/x/net v0.30.0 | ||
golang.org/x/oauth2 v0.23.0 | ||
golang.org/x/sync v0.8.0 | ||
golang.org/x/sys v0.25.0 | ||
golang.org/x/term v0.24.0 | ||
golang.org/x/text v0.18.0 | ||
golang.org/x/sys v0.26.0 | ||
golang.org/x/term v0.25.0 | ||
golang.org/x/text v0.19.0 | ||
golang.org/x/time v0.6.0 | ||
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6 | ||
google.golang.org/grpc v1.66.3 | ||
google.golang.org/protobuf v1.34.2 | ||
google.golang.org/grpc v1.67.1 | ||
google.golang.org/protobuf v1.35.1 | ||
gopkg.in/yaml.v3 v3.0.1 | ||
k8s.io/klog/v2 v2.130.1 | ||
kernel.org/pub/linux/libs/security/libcap/cap v1.2.70 | ||
|
@@ -354,14 +354,14 @@ require ( | |
go.opentelemetry.io/otel/trace v1.28.0 // indirect | ||
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect | ||
go.uber.org/multierr v1.11.0 // indirect | ||
golang.org/x/crypto v0.27.0 // indirect | ||
golang.org/x/crypto v0.28.0 // indirect | ||
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect | ||
golang.org/x/mod v0.20.0 // indirect | ||
golang.org/x/tools v0.24.0 // indirect | ||
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect | ||
golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 // indirect | ||
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect | ||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect | ||
google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect | ||
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect | ||
gopkg.in/inf.v0 v0.9.1 // indirect | ||
gopkg.in/yaml.v2 v2.4.0 // indirect | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess we don't need that?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah. thanks.