Skip to content

Commit 87d65a3

Browse files
DmitriyMVDmitriyMV
committed
chore: bump grpc library and fix ALPN issue
Bump grpc library to 1.67.1 and ensure that we set proper HTTP/2 ALPN value. Closes siderolabs#9463 Depends on siderolabs/crypto#34 Signed-off-by: Dmitriy Matrenichev <[email protected]>
1 parent 4d90202 commit 87d65a3

File tree

18 files changed

+101
-65
lines changed

18 files changed

+101
-65
lines changed

‎.golangci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,8 @@ linters-settings:
109109
- github.com/insomniacslk/dhcp
110110
- github.com/safchain/ethtool
111111
- github.com/vishvananda/netlink
112+
- github.com/siderolabs/crypto
113+
- github.com/siderolabs/grpc-proxy
112114
retract-allow-no-explanation: false
113115
exclude-forbidden: false
114116

‎Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,17 @@ PKG_TALOSCTL_CNI_BUNDLE_INSTALL ?= $(PKGS_PREFIX)/talosctl-cni-bundle-install:$(
6363
# renovate: datasource=github-tags depName=golang/go
6464
GO_VERSION ?= 1.23
6565
# renovate: datasource=go depName=golang.org/x/tools
66-
GOIMPORTS_VERSION ?= v0.24.0
66+
GOIMPORTS_VERSION ?= v0.25.0
6767
# renovate: datasource=go depName=mvdan.cc/gofumpt
6868
GOFUMPT_VERSION ?= v0.7.0
6969
# renovate: datasource=go depName=github.com/golangci/golangci-lint
7070
GOLANGCILINT_VERSION ?= v1.61.0
7171
# renovate: datasource=go depName=golang.org/x/tools
72-
STRINGER_VERSION ?= v0.24.0
72+
STRINGER_VERSION ?= v0.25.0
7373
# renovate: datasource=go depName=github.com/dmarkham/enumer
7474
ENUMER_VERSION ?= v1.5.10
7575
# renovate: datasource=go depName=k8s.io/code-generator
76-
DEEPCOPY_GEN_VERSION ?= v0.31.0
76+
DEEPCOPY_GEN_VERSION ?= v0.31.1
7777
# renovate: datasource=go depName=github.com/planetscale/vtprotobuf
7878
VTPROTOBUF_VERSION ?= v0.6.0
7979
# renovate: datasource=go depName=github.com/siderolabs/deep-copy

‎cmd/talosctl/acompat/acompat.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// This Source Code Form is subject to the terms of the Mozilla Public
2+
// License, v. 2.0. If a copy of the MPL was not distributed with this
3+
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
4+
5+
// Package acompat provides compatibility with gRPC 1.67.0 and later.
6+
package acompat
7+
8+
import "os"
9+
10+
func init() {
11+
if err := os.Setenv("GRPC_ENFORCE_ALPN_ENABLED", "false"); err != nil {
12+
panic(err)
13+
}
14+
}

‎cmd/talosctl/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ package main
88
import (
99
"os"
1010

11+
_ "github.com/siderolabs/talos/cmd/talosctl/acompat"
1112
"github.com/siderolabs/talos/cmd/talosctl/cmd"
1213
)
1314

‎go.mod

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ require (
139139
github.com/ryanuber/go-glob v1.0.0
140140
github.com/safchain/ethtool v0.4.1
141141
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30
142-
github.com/siderolabs/crypto v0.4.4
142+
github.com/siderolabs/crypto v0.5.0
143143
github.com/siderolabs/discovery-api v0.1.4
144144
github.com/siderolabs/discovery-client v0.1.9
145145
github.com/siderolabs/gen v0.5.0
@@ -161,7 +161,7 @@ require (
161161
github.com/siderolabs/go-smbios v0.3.3
162162
github.com/siderolabs/go-tail v0.1.1
163163
github.com/siderolabs/go-talos-support v0.1.1
164-
github.com/siderolabs/grpc-proxy v0.4.1
164+
github.com/siderolabs/grpc-proxy v0.5.1
165165
github.com/siderolabs/kms-client v0.1.0
166166
github.com/siderolabs/net v0.4.0
167167
github.com/siderolabs/protoenc v0.2.1
@@ -181,16 +181,16 @@ require (
181181
go.etcd.io/etcd/etcdutl/v3 v3.5.16
182182
go.uber.org/zap v1.27.0
183183
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba
184-
golang.org/x/net v0.29.0
184+
golang.org/x/net v0.30.0
185185
golang.org/x/oauth2 v0.23.0
186186
golang.org/x/sync v0.8.0
187-
golang.org/x/sys v0.25.0
188-
golang.org/x/term v0.24.0
189-
golang.org/x/text v0.18.0
187+
golang.org/x/sys v0.26.0
188+
golang.org/x/term v0.25.0
189+
golang.org/x/text v0.19.0
190190
golang.org/x/time v0.6.0
191191
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6
192-
google.golang.org/grpc v1.66.3
193-
google.golang.org/protobuf v1.34.2
192+
google.golang.org/grpc v1.67.1
193+
google.golang.org/protobuf v1.35.1
194194
gopkg.in/yaml.v3 v3.0.1
195195
k8s.io/klog/v2 v2.130.1
196196
kernel.org/pub/linux/libs/security/libcap/cap v1.2.70
@@ -354,14 +354,14 @@ require (
354354
go.opentelemetry.io/otel/trace v1.28.0 // indirect
355355
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
356356
go.uber.org/multierr v1.11.0 // indirect
357-
golang.org/x/crypto v0.27.0 // indirect
357+
golang.org/x/crypto v0.28.0 // indirect
358358
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
359359
golang.org/x/mod v0.20.0 // indirect
360360
golang.org/x/tools v0.24.0 // indirect
361361
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
362362
golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 // indirect
363363
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
364-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
364+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect
365365
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
366366
gopkg.in/inf.v0 v0.9.1 // indirect
367367
gopkg.in/yaml.v2 v2.4.0 // indirect

‎go.sum

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -575,8 +575,8 @@ github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
575575
github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
576576
github.com/siderolabs/coredns v1.11.53 h1:HoRPGey3HNj409+15OGnP9Jt4NNpRKsm7izjc/M/G20=
577577
github.com/siderolabs/coredns v1.11.53/go.mod h1:2bxje5r6+o9rO0k7bEb5BitqPz8YUYaIY8iJHD1ELtE=
578-
github.com/siderolabs/crypto v0.4.4 h1:Q6EDBMR2Ub2oAZW5Xl8lrKB27bM3Sn8Gkfw3rngco5U=
579-
github.com/siderolabs/crypto v0.4.4/go.mod h1:hsR3tJ3aaeuhCChsLF4dBd9vlJVPvmhg4vvx2ez4aD4=
578+
github.com/siderolabs/crypto v0.5.0 h1:+Sox0aYLCcD0PAH2cbEcx557zUrONLtuj1Ws+2MFXGc=
579+
github.com/siderolabs/crypto v0.5.0/go.mod h1:hsR3tJ3aaeuhCChsLF4dBd9vlJVPvmhg4vvx2ez4aD4=
580580
github.com/siderolabs/discovery-api v0.1.4 h1:2fMEFSMiWaD1zDiBDY5md8VxItvL1rDQRSOfeXNjYKc=
581581
github.com/siderolabs/discovery-api v0.1.4/go.mod h1:kaBy+G42v2xd/uAF/NIe383sjNTBE2AhxPTyi9SZI0s=
582582
github.com/siderolabs/discovery-client v0.1.9 h1:yDzvts++Nf/2qczdDUfU5GAibkEIgz/eo9RPG/k/rOc=
@@ -619,8 +619,8 @@ github.com/siderolabs/go-tail v0.1.1 h1:3XeJgd97OHyFAIE7nQEMcRhOfnv7DvXbu0BRKbtT
619619
github.com/siderolabs/go-tail v0.1.1/go.mod h1:IihAL39acadXHfb5fEAOKK2DaDFIrG2+VD3b2H/ziZ0=
620620
github.com/siderolabs/go-talos-support v0.1.1 h1:g51J0WQssQAycU/0cDliC2l4uX2H02yUs2+fa5pCvHg=
621621
github.com/siderolabs/go-talos-support v0.1.1/go.mod h1:o4woiYS+2J3djCQgyHZRVZQm8XpazQr+XPcTXAZvamo=
622-
github.com/siderolabs/grpc-proxy v0.4.1 h1:UTYviMqb65oKjnH7dy5D+U4zMJ6iCTjAN6x6K/Ss120=
623-
github.com/siderolabs/grpc-proxy v0.4.1/go.mod h1:QwQuLUpJrlN08kpP0m63oO/SEeoz0dEhU9ndlBafc0Y=
622+
github.com/siderolabs/grpc-proxy v0.5.1 h1:WTZYLMPTZPt43BzEJ02LT9kYA9qAfquWwCezc6NPPYE=
623+
github.com/siderolabs/grpc-proxy v0.5.1/go.mod h1:EQwE87LiWxhiIUPBeWmpjJb9DIWxWID8R6ARtdTC+8A=
624624
github.com/siderolabs/kms-client v0.1.0 h1:rCDWzcDDsNlp6zdyLngOuuhchVILn+vwUQy3tk6rQps=
625625
github.com/siderolabs/kms-client v0.1.0/go.mod h1:4UQkRhuEh3kaK7VhJxez4YyJLv6lPEff7g3Pa6Y9okg=
626626
github.com/siderolabs/net v0.4.0 h1:1bOgVay/ijPkJz4qct98nHsiB/ysLQU0KLoBC4qLm7I=
@@ -775,8 +775,8 @@ golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0
775775
golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
776776
golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
777777
golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
778-
golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
779-
golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
778+
golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
779+
golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
780780
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
781781
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM=
782782
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
@@ -822,8 +822,8 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
822822
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
823823
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
824824
golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
825-
golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
826-
golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
825+
golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
826+
golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
827827
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
828828
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
829829
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -895,8 +895,8 @@ golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
895895
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
896896
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
897897
golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
898-
golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
899-
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
898+
golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
899+
golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
900900
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
901901
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
902902
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -906,8 +906,8 @@ golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
906906
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
907907
golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
908908
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
909-
golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
910-
golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
909+
golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24=
910+
golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M=
911911
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
912912
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
913913
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -920,8 +920,8 @@ golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
920920
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
921921
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
922922
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
923-
golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
924-
golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
923+
golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
924+
golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
925925
golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
926926
golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
927927
golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
@@ -982,8 +982,8 @@ google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ6
982982
google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
983983
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 h1:hjSy6tcFQZ171igDaN5QHOw2n6vx40juYbC/x67CEhc=
984984
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:qpvKtACPCQhAdu3PyQgV4l3LMXZEtft7y8QcarRsp9I=
985-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ=
986-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
985+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 h1:QCqS/PdaHTSWGvupk2F/ehwHtGc0/GYkT+3GAcR1CCc=
986+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
987987
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
988988
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
989989
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
@@ -1000,8 +1000,8 @@ google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnD
10001000
google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
10011001
google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
10021002
google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
1003-
google.golang.org/grpc v1.66.3 h1:TWlsh8Mv0QI/1sIbs1W36lqRclxrmF+eFJ4DbI0fuhA=
1004-
google.golang.org/grpc v1.66.3/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y=
1003+
google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
1004+
google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
10051005
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
10061006
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
10071007
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
@@ -1016,8 +1016,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
10161016
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
10171017
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
10181018
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
1019-
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
1020-
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
1019+
google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
1020+
google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
10211021
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
10221022
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
10231023
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

‎hack/cloud-image-uploader/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,6 @@ require (
6868
google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect
6969
google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed // indirect
7070
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
71-
google.golang.org/grpc v1.66.0 // indirect
71+
google.golang.org/grpc v1.67.1 // indirect
7272
google.golang.org/protobuf v1.34.2 // indirect
7373
)

‎hack/cloud-image-uploader/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac
269269
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
270270
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
271271
google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
272-
google.golang.org/grpc v1.66.0 h1:DibZuoBznOxbDQxRINckZcUvnCEvrW9pcWIE2yF9r1c=
273-
google.golang.org/grpc v1.66.0/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y=
272+
google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
273+
google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
274274
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
275275
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
276276
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

‎internal/app/apid/main.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"github.com/cosi-project/runtime/api/v1alpha1"
2222
"github.com/cosi-project/runtime/pkg/state"
2323
"github.com/cosi-project/runtime/pkg/state/protobuf/client"
24-
debug "github.com/siderolabs/go-debug"
24+
"github.com/siderolabs/go-debug"
2525
"github.com/siderolabs/grpc-proxy/proxy"
2626
"golang.org/x/sync/errgroup"
2727
"google.golang.org/grpc"
@@ -178,7 +178,7 @@ func apidMain() error {
178178
grpc.Creds(
179179
credentials.NewTLS(serverTLSConfig),
180180
),
181-
grpc.ForceServerCodec(proxy.Codec()),
181+
grpc.ForceServerCodecV2(proxy.Codec()),
182182
grpc.UnknownServiceHandler(
183183
proxy.TransparentHandler(
184184
router.Director,
@@ -205,7 +205,7 @@ func apidMain() error {
205205
router,
206206
factory.WithDefaultLog(),
207207
factory.ServerOptions(
208-
grpc.ForceServerCodec(proxy.Codec()),
208+
grpc.ForceServerCodecV2(proxy.Codec()),
209209
grpc.UnknownServiceHandler(
210210
proxy.TransparentHandler(
211211
router.Director,
@@ -248,7 +248,7 @@ func apidMain() error {
248248
return errGroup.Wait()
249249
}
250250

251-
func verifyExtKeyUsage(rawCerts [][]byte, verifiedChains [][]*x509.Certificate) error {
251+
func verifyExtKeyUsage(_ [][]byte, verifiedChains [][]*x509.Certificate) error {
252252
if len(verifiedChains) == 0 {
253253
return errors.New("no verified chains")
254254
}

‎internal/app/apid/pkg/backend/apid.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func (a *APID) String() string {
6666
}
6767

6868
// GetConnection returns a grpc connection to the backend.
69-
func (a *APID) GetConnection(ctx context.Context, fullMethodName string) (context.Context, *grpc.ClientConn, error) {
69+
func (a *APID) GetConnection(ctx context.Context, _ string) (context.Context, *grpc.ClientConn, error) {
7070
md, _ := metadata.FromIncomingContext(ctx)
7171
md = md.Copy()
7272

@@ -117,7 +117,7 @@ func (a *APID) GetConnection(ctx context.Context, fullMethodName string) (contex
117117
}),
118118
grpc.WithDefaultCallOptions(
119119
grpc.MaxCallRecvMsgSize(constants.GRPCMaxMessageSize),
120-
grpc.ForceCodec(proxy.Codec()),
120+
grpc.ForceCodecV2(proxy.Codec()),
121121
),
122122
grpc.WithSharedWriteBuffer(true),
123123
)

‎internal/app/apid/pkg/provider/provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ func (p *certificateProvider) GetCACertPool() (*stdx509.CertPool, error) {
193193
return p.caCertPool, nil
194194
}
195195

196-
func (p *certificateProvider) GetCertificate(h *stdlibtls.ClientHelloInfo) (*stdlibtls.Certificate, error) {
196+
func (p *certificateProvider) GetCertificate(*stdlibtls.ClientHelloInfo) (*stdlibtls.Certificate, error) {
197197
p.mu.Lock()
198198
defer p.mu.Unlock()
199199

‎pkg/grpc/codec/codec.go

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212

1313
"google.golang.org/grpc/encoding"
1414
"google.golang.org/grpc/encoding/proto"
15+
"google.golang.org/grpc/mem"
1516

1617
talosproto "github.com/siderolabs/talos/pkg/machinery/proto"
1718
)
@@ -69,6 +70,33 @@ func (Codec) Name() string {
6970
return proto.Name // overrides google.golang.org/grpc/encoding/proto codec
7071
}
7172

73+
type codecV1Bridge struct {
74+
codec interface {
75+
Marshal(v any) ([]byte, error)
76+
Unmarshal(data []byte, v any) error
77+
Name() string
78+
}
79+
}
80+
81+
var _ encoding.CodecV2 = codecV1Bridge{}
82+
83+
func (c codecV1Bridge) Marshal(v any) (mem.BufferSlice, error) {
84+
data, err := c.codec.Marshal(v)
85+
if err != nil {
86+
return nil, err
87+
}
88+
89+
return mem.BufferSlice{mem.NewBuffer(&data, nil)}, nil
90+
}
91+
92+
func (c codecV1Bridge) Unmarshal(data mem.BufferSlice, v any) (err error) {
93+
return c.codec.Unmarshal(data.Materialize(), v)
94+
}
95+
96+
func (c codecV1Bridge) Name() string {
97+
return c.codec.Name()
98+
}
99+
72100
func init() {
73-
encoding.RegisterCodec(Codec{})
101+
encoding.RegisterCodecV2(codecV1Bridge{codec: Codec{}})
74102
}

‎pkg/grpc/factory/factory.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package factory
66

77
import (
88
"context"
9-
"crypto/tls"
109
"errors"
1110
"fmt"
1211
"io"
@@ -39,7 +38,6 @@ type Options struct {
3938
Port int
4039
SocketPath string
4140
Network string
42-
Config *tls.Config
4341
ServerOptions []grpc.ServerOption
4442
UnaryInterceptors []grpc.UnaryServerInterceptor
4543
StreamInterceptors []grpc.StreamServerInterceptor
@@ -79,13 +77,6 @@ func Network(o string) Option {
7977
}
8078
}
8179

82-
// Config sets the listen port of the server.
83-
func Config(o *tls.Config) Option {
84-
return func(args *Options) {
85-
args.Config = o
86-
}
87-
}
88-
8980
// ServerOptions appends to the gRPC server options of the server.
9081
func ServerOptions(o ...grpc.ServerOption) Option {
9182
return func(args *Options) {

0 commit comments

Comments
 (0)