Skip to content

Commit a1e36d4

Browse files
brandondbrandond
committed
Bump etcd to v3.6.14
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
1 parent e6fd70c commit a1e36d4

2 files changed

Lines changed: 33 additions & 37 deletions

File tree

‎go.mod‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ replace (
2121
github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.23.2
2222
github.com/prometheus/common => github.com/prometheus/common v0.66.1
2323
github.com/spegel-org/spegel => github.com/k3s-io/spegel v0.7.2-k3s1
24-
go.etcd.io/etcd/api/v3 => github.com/k3s-io/etcd/api/v3 v3.6.12-k3s1
25-
go.etcd.io/etcd/client/pkg/v3 => github.com/k3s-io/etcd/client/pkg/v3 v3.6.12-k3s1
26-
go.etcd.io/etcd/client/v3 => github.com/k3s-io/etcd/client/v3 v3.6.12-k3s1
27-
go.etcd.io/etcd/etcdutl/v3 => github.com/k3s-io/etcd/etcdutl/v3 v3.6.12-k3s1
28-
go.etcd.io/etcd/pkg/v3 => github.com/k3s-io/etcd/pkg/v3 v3.6.12-k3s1
29-
go.etcd.io/etcd/server/v3 => github.com/k3s-io/etcd/server/v3 v3.6.12-k3s1
24+
go.etcd.io/etcd/api/v3 => github.com/k3s-io/etcd/api/v3 v3.6.14-k3s1
25+
go.etcd.io/etcd/client/pkg/v3 => github.com/k3s-io/etcd/client/pkg/v3 v3.6.14-k3s1
26+
go.etcd.io/etcd/client/v3 => github.com/k3s-io/etcd/client/v3 v3.6.14-k3s1
27+
go.etcd.io/etcd/etcdutl/v3 => github.com/k3s-io/etcd/etcdutl/v3 v3.6.14-k3s1
28+
go.etcd.io/etcd/pkg/v3 => github.com/k3s-io/etcd/pkg/v3 v3.6.14-k3s1
29+
go.etcd.io/etcd/server/v3 => github.com/k3s-io/etcd/server/v3 v3.6.14-k3s1
3030
go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful => go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.44.0
3131
golang.org/x/crypto => golang.org/x/crypto v0.47.0
3232
golang.org/x/net => golang.org/x/net v0.55.0
@@ -140,19 +140,19 @@ require (
140140
github.com/urfave/cli/v2 v2.27.7
141141
github.com/vishvananda/netlink v1.3.1
142142
github.com/yl2chen/cidranger v1.0.2
143-
go.etcd.io/etcd/api/v3 v3.6.12
144-
go.etcd.io/etcd/client/pkg/v3 v3.6.12
145-
go.etcd.io/etcd/client/v3 v3.6.12
143+
go.etcd.io/etcd/api/v3 v3.6.14
144+
go.etcd.io/etcd/client/pkg/v3 v3.6.14
145+
go.etcd.io/etcd/client/v3 v3.6.14
146146
go.etcd.io/etcd/etcdutl/v3 v3.6.6
147-
go.etcd.io/etcd/server/v3 v3.6.12
147+
go.etcd.io/etcd/server/v3 v3.6.14
148148
go.uber.org/mock v0.6.0
149149
go.uber.org/zap v1.28.0
150150
golang.org/x/crypto v0.53.0
151151
golang.org/x/mod v0.36.0
152152
golang.org/x/net v0.55.0
153153
golang.org/x/sync v0.21.0
154154
golang.org/x/sys v0.46.0
155-
google.golang.org/grpc v1.81.1
155+
google.golang.org/grpc v1.82.1
156156
gopkg.in/yaml.v2 v2.4.0
157157
k8s.io/api v0.35.6
158158
k8s.io/apiextensions-apiserver v0.35.2
@@ -483,7 +483,7 @@ require (
483483
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
484484
github.com/zeebo/xxh3 v1.1.0 // indirect
485485
go.etcd.io/bbolt v1.4.3 // indirect
486-
go.etcd.io/etcd/pkg/v3 v3.6.12 // indirect
486+
go.etcd.io/etcd/pkg/v3 v3.6.14 // indirect
487487
go.etcd.io/raft/v3 v3.6.0 // indirect
488488
go.opencensus.io v0.24.0 // indirect
489489
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
@@ -512,8 +512,8 @@ require (
512512
golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 // indirect
513513
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20241231184526-a9ab2273dd10 // indirect
514514
gonum.org/v1/gonum v0.17.0 // indirect
515-
google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 // indirect
516-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 // indirect
515+
google.golang.org/genproto/googleapis/api v0.0.0-20260414002931-afd174a4e478 // indirect
516+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260414002931-afd174a4e478 // indirect
517517
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af // indirect
518518
gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect
519519
gopkg.in/inf.v0 v0.9.1 // indirect

‎go.sum‎

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -862,18 +862,18 @@ github.com/k3s-io/cri-dockerd v0.3.19-k3s3 h1:fZTPlYTPZaUwh6Z8RTN6jYFjC3gvyW/O4V
862862
github.com/k3s-io/cri-dockerd v0.3.19-k3s3/go.mod h1:t9ANNTpfHRdsVoKuwd+/INWoGgjQQRHiBENk4yfumSc=
863863
github.com/k3s-io/cri-tools v1.34.0-k3s2 h1:6TZBGipv1T3dhJmgIJzmHX8VvB45j/uH48wnfCx5+6Y=
864864
github.com/k3s-io/cri-tools v1.34.0-k3s2/go.mod h1:JyYVG0YFsly+p/hfDfmQcQBNFVHh0+BpMTn49YpasMA=
865-
github.com/k3s-io/etcd/api/v3 v3.6.12-k3s1 h1:ghxMfE1ZB9yy9YgDISN/XaispHBnvLS21AUlNlL16X0=
866-
github.com/k3s-io/etcd/api/v3 v3.6.12-k3s1/go.mod h1:p14EIQXHbuOQbVvL/WEes5uqKnxP9AgKJgpjbMVvzvE=
867-
github.com/k3s-io/etcd/client/pkg/v3 v3.6.12-k3s1 h1:MPvbiGUemxOoxGjR3FAXIjzJ+rHT5ihcoHz3v6aVrww=
868-
github.com/k3s-io/etcd/client/pkg/v3 v3.6.12-k3s1/go.mod h1:hh2+ZXtfLzs3o6mn92ntgNPBrTJJOvXqICM5g3L3DMY=
869-
github.com/k3s-io/etcd/client/v3 v3.6.12-k3s1 h1:w1bBNm01B8vEr0uEK6OYSfJEF/fJh+RcC9fpAOhrZR4=
870-
github.com/k3s-io/etcd/client/v3 v3.6.12-k3s1/go.mod h1:CMs6fJWYiZQk4ytFjd4lE1diOvvRMmtbbn/alZXd3dQ=
871-
github.com/k3s-io/etcd/etcdutl/v3 v3.6.12-k3s1 h1:FbJ4sPZctK38O+zoL3zpXyEBmBc2KdBlb4g0mKmaQz0=
872-
github.com/k3s-io/etcd/etcdutl/v3 v3.6.12-k3s1/go.mod h1:ZhxWJgE0yEslHH8XVKY1dzB8uZpkUyACmfOGJ56Va7I=
873-
github.com/k3s-io/etcd/pkg/v3 v3.6.12-k3s1 h1:nsxkj7ZfkN6Lwgcc2hgzgtonlzACGid7tL396W77xLs=
874-
github.com/k3s-io/etcd/pkg/v3 v3.6.12-k3s1/go.mod h1:qDFIetmpC8TTZfkZkDzpNrXtVqVsyYumRWNPFXFhcpQ=
875-
github.com/k3s-io/etcd/server/v3 v3.6.12-k3s1 h1:Vbyuel/bZd/RgDQkfCxuYZmdUNcwgp8RuER5w+GrsYU=
876-
github.com/k3s-io/etcd/server/v3 v3.6.12-k3s1/go.mod h1:iiREo2DGRVjtiAjQeA3LQyYCk6YDFo3uS30/vImHdtk=
865+
github.com/k3s-io/etcd/api/v3 v3.6.14-k3s1 h1:Gt/+PEVKl+oQbLdxf6pAR1Yziagp4lg+v2XCArXq+uM=
866+
github.com/k3s-io/etcd/api/v3 v3.6.14-k3s1/go.mod h1:L4HXnXoJ5NqXSxiwB4RihT5gGJJVvHEEOpEZ37g1Uj4=
867+
github.com/k3s-io/etcd/client/pkg/v3 v3.6.14-k3s1 h1:wFmUw/s/eihX2PvuyvPZfLpIEAJqtQ8LF2ZsBkEQ0wM=
868+
github.com/k3s-io/etcd/client/pkg/v3 v3.6.14-k3s1/go.mod h1:Po3WXW01VRS7/gSDf8xjiY2rJTLmAwq/YmKAEz6u1+E=
869+
github.com/k3s-io/etcd/client/v3 v3.6.14-k3s1 h1:Myx9uYTMepbfYu8TXgjs3/rtC9cIjjts55WWhYEESQg=
870+
github.com/k3s-io/etcd/client/v3 v3.6.14-k3s1/go.mod h1:rQqHPE7ju1B1nmaqpGdhRgBHqOTiVaUeymlY1/ATcoM=
871+
github.com/k3s-io/etcd/etcdutl/v3 v3.6.14-k3s1 h1:I4kSpINTZqD2UoqCzO01FUm1yENyYUGPgt7N7zcRHf0=
872+
github.com/k3s-io/etcd/etcdutl/v3 v3.6.14-k3s1/go.mod h1:RycLZKchoNnolIgHNO58ZzM7dcvAhXhLJve9XbWA8Hc=
873+
github.com/k3s-io/etcd/pkg/v3 v3.6.14-k3s1 h1:s95NYEWi0ZuCttIQeNV9e2rcA1YoYRRSB5JRClO+5Fk=
874+
github.com/k3s-io/etcd/pkg/v3 v3.6.14-k3s1/go.mod h1:grZHgzt+JCM8hnwSFrEAGxcl/VXksW0dRXfU0R2RmF8=
875+
github.com/k3s-io/etcd/server/v3 v3.6.14-k3s1 h1:yTlDjmjVu8+s6uhArtRFx8kSI0Gyg9v0bHVHsuj3mtY=
876+
github.com/k3s-io/etcd/server/v3 v3.6.14-k3s1/go.mod h1:yj1SNtvmNLLl7JUQY3vpaUBm24qAzTVixJn/1OKG6i4=
877877
github.com/k3s-io/helm-controller v0.16.25 h1:z+3WDJMxZ9G7+tcodfY2X44CtnKGCp7WqIpHisTXnRQ=
878878
github.com/k3s-io/helm-controller v0.16.25/go.mod h1:1iRWHzW54LV5t3NdpRD8Eo3DWosPaDVrXBQ6hjac+8c=
879879
github.com/k3s-io/kine v0.16.3 h1:NstMQZ7AIRA9dC+uu+ZpK5eITwsANrSDX4Fe6yTSmpU=
@@ -1675,7 +1675,6 @@ golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
16751675
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
16761676
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
16771677
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
1678-
golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
16791678
golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
16801679
golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
16811680
golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
@@ -1728,10 +1727,9 @@ golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
17281727
golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
17291728
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
17301729
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
1731-
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
17321730
golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
1731+
golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
17331732
golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8=
1734-
golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164=
17351733
golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38=
17361734
golang.org/x/text v0.38.0 h1:sXmwo9DwP3OK9EZ7PqAdaooSGozfl/3a6/xJcbzPRhE=
17371735
golang.org/x/text v0.38.0/go.mod h1:YXZt3QhHUKYT53r2lLKFIVi6Ao1jdzrTR/KQ09qyxF4=
@@ -1916,9 +1914,8 @@ google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142/go.
19161914
google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a/go.mod h1:jehYqy3+AhJU9ve55aNOaSml7wUXjF9x6z2LcCfpAhY=
19171915
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a/go.mod h1:3kWAYMk1I75K4vykHtKt2ycnOgpA6974V7bREqbsenU=
19181916
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb/go.mod h1:jbe3Bkdp+Dh2IrslsFCklNhweNTBgSYanP1UXhJDhKg=
1919-
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:+rXWjjaukWZun3mLfjmVnQi18E1AsFbDN9QdJ5YXLto=
1920-
google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 h1:VPWxll4HlMw1Vs/qXtN7BvhZqsS9cdAittCNvVENElA=
1921-
google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:7QBABkRtR8z+TEnmXTqIqwJLlzrZKVfAUm7tY3yGv0M=
1917+
google.golang.org/genproto/googleapis/api v0.0.0-20260414002931-afd174a4e478 h1:yQugLulqltosq0B/f8l4w9VryjV+N/5gcW0jQ3N8Qec=
1918+
google.golang.org/genproto/googleapis/api v0.0.0-20260414002931-afd174a4e478/go.mod h1:C6ADNqOxbgdUUeRTU+LCHDPB9ttAMCTff6auwCVa4uc=
19221919
google.golang.org/genproto/googleapis/bytestream v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:ylj+BE99M198VPbBh6A8d9n3w8fChvyLK3wwBOjXBFA=
19231920
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234015-3fc162c6f38a/go.mod h1:xURIpW9ES5+/GZhnV6beoEtxQrnkRGIfP5VQG2tCBLc=
19241921
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA=
@@ -1935,10 +1932,9 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20250212204824-5a70512c5d8b/go.
19351932
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a/go.mod h1:uRxBH1mhmO8PGhU89cMcHaXKZqO+OfakD8QQO0oYwlQ=
19361933
google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I=
19371934
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I=
1938-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251124214823-79d6a2a48846/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
1939-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
1940-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 h1:m8qni9SQFH0tJc1X0vmnpw/0t+AImlSvp30sEupozUg=
1941-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
1935+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260406210006-6f92a3bedf2d/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
1936+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260414002931-afd174a4e478 h1:RmoJA1ujG+/lRGNfUnOMfhCy5EipVMyvUE+KNbPbTlw=
1937+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260414002931-afd174a4e478/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
19421938
google.golang.org/grpc v1.72.1 h1:HR03wO6eyZ7lknl75XlxABNVLLFc2PAb6mHlYh756mA=
19431939
google.golang.org/grpc v1.72.1/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
19441940
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
@@ -1962,7 +1958,7 @@ google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojt
19621958
google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
19631959
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
19641960
google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
1965-
google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
1961+
google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
19661962
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af h1:+5/Sw3GsDNlEmu7TfklWKPdQ0Ykja5VEmq2i817+jbI=
19671963
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
19681964
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

0 commit comments

Comments
 (0)