Skip to content

Commit bc3ca6c

Browse files
authored
Bump kcp to 0.31 (#156)
* bump kcp & friends * Update multicluster-runtime * add nolint * go mod tidy
1 parent f59c0b1 commit bc3ca6c

10 files changed

Lines changed: 110 additions & 120 deletions

File tree

go.mod

Lines changed: 29 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ go 1.25.0
55
replace github.com/kcp-dev/api-syncagent/sdk => ./sdk
66

77
replace (
8-
k8s.io/apiextensions-apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20251209073509-71e0f2506325
9-
k8s.io/apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20251209073509-71e0f2506325
8+
k8s.io/apiextensions-apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20260401063412-ba4f7d493d5b
9+
k8s.io/apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20260401063412-ba4f7d493d5b
10+
k8s.io/component-base => github.com/kcp-dev/kubernetes/staging/src/k8s.io/component-base v0.0.0-20260401063412-ba4f7d493d5b
1011
)
1112

1213
require (
@@ -18,27 +19,28 @@ require (
1819
github.com/google/go-cmp v0.7.0
1920
github.com/google/uuid v1.6.0
2021
github.com/kcp-dev/api-syncagent/sdk v0.0.0-00010101000000-000000000000
21-
github.com/kcp-dev/kcp v0.29.1-0.20251210093424-08fb9eb48494
2222
github.com/kcp-dev/logicalcluster/v3 v3.0.5
23-
github.com/kcp-dev/multicluster-provider v0.3.2-0.20251209135920-e758bf0f4e48
24-
github.com/kcp-dev/sdk v0.28.1-0.20251209130449-436a0347809b
23+
github.com/kcp-dev/multicluster-provider v0.6.0
24+
github.com/kcp-dev/multicluster-provider/client v0.0.0-20260412105142-7979b3b2700b
25+
github.com/kcp-dev/sdk v0.31.0
26+
github.com/kcp-dev/virtual-workspace-framework v0.31.0
2527
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
2628
github.com/spf13/cobra v1.10.1
2729
github.com/spf13/pflag v1.0.10
2830
github.com/tidwall/gjson v1.18.0
2931
github.com/tidwall/sjson v1.2.5
3032
go.uber.org/zap v1.27.1
3133
k8c.io/reconciler v0.5.0
32-
k8s.io/api v0.34.2
33-
k8s.io/apiextensions-apiserver v0.34.2
34-
k8s.io/apimachinery v0.34.2
35-
k8s.io/apiserver v0.34.2
36-
k8s.io/client-go v0.34.2
37-
k8s.io/component-base v0.34.2
38-
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b
39-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
40-
sigs.k8s.io/controller-runtime v0.22.4
41-
sigs.k8s.io/multicluster-runtime v0.22.4-beta.1
34+
k8s.io/api v0.35.1
35+
k8s.io/apiextensions-apiserver v0.35.1
36+
k8s.io/apimachinery v0.35.1
37+
k8s.io/apiserver v0.35.1
38+
k8s.io/client-go v0.35.1
39+
k8s.io/component-base v0.35.1
40+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912
41+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
42+
sigs.k8s.io/controller-runtime v0.23.3
43+
sigs.k8s.io/multicluster-runtime v0.23.3
4244
sigs.k8s.io/yaml v1.6.0
4345
)
4446

@@ -56,7 +58,6 @@ require (
5658
github.com/coreos/go-semver v0.3.1 // indirect
5759
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
5860
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
59-
github.com/distribution/reference v0.6.0 // indirect
6061
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
6162
github.com/felixge/httpsnoop v1.0.4 // indirect
6263
github.com/fsnotify/fsnotify v1.9.0 // indirect
@@ -82,13 +83,12 @@ require (
8283
github.com/google/gnostic-models v0.7.0 // indirect
8384
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
8485
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
85-
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
8686
github.com/huandu/xstrings v1.5.0 // indirect
8787
github.com/inconshreveable/mousetrap v1.1.0 // indirect
8888
github.com/josharian/intern v1.0.0 // indirect
8989
github.com/json-iterator/go v1.1.12 // indirect
90-
github.com/kcp-dev/apimachinery/v2 v2.29.1-0.20251209121225-cf3c0b624983 // indirect
91-
github.com/kcp-dev/client-go v0.28.1-0.20251209170419-79146629224a // indirect
90+
github.com/kcp-dev/apimachinery/v2 v2.31.0 // indirect
91+
github.com/kcp-dev/client-go v0.31.0 // indirect
9292
github.com/kylelemons/godebug v1.1.0 // indirect
9393
github.com/mailru/easyjson v0.9.1 // indirect
9494
github.com/mitchellh/copystructure v1.2.0 // indirect
@@ -97,20 +97,19 @@ require (
9797
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
9898
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
9999
github.com/onsi/gomega v1.38.2 // indirect
100-
github.com/opencontainers/go-digest v1.0.0 // indirect
101-
github.com/prometheus/client_golang v1.22.0 // indirect
102-
github.com/prometheus/client_model v0.6.1 // indirect
103-
github.com/prometheus/common v0.63.0 // indirect
104-
github.com/prometheus/procfs v0.16.0 // indirect
100+
github.com/prometheus/client_golang v1.23.2 // indirect
101+
github.com/prometheus/client_model v0.6.2 // indirect
102+
github.com/prometheus/common v0.66.1 // indirect
103+
github.com/prometheus/procfs v0.16.1 // indirect
105104
github.com/shopspring/decimal v1.4.0 // indirect
106105
github.com/spf13/cast v1.7.1 // indirect
107106
github.com/stoewer/go-strcase v1.3.0 // indirect
108107
github.com/tidwall/match v1.1.1 // indirect
109108
github.com/tidwall/pretty v1.2.1 // indirect
110109
github.com/x448/float16 v0.8.4 // indirect
111-
go.etcd.io/etcd/api/v3 v3.6.4 // indirect
112-
go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
113-
go.etcd.io/etcd/client/v3 v3.6.4 // indirect
110+
go.etcd.io/etcd/api/v3 v3.6.5 // indirect
111+
go.etcd.io/etcd/client/pkg/v3 v3.6.5 // indirect
112+
go.etcd.io/etcd/client/v3 v3.6.5 // indirect
114113
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
115114
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.66.0 // indirect
116115
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.66.0 // indirect
@@ -122,7 +121,7 @@ require (
122121
go.opentelemetry.io/otel/trace v1.43.0 // indirect
123122
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
124123
go.uber.org/multierr v1.11.0 // indirect
125-
go.yaml.in/yaml/v2 v2.4.2 // indirect
124+
go.yaml.in/yaml/v2 v2.4.3 // indirect
126125
go.yaml.in/yaml/v3 v3.0.4 // indirect
127126
golang.org/x/crypto v0.48.0 // indirect
128127
golang.org/x/exp v0.0.0-20251125195548-87e1e737ad39 // indirect
@@ -141,12 +140,9 @@ require (
141140
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
142141
gopkg.in/inf.v0 v0.9.1 // indirect
143142
gopkg.in/yaml.v3 v3.0.1 // indirect
144-
k8s.io/component-helpers v0.33.5 // indirect
145-
k8s.io/controller-manager v0.33.5 // indirect
146143
k8s.io/klog/v2 v2.130.1 // indirect
147-
k8s.io/kubernetes v1.34.2 // indirect
148144
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
149-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
145+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
150146
sigs.k8s.io/randfill v1.0.0 // indirect
151-
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
147+
sigs.k8s.io/structured-merge-diff/v6 v6.3.2-0.20260122202528-d9cc6641c482 // indirect
152148
)

0 commit comments

Comments
 (0)