Skip to content

Commit 895c626

Browse files
committed
refator agent to use multicluster-runtime
On-behalf-of: @SAP christoph.mewes@sap.com
1 parent bc2d16a commit 895c626

File tree

22 files changed

+522
-834
lines changed

22 files changed

+522
-834
lines changed

go.mod

Lines changed: 35 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ go 1.24.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-20250313100806-0011b8c72acd
9-
k8s.io/apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250313100806-0011b8c72acd
10-
k8s.io/kms => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kms v0.0.0-20250313100806-0011b8c72acd
11-
sigs.k8s.io/controller-runtime => github.com/kcp-dev/controller-runtime v0.19.0-kcp.1
8+
k8s.io/api => github.com/kcp-dev/kubernetes/staging/src/k8s.io/api v0.0.0-20250425143807-ddbe171670d8
9+
k8s.io/apiextensions-apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250425143807-ddbe171670d8
10+
k8s.io/apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250425143807-ddbe171670d8
11+
k8s.io/kms => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kms v0.0.0-20250425143807-ddbe171670d8
1212
)
1313

1414
require (
@@ -19,9 +19,10 @@ require (
1919
github.com/google/go-cmp v0.7.0
2020
github.com/kcp-dev/api-syncagent/sdk v0.0.0-00010101000000-000000000000
2121
github.com/kcp-dev/code-generator/v2 v2.3.1
22-
github.com/kcp-dev/kcp v0.27.1
22+
github.com/kcp-dev/kcp v0.0.0-20250606081858-d77640860cac
2323
github.com/kcp-dev/kcp/sdk v0.27.1
2424
github.com/kcp-dev/logicalcluster/v3 v3.0.5
25+
github.com/kcp-dev/multicluster-provider v0.1.0
2526
github.com/openshift-eng/openshift-goimports v0.0.0-20230304234052-c70783e636f2
2627
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
2728
github.com/spf13/cobra v1.9.1
@@ -30,17 +31,17 @@ require (
3031
github.com/tidwall/sjson v1.2.5
3132
go.uber.org/zap v1.27.0
3233
k8c.io/reconciler v0.5.0
33-
k8s.io/api v0.31.6
34-
k8s.io/apiextensions-apiserver v0.31.6
35-
k8s.io/apimachinery v0.31.6
36-
k8s.io/apiserver v0.31.6
37-
k8s.io/client-go v0.31.6
38-
k8s.io/code-generator v0.31.6
39-
k8s.io/component-base v0.31.6
40-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
41-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
42-
sigs.k8s.io/controller-runtime v0.18.3
34+
k8s.io/api v0.32.3
35+
k8s.io/apiextensions-apiserver v0.32.3
36+
k8s.io/apimachinery v0.32.3
37+
k8s.io/apiserver v0.32.3
38+
k8s.io/client-go v0.32.3
39+
k8s.io/code-generator v0.32.3
40+
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7
41+
k8s.io/utils v0.0.0-20241210054802-24370beab758
42+
sigs.k8s.io/controller-runtime v0.20.4
4343
sigs.k8s.io/controller-tools v0.16.5
44+
sigs.k8s.io/multicluster-runtime v0.20.4-alpha.7
4445
sigs.k8s.io/yaml v1.4.0
4546
)
4647

@@ -72,22 +73,21 @@ require (
7273
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
7374
github.com/gobuffalo/flect v1.0.3 // indirect
7475
github.com/gogo/protobuf v1.3.2 // indirect
75-
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
7676
github.com/golang/protobuf v1.5.4 // indirect
77-
github.com/google/cel-go v0.24.1 // indirect
77+
github.com/google/btree v1.1.3 // indirect
78+
github.com/google/cel-go v0.22.1 // indirect
7879
github.com/google/gnostic-models v0.6.9 // indirect
7980
github.com/google/gofuzz v1.2.1-0.20210504230335-f78f29fc09ea // indirect
8081
github.com/google/uuid v1.6.0 // indirect
8182
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
8283
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
8384
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
8485
github.com/huandu/xstrings v1.5.0 // indirect
85-
github.com/imdario/mergo v0.3.16 // indirect
8686
github.com/inconshreveable/mousetrap v1.1.0 // indirect
8787
github.com/josharian/intern v1.0.0 // indirect
8888
github.com/json-iterator/go v1.1.12 // indirect
89-
github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250223115924-431177b024f3 // indirect
90-
github.com/kcp-dev/client-go v0.0.0-20250223133118-3dea338dc267 // indirect
89+
github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250512171935-ebb573a40077 // indirect
90+
github.com/kcp-dev/client-go v0.0.0-20250512170835-5457a0f4bd98 // indirect
9191
github.com/klauspost/compress v1.17.11 // indirect
9292
github.com/kylelemons/godebug v1.1.0 // indirect
9393
github.com/mailru/easyjson v0.9.0 // indirect
@@ -132,17 +132,17 @@ require (
132132
go.opentelemetry.io/otel/trace v1.35.0 // indirect
133133
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
134134
go.uber.org/multierr v1.11.0 // indirect
135-
golang.org/x/crypto v0.36.0 // indirect
136-
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
135+
golang.org/x/crypto v0.37.0 // indirect
136+
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
137137
golang.org/x/mod v0.24.0 // indirect
138-
golang.org/x/net v0.38.0 // indirect
139-
golang.org/x/oauth2 v0.28.0 // indirect
140-
golang.org/x/sync v0.12.0 // indirect
141-
golang.org/x/sys v0.31.0 // indirect
142-
golang.org/x/term v0.30.0 // indirect
143-
golang.org/x/text v0.23.0 // indirect
138+
golang.org/x/net v0.39.0 // indirect
139+
golang.org/x/oauth2 v0.29.0 // indirect
140+
golang.org/x/sync v0.13.0 // indirect
141+
golang.org/x/sys v0.32.0 // indirect
142+
golang.org/x/term v0.31.0 // indirect
143+
golang.org/x/text v0.24.0 // indirect
144144
golang.org/x/time v0.11.0 // indirect
145-
golang.org/x/tools v0.31.0 // indirect
145+
golang.org/x/tools v0.32.0 // indirect
146146
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
147147
google.golang.org/genproto/googleapis/api v0.0.0-20250324211829-b45e905df463 // indirect
148148
google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect
@@ -152,10 +152,13 @@ require (
152152
gopkg.in/inf.v0 v0.9.1 // indirect
153153
gopkg.in/yaml.v2 v2.4.0 // indirect
154154
gopkg.in/yaml.v3 v3.0.1 // indirect
155-
k8s.io/gengo/v2 v2.0.0-20240826214909-a7b603a56eb7 // indirect
155+
k8s.io/component-base v0.32.3 // indirect
156+
k8s.io/component-helpers v0.32.3 // indirect
157+
k8s.io/controller-manager v0.32.3 // indirect
158+
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
156159
k8s.io/klog/v2 v2.130.1 // indirect
157-
k8s.io/kubernetes v1.31.6 // indirect
158-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
160+
k8s.io/kubernetes v1.32.3 // indirect
161+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.1 // indirect
159162
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
160163
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
161164
)

0 commit comments

Comments
 (0)