From 701cc35b7a08f5d16c16c6d4df0f56a7ffa96faf Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Wed, 8 Oct 2025 22:53:05 +0000 Subject: [PATCH] Bump kine=v0.14.4, etcd=v3.6.5 Signed-off-by: Brad Davidson --- go.mod | 30 +++++++++++++++--------------- go.sum | 39 ++++++++++++++++++++------------------- 2 files changed, 35 insertions(+), 34 deletions(-) diff --git a/go.mod b/go.mod index 20f43ad96a3..4d7a57dd40a 100644 --- a/go.mod +++ b/go.mod @@ -23,13 +23,13 @@ replace ( github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.22.0 github.com/prometheus/common => github.com/prometheus/common v0.62.0 github.com/spegel-org/spegel => github.com/k3s-io/spegel v0.4.0-k3s3 - go.etcd.io/etcd/api/v3 => github.com/k3s-io/etcd/api/v3 v3.6.4-k3s3 - go.etcd.io/etcd/client/pkg/v3 => github.com/k3s-io/etcd/client/pkg/v3 v3.6.4-k3s3 - go.etcd.io/etcd/client/v2 => github.com/k3s-io/etcd/client/v2 v2.306.4-k3s3 - go.etcd.io/etcd/client/v3 => github.com/k3s-io/etcd/client/v3 v3.6.4-k3s3 - go.etcd.io/etcd/etcdutl/v3 => github.com/k3s-io/etcd/etcdutl/v3 v3.6.4-k3s3 - go.etcd.io/etcd/pkg/v3 => github.com/k3s-io/etcd/pkg/v3 v3.6.4-k3s3 - go.etcd.io/etcd/server/v3 => github.com/k3s-io/etcd/server/v3 v3.6.4-k3s3 + go.etcd.io/etcd/api/v3 => github.com/k3s-io/etcd/api/v3 v3.6.5-k3s1 + go.etcd.io/etcd/client/pkg/v3 => github.com/k3s-io/etcd/client/pkg/v3 v3.6.5-k3s1 + go.etcd.io/etcd/client/v2 => github.com/k3s-io/etcd/client/v2 v2.306.5-k3s1 + go.etcd.io/etcd/client/v3 => github.com/k3s-io/etcd/client/v3 v3.6.5-k3s1 + go.etcd.io/etcd/etcdutl/v3 => github.com/k3s-io/etcd/etcdutl/v3 v3.6.5-k3s1 + go.etcd.io/etcd/pkg/v3 => github.com/k3s-io/etcd/pkg/v3 v3.6.5-k3s1 + go.etcd.io/etcd/server/v3 => github.com/k3s-io/etcd/server/v3 v3.6.5-k3s1 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 golang.org/x/crypto => golang.org/x/crypto v0.36.0 golang.org/x/net => golang.org/x/net v0.38.0 @@ -109,7 +109,7 @@ require ( github.com/json-iterator/go v1.1.12 github.com/k3s-io/api v0.1.3 github.com/k3s-io/helm-controller v0.16.14 - github.com/k3s-io/kine v0.14.3 + github.com/k3s-io/kine v0.14.4 github.com/klauspost/compress v1.18.0 github.com/libp2p/go-libp2p v0.43.0 github.com/minio/minio-go/v7 v7.0.91 @@ -139,11 +139,11 @@ require ( github.com/urfave/cli/v2 v2.27.7 github.com/vishvananda/netlink v1.3.1 github.com/yl2chen/cidranger v1.0.2 - go.etcd.io/etcd/api/v3 v3.6.4 - go.etcd.io/etcd/client/pkg/v3 v3.6.4 - go.etcd.io/etcd/client/v3 v3.6.4 + go.etcd.io/etcd/api/v3 v3.6.5 + go.etcd.io/etcd/client/pkg/v3 v3.6.5 + go.etcd.io/etcd/client/v3 v3.6.5 go.etcd.io/etcd/etcdutl/v3 v3.6.4 - go.etcd.io/etcd/server/v3 v3.6.4 + go.etcd.io/etcd/server/v3 v3.6.5 go.uber.org/mock v0.5.2 go.uber.org/zap v1.27.0 golang.org/x/crypto v0.42.0 @@ -392,7 +392,7 @@ require ( github.com/nats-io/jsm.go v0.3.0 // indirect github.com/nats-io/jwt/v2 v2.8.0 // indirect github.com/nats-io/nats-server/v2 v2.12.0 // indirect - github.com/nats-io/nats.go v1.46.0 // indirect + github.com/nats-io/nats.go v1.46.1 // indirect github.com/nats-io/nkeys v0.4.11 // indirect github.com/nats-io/nuid v1.0.1 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect @@ -454,7 +454,7 @@ require ( github.com/xlab/treeprint v1.2.0 // indirect github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect go.etcd.io/bbolt v1.4.3 // indirect - go.etcd.io/etcd/pkg/v3 v3.6.4 // indirect + go.etcd.io/etcd/pkg/v3 v3.6.5 // indirect go.etcd.io/raft/v3 v3.6.0 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect @@ -477,7 +477,7 @@ require ( golang.org/x/exp v0.0.0-20250911091902-df9299821621 // indirect golang.org/x/oauth2 v0.30.0 // indirect golang.org/x/telemetry v0.0.0-20250908211612-aef8a434d053 // indirect - golang.org/x/term v0.34.0 // indirect + golang.org/x/term v0.35.0 // indirect golang.org/x/text v0.29.0 // indirect golang.org/x/time v0.13.0 // indirect golang.org/x/tools v0.37.0 // indirect diff --git a/go.sum b/go.sum index f4e5f85f60e..90adb51bbb3 100644 --- a/go.sum +++ b/go.sum @@ -783,22 +783,22 @@ github.com/k3s-io/cri-dockerd v0.3.19-k3s3 h1:fZTPlYTPZaUwh6Z8RTN6jYFjC3gvyW/O4V github.com/k3s-io/cri-dockerd v0.3.19-k3s3/go.mod h1:t9ANNTpfHRdsVoKuwd+/INWoGgjQQRHiBENk4yfumSc= github.com/k3s-io/cri-tools v1.34.0-k3s2 h1:6TZBGipv1T3dhJmgIJzmHX8VvB45j/uH48wnfCx5+6Y= github.com/k3s-io/cri-tools v1.34.0-k3s2/go.mod h1:JyYVG0YFsly+p/hfDfmQcQBNFVHh0+BpMTn49YpasMA= -github.com/k3s-io/etcd/api/v3 v3.6.4-k3s3 h1:eQegwy8neVH9ZttzH4CiJCHtBfzMmGv7A/jb5dr+fhM= -github.com/k3s-io/etcd/api/v3 v3.6.4-k3s3/go.mod h1:eFhhvfR8Px1P6SEuLT600v+vrhdDTdcfMzmnxVXXSbk= -github.com/k3s-io/etcd/client/pkg/v3 v3.6.4-k3s3 h1:Q84pww2XX7kjgTTXMeASNAqMBkmOcc+enLdXY64Z4c4= -github.com/k3s-io/etcd/client/pkg/v3 v3.6.4-k3s3/go.mod h1:sbdzr2cl3HzVmxNw//PH7aLGVtY4QySjQFuaCgcRFAI= -github.com/k3s-io/etcd/client/v3 v3.6.4-k3s3 h1:Aw1ZD98L9Fr4nVEwVXLAMhrhssUIpniy8Us5t0qHAzE= -github.com/k3s-io/etcd/client/v3 v3.6.4-k3s3/go.mod h1:jaNNHCyg2FdALyKWnd7hxZXZxZANb0+KGY+YQaEMISo= -github.com/k3s-io/etcd/etcdutl/v3 v3.6.4-k3s3 h1:pPMqYqGQAOlTXwr6+VeFk3v7bBxGovlD/1QGIGAViLY= -github.com/k3s-io/etcd/etcdutl/v3 v3.6.4-k3s3/go.mod h1:Xenj0F9suciwNWbc9YFunjauLXxPquoDzbhISUhuENU= -github.com/k3s-io/etcd/pkg/v3 v3.6.4-k3s3 h1:y46UnWCRtSftjyI4iTlnGLqr+cHEHwqPQELPOlBOEEQ= -github.com/k3s-io/etcd/pkg/v3 v3.6.4-k3s3/go.mod h1:kKcYWP8gHuBRcteyv6MXWSN0+bVMnfgqiHueIZnKMtE= -github.com/k3s-io/etcd/server/v3 v3.6.4-k3s3 h1:DY9zD2dDmIw6L0G+nL5s4ivIV73f4lQIQcV22QSCjHQ= -github.com/k3s-io/etcd/server/v3 v3.6.4-k3s3/go.mod h1:aYCL/h43yiONOv0QIR82kH/2xZ7m+IWYjzRmyQfnCAg= +github.com/k3s-io/etcd/api/v3 v3.6.5-k3s1 h1:27QeCm3wHCWTa305Ari6q55u5Zo5udpMkP/1YDkVYw4= +github.com/k3s-io/etcd/api/v3 v3.6.5-k3s1/go.mod h1:ob0/oWA/UQQlT1BmaEkWQzI0sJ1M0Et0mMpaABxguOQ= +github.com/k3s-io/etcd/client/pkg/v3 v3.6.5-k3s1 h1:GTlAENa/Y03cD/iZtHoutuZN3kJ68DvcYGCZTyezsYQ= +github.com/k3s-io/etcd/client/pkg/v3 v3.6.5-k3s1/go.mod h1:8Wx3eGRPiy0qOFMZT/hfvdos+DjEaPxdIDiCDUv/FQk= +github.com/k3s-io/etcd/client/v3 v3.6.5-k3s1 h1:F8bZExv858WE4NsE10ZbAYYZ9njhinoY9Rm8yjh96Zw= +github.com/k3s-io/etcd/client/v3 v3.6.5-k3s1/go.mod h1:ZqwG/7TAFZ0BJ0jXRPoJjKQJtbFo/9NIY8uoFFKcCyo= +github.com/k3s-io/etcd/etcdutl/v3 v3.6.5-k3s1 h1:JECN+Rrqp+DwEJNh6tYe5cOLvh4Pk5NnrefG0h32lg0= +github.com/k3s-io/etcd/etcdutl/v3 v3.6.5-k3s1/go.mod h1:BdqSgf46lopFxMBkpvC1hQGekLjfX0BDDWbcmVAC6Mw= +github.com/k3s-io/etcd/pkg/v3 v3.6.5-k3s1 h1:NOF2ounZfouZMXJfxAXoGv7Jj49nJJRqZDpmhshVbhs= +github.com/k3s-io/etcd/pkg/v3 v3.6.5-k3s1/go.mod h1:uqrXrzmMIJDEy5j00bCqhVLzR5jEJIwDp5wTlLwPGOU= +github.com/k3s-io/etcd/server/v3 v3.6.5-k3s1 h1:7nk12snclYRqXEfzo36KS+qtI+/2t85JQUvQ8akJmOw= +github.com/k3s-io/etcd/server/v3 v3.6.5-k3s1/go.mod h1:PLuhyVXz8WWRhzXDsl3A3zv/+aK9e4A9lpQkqawIaH0= github.com/k3s-io/helm-controller v0.16.14 h1:UzTNhpxAzlTlNHuIOTJ69cekelVWj+dsgnDvWGoLf5s= github.com/k3s-io/helm-controller v0.16.14/go.mod h1:mw6sVaH/eli+81sUnRqRYh5wV7YVzYp+U7OucLT5kUc= -github.com/k3s-io/kine v0.14.3 h1:Jpmm0yPjpSS6UynPxMwRIEZULTfq0ROI3WMlWreP14M= -github.com/k3s-io/kine v0.14.3/go.mod h1:V6kNehYFcTQlSv+zsrjINpBwmK8Y2tTXj/mm2I5nrT8= +github.com/k3s-io/kine v0.14.4 h1:Gd0xPnUkLWrjGcV/sEIJkYpGiWL54NqsnjHbn1n7fsc= +github.com/k3s-io/kine v0.14.4/go.mod h1:X4hhYU3ighoJbBcpSV7h4bYA+F86ulOa1KwbLZ62lk4= github.com/k3s-io/klog/v2 v2.120.1-k3s1 h1:7twAHPFpZA21KdMnMNnj68STQMPldAxF2Zsaol57dxw= github.com/k3s-io/klog/v2 v2.120.1-k3s1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= github.com/k3s-io/kube-router/v2 v2.6.1-k3s3 h1:5fnTCJTe59mJC6sPMS1CGmLjG7oGNLgHRXhay2/SFm0= @@ -1062,8 +1062,8 @@ github.com/nats-io/jwt/v2 v2.8.0 h1:K7uzyz50+yGZDO5o772eRE7atlcSEENpL7P+b74JV1g= github.com/nats-io/jwt/v2 v2.8.0/go.mod h1:me11pOkwObtcBNR8AiMrUbtVOUGkqYjMQZ6jnSdVUIA= github.com/nats-io/nats-server/v2 v2.12.0 h1:OIwe8jZUqJFrh+hhiyKu8snNib66qsx806OslqJuo74= github.com/nats-io/nats-server/v2 v2.12.0/go.mod h1:nr8dhzqkP5E/lDwmn+A2CvQPMd1yDKXQI7iGg3lAvww= -github.com/nats-io/nats.go v1.46.0 h1:iUcX+MLT0HHXskGkz+Sg20sXrPtJLsOojMDTDzOHSb8= -github.com/nats-io/nats.go v1.46.0/go.mod h1:iRWIPokVIFbVijxuMQq4y9ttaBTMe0SFdlZfMDd+33g= +github.com/nats-io/nats.go v1.46.1 h1:bqQ2ZcxVd2lpYI97xYASeRTY3I5boe/IVmuUDPitHfo= +github.com/nats-io/nats.go v1.46.1/go.mod h1:iRWIPokVIFbVijxuMQq4y9ttaBTMe0SFdlZfMDd+33g= github.com/nats-io/nkeys v0.4.11 h1:q44qGV008kYd9W1b1nEBkNzvnWxtRSQ7A8BoqRrcfa0= github.com/nats-io/nkeys v0.4.11/go.mod h1:szDimtgmfOi9n25JpfIdGw12tZFYXqhGxjhVxsatHVE= github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= @@ -1215,8 +1215,9 @@ github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTE github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= -github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= +github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= +github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/rootless-containers/rootlesskit v1.1.1 h1:F5psKWoWY9/VjZ3ifVcaosjvFZJOagX85U22M0/EQZE= github.com/rootless-containers/rootlesskit v1.1.1/go.mod h1:UD5GoA3dqKCJrnvnhVgQQnweMF2qZnf9KLw8EewcMZI= github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU= @@ -1578,8 +1579,8 @@ golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457/go.mod h1:pRgIJT+bRLFK golang.org/x/telemetry v0.0.0-20250908211612-aef8a434d053 h1:dHQOQddU4YHS5gY33/6klKjq7Gp3WwMyOXGNp5nzRj8= golang.org/x/telemetry v0.0.0-20250908211612-aef8a434d053/go.mod h1:+nZKN+XVh4LCiA9DV3ywrzN4gumyCnKjau3NGb9SGoE= golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g= -golang.org/x/term v0.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4= -golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw= +golang.org/x/term v0.35.0 h1:bZBVKBudEyhRcajGcNc3jIfWPqV4y/Kt2XcoigOWtDQ= +golang.org/x/term v0.35.0/go.mod h1:TPGtkTLesOwf2DE8CgVYiZinHAOuy5AYUYT1lENIZnA= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=