Skip to content

Commit 080024b

Browse files
authored
Merge pull request #6 from kcp-dev/bump.etcd
Kubernetes 1.34 & etcd server 3.6.4
2 parents a4839a8 + 9113f31 commit 080024b

File tree

3 files changed

+127
-200
lines changed

3 files changed

+127
-200
lines changed

config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333

3434
"go.etcd.io/etcd/client/pkg/v3/fileutil"
3535
"go.etcd.io/etcd/server/v3/embed"
36-
"go.etcd.io/etcd/server/v3/wal"
36+
"go.etcd.io/etcd/server/v3/storage/wal"
3737
"go.uber.org/zap"
3838

3939
"github.com/kcp-dev/embeddedetcd/options"

go.mod

Lines changed: 42 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ go 1.24.0
44

55
require (
66
github.com/spf13/pflag v1.0.6
7-
go.etcd.io/etcd/client/pkg/v3 v3.5.21
8-
go.etcd.io/etcd/server/v3 v3.5.21
7+
go.etcd.io/etcd/client/pkg/v3 v3.6.4
8+
go.etcd.io/etcd/server/v3 v3.6.4
99
go.uber.org/zap v1.27.0
10-
k8s.io/apiserver v0.33.3
10+
k8s.io/apiserver v0.34.2
1111
k8s.io/klog/v2 v2.130.1
1212
)
1313

1414
require (
15-
cel.dev/expr v0.19.1 // indirect
15+
cel.dev/expr v0.24.0 // indirect
1616
github.com/NYTimes/gziphandler v1.1.1 // indirect
1717
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
1818
github.com/beorn7/perks v1.0.1 // indirect
@@ -23,38 +23,39 @@ require (
2323
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
2424
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2525
github.com/dustin/go-humanize v1.0.1 // indirect
26-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
26+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
2727
github.com/felixge/httpsnoop v1.0.4 // indirect
28-
github.com/fsnotify/fsnotify v1.7.0 // indirect
29-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
28+
github.com/fsnotify/fsnotify v1.9.0 // indirect
29+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
3030
github.com/go-logr/logr v1.4.2 // indirect
3131
github.com/go-logr/stdr v1.2.2 // indirect
3232
github.com/go-openapi/jsonpointer v0.21.0 // indirect
3333
github.com/go-openapi/jsonreference v0.21.0 // indirect
3434
github.com/go-openapi/swag v0.23.0 // indirect
3535
github.com/gogo/protobuf v1.3.2 // indirect
36-
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
36+
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
3737
github.com/golang/protobuf v1.5.4 // indirect
3838
github.com/google/btree v1.1.3 // indirect
39-
github.com/google/cel-go v0.23.2 // indirect
40-
github.com/google/gnostic-models v0.6.9 // indirect
39+
github.com/google/cel-go v0.26.0 // indirect
40+
github.com/google/gnostic-models v0.7.0 // indirect
4141
github.com/google/go-cmp v0.7.0 // indirect
4242
github.com/google/uuid v1.6.0 // indirect
4343
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
44-
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
44+
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 // indirect
45+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.0 // indirect
4546
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
46-
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
47-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
47+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
4848
github.com/inconshreveable/mousetrap v1.1.0 // indirect
49-
github.com/jonboulle/clockwork v0.4.0 // indirect
49+
github.com/jonboulle/clockwork v0.5.0 // indirect
5050
github.com/josharian/intern v1.0.0 // indirect
5151
github.com/json-iterator/go v1.1.12 // indirect
5252
github.com/kylelemons/godebug v1.1.0 // indirect
5353
github.com/mailru/easyjson v0.9.0 // indirect
5454
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
55-
github.com/modern-go/reflect2 v1.0.2 // indirect
55+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
5656
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5757
github.com/pkg/errors v0.9.1 // indirect
58+
github.com/pmezard/go-difflib v1.0.0 // indirect
5859
github.com/prometheus/client_golang v1.22.0 // indirect
5960
github.com/prometheus/client_model v0.6.1 // indirect
6061
github.com/prometheus/common v0.62.0 // indirect
@@ -66,23 +67,24 @@ require (
6667
github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 // indirect
6768
github.com/x448/float16 v0.8.4 // indirect
6869
github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510 // indirect
69-
go.etcd.io/bbolt v1.3.11 // indirect
70-
go.etcd.io/etcd/api/v3 v3.5.21 // indirect
71-
go.etcd.io/etcd/client/v2 v2.305.21 // indirect
72-
go.etcd.io/etcd/client/v3 v3.5.21 // indirect
73-
go.etcd.io/etcd/pkg/v3 v3.5.21 // indirect
74-
go.etcd.io/etcd/raft/v3 v3.5.21 // indirect
70+
go.etcd.io/bbolt v1.4.2 // indirect
71+
go.etcd.io/etcd/api/v3 v3.6.4 // indirect
72+
go.etcd.io/etcd/client/v3 v3.6.4 // indirect
73+
go.etcd.io/etcd/pkg/v3 v3.6.4 // indirect
74+
go.etcd.io/raft/v3 v3.6.0 // indirect
7575
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
76-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
76+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
7777
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
78-
go.opentelemetry.io/otel v1.33.0 // indirect
79-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
80-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
81-
go.opentelemetry.io/otel/metric v1.33.0 // indirect
82-
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
83-
go.opentelemetry.io/otel/trace v1.33.0 // indirect
84-
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
78+
go.opentelemetry.io/otel v1.35.0 // indirect
79+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
80+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
81+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
82+
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
83+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
84+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
8585
go.uber.org/multierr v1.11.0 // indirect
86+
go.yaml.in/yaml/v2 v2.4.2 // indirect
87+
go.yaml.in/yaml/v3 v3.0.4 // indirect
8688
golang.org/x/crypto v0.38.0 // indirect
8789
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
8890
golang.org/x/net v0.40.0 // indirect
@@ -92,25 +94,24 @@ require (
9294
golang.org/x/term v0.32.0 // indirect
9395
golang.org/x/text v0.25.0 // indirect
9496
golang.org/x/time v0.11.0 // indirect
95-
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
96-
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
97-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
98-
google.golang.org/grpc v1.69.2 // indirect
97+
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
98+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
99+
google.golang.org/grpc v1.72.1 // indirect
99100
google.golang.org/protobuf v1.36.5 // indirect
100101
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
101102
gopkg.in/inf.v0 v0.9.1 // indirect
102103
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
103104
gopkg.in/yaml.v3 v3.0.1 // indirect
104-
k8s.io/api v0.33.3 // indirect
105-
k8s.io/apimachinery v0.33.3 // indirect
106-
k8s.io/client-go v0.33.3 // indirect
107-
k8s.io/component-base v0.33.3 // indirect
108-
k8s.io/kms v0.33.3 // indirect
109-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
105+
k8s.io/api v0.34.2 // indirect
106+
k8s.io/apimachinery v0.34.2 // indirect
107+
k8s.io/client-go v0.34.2 // indirect
108+
k8s.io/component-base v0.34.2 // indirect
109+
k8s.io/kms v0.34.2 // indirect
110+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
110111
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
111112
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
112113
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
113114
sigs.k8s.io/randfill v1.0.0 // indirect
114-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
115-
sigs.k8s.io/yaml v1.4.0 // indirect
115+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
116+
sigs.k8s.io/yaml v1.6.0 // indirect
116117
)

0 commit comments

Comments
 (0)