Skip to content

Commit 563411a

Browse files
xrstfxrstf
committed
update codebase to kcp 0.29
On-behalf-of: @SAP christoph.mewes@sap.com
1 parent 9db8bfe commit 563411a

File tree

18 files changed

+71
-71
lines changed

18 files changed

+71
-71
lines changed

‎cmd/api-syncagent/kcp.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ import (
2626

2727
"github.com/kcp-dev/api-syncagent/internal/kcp"
2828

29-
kcpdevv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
30-
kcpdevcore "github.com/kcp-dev/kcp/sdk/apis/core"
31-
kcpdevcorev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1"
29+
kcpdevv1alpha1 "github.com/kcp-dev/sdk/apis/apis/v1alpha1"
30+
kcpdevcore "github.com/kcp-dev/sdk/apis/core"
31+
kcpdevcorev1alpha1 "github.com/kcp-dev/sdk/apis/core/v1alpha1"
3232

3333
"k8s.io/apimachinery/pkg/fields"
3434
"k8s.io/apimachinery/pkg/runtime"

‎cmd/api-syncagent/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import (
3636
"github.com/kcp-dev/api-syncagent/internal/version"
3737
syncagentv1alpha1 "github.com/kcp-dev/api-syncagent/sdk/apis/syncagent/v1alpha1"
3838

39-
kcpdevv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
39+
kcpdevv1alpha1 "github.com/kcp-dev/sdk/apis/apis/v1alpha1"
4040

4141
corev1 "k8s.io/api/core/v1"
4242
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"

‎go.mod‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ 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-20250821202322-e42d885de52b
9-
k8s.io/apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250821202322-e42d885de52b
8+
k8s.io/apiextensions-apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20251113163256-f038ec6bf609
9+
k8s.io/apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20251113163256-f038ec6bf609
1010
)
1111

1212
require (
@@ -16,27 +16,23 @@ require (
1616
github.com/go-logr/zapr v1.3.0
1717
github.com/google/go-cmp v0.7.0
1818
github.com/kcp-dev/api-syncagent/sdk v0.0.0-00010101000000-000000000000
19-
github.com/kcp-dev/kcp v0.28.1
20-
github.com/kcp-dev/kcp/sdk v0.28.1
19+
github.com/kcp-dev/kcp v0.29.0
2120
github.com/kcp-dev/logicalcluster/v3 v3.0.5
2221
github.com/kcp-dev/multicluster-provider v0.2.1-0.20250901093233-9ef571c8bd47
22+
github.com/kcp-dev/sdk v0.29.0
2323
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
2424
github.com/spf13/cobra v1.10.1
2525
github.com/spf13/pflag v1.0.10
2626
github.com/tidwall/gjson v1.18.0
2727
github.com/tidwall/sjson v1.2.5
2828
go.uber.org/zap v1.27.0
2929
k8c.io/reconciler v0.5.0
30-
// Deviating from kcp's kube version (0.32) because more recent multicluster-runtime
31-
// versions are built ontop of controller-runtime 0.21 with Kube 0.33. Ideally in
32-
// the future we should go back to having kcp, controller-runtime and multicluster-runtime
33-
// be in-sync again.
34-
k8s.io/api v0.33.4
35-
k8s.io/apiextensions-apiserver v0.33.4
36-
k8s.io/apimachinery v0.33.4
37-
k8s.io/apiserver v0.33.4
38-
k8s.io/client-go v0.33.4
39-
k8s.io/component-base v0.33.4
30+
k8s.io/api v0.33.5
31+
k8s.io/apiextensions-apiserver v0.33.5
32+
k8s.io/apimachinery v0.33.5
33+
k8s.io/apiserver v0.33.5
34+
k8s.io/client-go v0.33.5
35+
k8s.io/component-base v0.33.5
4036
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff
4137
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
4238
sigs.k8s.io/controller-runtime v0.21.0
@@ -91,8 +87,9 @@ require (
9187
github.com/inconshreveable/mousetrap v1.1.0 // indirect
9288
github.com/josharian/intern v1.0.0 // indirect
9389
github.com/json-iterator/go v1.1.12 // indirect
94-
github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250728122101-adbf20db3e51 // indirect
95-
github.com/kcp-dev/client-go v0.0.0-20250728134101-0355faa9361b // indirect
90+
github.com/kcp-dev/apimachinery/v2 v2.29.0 // indirect
91+
github.com/kcp-dev/client-go v0.29.0 // indirect
92+
github.com/kcp-dev/kcp/sdk v0.28.1 // indirect
9693
github.com/kylelemons/godebug v1.1.0 // indirect
9794
github.com/mailru/easyjson v0.9.1 // indirect
9895
github.com/mitchellh/copystructure v1.2.0 // indirect
@@ -109,6 +106,7 @@ require (
109106
github.com/shopspring/decimal v1.4.0 // indirect
110107
github.com/spf13/cast v1.7.1 // indirect
111108
github.com/stoewer/go-strcase v1.3.0 // indirect
109+
github.com/stretchr/testify v1.11.1 // indirect
112110
github.com/tidwall/match v1.1.1 // indirect
113111
github.com/tidwall/pretty v1.2.1 // indirect
114112
github.com/x448/float16 v0.8.4 // indirect
@@ -144,10 +142,10 @@ require (
144142
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
145143
gopkg.in/inf.v0 v0.9.1 // indirect
146144
gopkg.in/yaml.v3 v3.0.1 // indirect
147-
k8s.io/component-helpers v0.32.3 // indirect
148-
k8s.io/controller-manager v0.32.3 // indirect
145+
k8s.io/component-helpers v0.33.5 // indirect
146+
k8s.io/controller-manager v0.33.5 // indirect
149147
k8s.io/klog/v2 v2.130.1 // indirect
150-
k8s.io/kubernetes v1.33.3 // indirect
148+
k8s.io/kubernetes v1.33.5 // indirect
151149
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
152150
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
153151
sigs.k8s.io/randfill v1.0.0 // indirect

‎go.sum‎

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -129,22 +129,24 @@ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8Hm
129129
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
130130
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
131131
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
132-
github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250728122101-adbf20db3e51 h1:l38RDS+VUMx9etvyaCgJIZa4nM7FaNevNubWN0kDZY4=
133-
github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250728122101-adbf20db3e51/go.mod h1:rF1jfvUfPjFXs+HV/LN1BtPzAz1bfjJOwVa+hAVfroQ=
134-
github.com/kcp-dev/client-go v0.0.0-20250728134101-0355faa9361b h1:2LGrXvY9sc4l5yjKIbMZ86GEou7NyrHhA4qBPaeFfxs=
135-
github.com/kcp-dev/client-go v0.0.0-20250728134101-0355faa9361b/go.mod h1:QdO8AaGAZPr/rIZ1iVanCM3tUOiiuX897GWv7WTByLE=
136-
github.com/kcp-dev/kcp v0.28.1 h1:T7Ky7u9hvprkGrBnKuw0QZoP8O6TCbXqJz2Kwt6Tx+o=
137-
github.com/kcp-dev/kcp v0.28.1/go.mod h1:q28Fx8sU/KA8kz8HGwtaqA7Iom8oR90ydoPK39jMaxo=
132+
github.com/kcp-dev/apimachinery/v2 v2.29.0 h1:hoIomHs0v8N9+kvKYfjM/tVh5l27NH1zCDUV0kRLxn4=
133+
github.com/kcp-dev/apimachinery/v2 v2.29.0/go.mod h1:KizREtsxF5malriCj+Cr87TghwHQIMZYXbVycNBbGHs=
134+
github.com/kcp-dev/client-go v0.29.0 h1:F5pX3Ohy2jUjPZVHNkLCxtFIwvdB8rB/iu3Ops8Yw8w=
135+
github.com/kcp-dev/client-go v0.29.0/go.mod h1:Kl+d0bVdvyLULfZLjWA2Zfem8iOJRC0YbK6PpCOwUZg=
136+
github.com/kcp-dev/kcp v0.29.0 h1:FAfbOEJ6jH0YxhCnjMSQndFCr3ORZKO1wrLZTqV0MYo=
137+
github.com/kcp-dev/kcp v0.29.0/go.mod h1:4+DL+QaHRyb8lQjTWR27KtQ8NBvfrXNI9GIuk1kXkuQ=
138138
github.com/kcp-dev/kcp/sdk v0.28.1 h1:bTtuHVjFRjbwFEqXTPxc1J1JP2Hc3mTYqQ2xfJsi16M=
139139
github.com/kcp-dev/kcp/sdk v0.28.1/go.mod h1:8oZpWxkoMu2TDpx5DgdIGDigByKHKkeqVMA4GiWneoI=
140-
github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250821202322-e42d885de52b h1:PsIDMrXs6N6TqdEhjoEQC2xnj6CUV9yOdc5jmlt1PPg=
141-
github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250821202322-e42d885de52b/go.mod h1:YS4BozVhJubIHAN+HRLFrXAAPd+vctFRS0u1d6DRUIM=
142-
github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250821202322-e42d885de52b h1:G8dAytU6qgg9jTqeYJcsTiJkndOeOsS4/fub7JOu2A0=
143-
github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250821202322-e42d885de52b/go.mod h1:STCgTiD+xCCHsfLOPHn5sNVsyktakX/ctW3dMv3erh0=
140+
github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20251113163256-f038ec6bf609 h1:2eF4Jq/1bTL2OObwStwOOik1WdLVPOSwHyuiRXjWWbg=
141+
github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20251113163256-f038ec6bf609/go.mod h1:7YRhmmIzd7elyfRQ96hbOfFq7+OvGNZljO5Z/E+mLto=
142+
github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20251113163256-f038ec6bf609 h1:yMWrq/DpozipIHUNrjnqOHr/55rl8eMFlfJJFYSjaTk=
143+
github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20251113163256-f038ec6bf609/go.mod h1:nG4FME1ik2lKNo+jGhrGsZRiI/+1r8Nuldah1bPqqg8=
144144
github.com/kcp-dev/logicalcluster/v3 v3.0.5 h1:JbYakokb+5Uinz09oTXomSUJVQsqfxEvU4RyHUYxHOU=
145145
github.com/kcp-dev/logicalcluster/v3 v3.0.5/go.mod h1:EWBUBxdr49fUB1cLMO4nOdBWmYifLbP1LfoL20KkXYY=
146146
github.com/kcp-dev/multicluster-provider v0.2.1-0.20250901093233-9ef571c8bd47 h1:CPrrjZevZqUHrW/BBVvSjzSFrFnASm7srHznhTBhJ0Y=
147147
github.com/kcp-dev/multicluster-provider v0.2.1-0.20250901093233-9ef571c8bd47/go.mod h1:RhSDOKAn/ROpSIFt140Tk2LsM7PXa3a3rov4qbqFERc=
148+
github.com/kcp-dev/sdk v0.29.0 h1:zXJjtcKNduy8MntSdf2CoXSMVWybptPJwq0zKBkf0Iw=
149+
github.com/kcp-dev/sdk v0.29.0/go.mod h1:iOA3cEMbI7jeLHbfc0GlHSXRHfyhOWC0NDEJRdNcBY8=
148150
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
149151
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
150152
github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
@@ -351,26 +353,26 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
351353
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
352354
k8c.io/reconciler v0.5.0 h1:BHpelg1UfI/7oBFctqOq8sX6qzflXpl3SlvHe7e8wak=
353355
k8c.io/reconciler v0.5.0/go.mod h1:pT1+SVcVXJQeBJhpJBXQ5XW64QnKKeYTnVlQf0dGE0k=
354-
k8s.io/api v0.33.4 h1:oTzrFVNPXBjMu0IlpA2eDDIU49jsuEorGHB4cvKupkk=
355-
k8s.io/api v0.33.4/go.mod h1:VHQZ4cuxQ9sCUMESJV5+Fe8bGnqAARZ08tSTdHWfeAc=
356-
k8s.io/apimachinery v0.33.4 h1:SOf/JW33TP0eppJMkIgQ+L6atlDiP/090oaX0y9pd9s=
357-
k8s.io/apimachinery v0.33.4/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
358-
k8s.io/client-go v0.33.4 h1:TNH+CSu8EmXfitntjUPwaKVPN0AYMbc9F1bBS8/ABpw=
359-
k8s.io/client-go v0.33.4/go.mod h1:LsA0+hBG2DPwovjd931L/AoaezMPX9CmBgyVyBZmbCY=
360-
k8s.io/component-base v0.33.4 h1:Jvb/aw/tl3pfgnJ0E0qPuYLT0NwdYs1VXXYQmSuxJGY=
361-
k8s.io/component-base v0.33.4/go.mod h1:567TeSdixWW2Xb1yYUQ7qk5Docp2kNznKL87eygY8Rc=
362-
k8s.io/component-helpers v0.32.3 h1:9veHpOGTPLluqU4hAu5IPOwkOIZiGAJUhHndfVc5FT4=
363-
k8s.io/component-helpers v0.32.3/go.mod h1:utTBXk8lhkJewBKNuNf32Xl3KT/0VV19DmiXU/SV4Ao=
364-
k8s.io/controller-manager v0.32.3 h1:jBxZnQ24k6IMeWLyxWZmpa3QVS7ww+osAIzaUY/jqyc=
365-
k8s.io/controller-manager v0.32.3/go.mod h1:out1L3DZjE/p7JG0MoMMIaQGWIkt3c+pKaswqSHgKsI=
356+
k8s.io/api v0.33.5 h1:YR+uhYj05jdRpcksv8kjSliW+v9hwXxn6Cv10aR8Juw=
357+
k8s.io/api v0.33.5/go.mod h1:2gzShdwXKT5yPGiqrTrn/U/nLZ7ZyT4WuAj3XGDVgVs=
358+
k8s.io/apimachinery v0.33.5 h1:NiT64hln4TQXeYR18/ES39OrNsjGz8NguxsBgp+6QIo=
359+
k8s.io/apimachinery v0.33.5/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
360+
k8s.io/client-go v0.33.5 h1:I8BdmQGxInpkMEnJvV6iG7dqzP3JRlpZZlib3OMFc3o=
361+
k8s.io/client-go v0.33.5/go.mod h1:W8PQP4MxbM4ypgagVE65mUUqK1/ByQkSALF9tzuQ6u0=
362+
k8s.io/component-base v0.33.5 h1:4D3kxjEx1pJRy3WHAZsmX3+LCpmd4ftE+2J4v6naTnQ=
363+
k8s.io/component-base v0.33.5/go.mod h1:Zma1YjBVuuGxIbspj1vGR3/5blzo2ARf1v0QTtog1to=
364+
k8s.io/component-helpers v0.33.5 h1:1LDSMzn7YTreVLPaOBJK36ase/FWi2sDpeJJvbEBO2s=
365+
k8s.io/component-helpers v0.33.5/go.mod h1:C3HsDU2lANSLgTTgMJ0TFnG5xZrVrxR3Ss9n7Wrsw4s=
366+
k8s.io/controller-manager v0.33.5 h1:abmssknXnhOhW533583v2SYQObD5RhYiSL7Za1rezGM=
367+
k8s.io/controller-manager v0.33.5/go.mod h1:KuQeAlf4vI2+qj5fwPVLaDlbtrTBA/8L/LqQvI74Ow0=
366368
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
367369
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
368-
k8s.io/kms v0.32.3 h1:HhHw5+pRCzEJp3oFFJ1q5W2N6gAI7YkUg4ay4Z0dgwM=
369-
k8s.io/kms v0.32.3/go.mod h1:Bk2evz/Yvk0oVrvm4MvZbgq8BD34Ksxs2SRHn4/UiOM=
370+
k8s.io/kms v0.33.3 h1:7cQWC+GSH211NgY8LRKjBXNtkzra5SkpYzeZrOt5D+8=
371+
k8s.io/kms v0.33.3/go.mod h1:C1I8mjFFBNzfUZXYt9FZVJ8MJl7ynFbGgZFbBzkBJ3E=
370372
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4=
371373
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
372-
k8s.io/kubernetes v1.33.3 h1:dBx5Z2ZhR8kNzAwCoCz4j1niUbUrNUDVxeSj4/Ienu0=
373-
k8s.io/kubernetes v1.33.3/go.mod h1:nrt8sldmckKz2fCZhgRX3SKfS2e+CzXATPv6ITNkU00=
374+
k8s.io/kubernetes v1.33.5 h1:uf0/5VVQodYf61FudCbwtWjg5ApQcKKA7mwanTLjxyw=
375+
k8s.io/kubernetes v1.33.5/go.mod h1:nrt8sldmckKz2fCZhgRX3SKfS2e+CzXATPv6ITNkU00=
374376
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
375377
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
376378
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=

‎hack/reconciling.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ package: reconciling
1919
boilerplate: hack/boilerplate/generated/boilerplate.go.txt
2020
resourceTypes:
2121
# kcp-dev/v1alpha1
22-
- { package: github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1, importAlias: kcpdevv1alpha1, resourceName: APIExport }
23-
- { package: github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1, importAlias: kcpdevv1alpha1, resourceName: APIResourceSchema }
22+
- { package: github.com/kcp-dev/sdk/apis/apis/v1alpha1, importAlias: kcpdevv1alpha1, resourceName: APIExport }
23+
- { package: github.com/kcp-dev/sdk/apis/apis/v1alpha1, importAlias: kcpdevv1alpha1, resourceName: APIResourceSchema }

‎internal/controller/apiexport/controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"github.com/kcp-dev/api-syncagent/internal/resources/reconciling"
3030
syncagentv1alpha1 "github.com/kcp-dev/api-syncagent/sdk/apis/syncagent/v1alpha1"
3131

32-
kcpdevv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
32+
kcpdevv1alpha1 "github.com/kcp-dev/sdk/apis/apis/v1alpha1"
3333

3434
"k8s.io/apimachinery/pkg/labels"
3535
"k8s.io/apimachinery/pkg/runtime/schema"

‎internal/controller/apiexport/reconciler.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/kcp-dev/api-syncagent/internal/resources/reconciling"
2525
syncagentv1alpha1 "github.com/kcp-dev/api-syncagent/sdk/apis/syncagent/v1alpha1"
2626

27-
kcpdevv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
27+
kcpdevv1alpha1 "github.com/kcp-dev/sdk/apis/apis/v1alpha1"
2828

2929
corev1 "k8s.io/api/core/v1"
3030
"k8s.io/apimachinery/pkg/runtime"

‎internal/controller/apiresourceschema/controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"github.com/kcp-dev/api-syncagent/internal/projection"
3131
syncagentv1alpha1 "github.com/kcp-dev/api-syncagent/sdk/apis/syncagent/v1alpha1"
3232

33-
kcpdevv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
33+
kcpdevv1alpha1 "github.com/kcp-dev/sdk/apis/apis/v1alpha1"
3434

3535
corev1 "k8s.io/api/core/v1"
3636
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"

‎internal/controller/sync/controller.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ import (
3131
"github.com/kcp-dev/api-syncagent/internal/sync"
3232
syncagentv1alpha1 "github.com/kcp-dev/api-syncagent/sdk/apis/syncagent/v1alpha1"
3333

34-
kcpcore "github.com/kcp-dev/kcp/sdk/apis/core"
35-
kcpdevcorev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1"
34+
kcpcore "github.com/kcp-dev/sdk/apis/core"
35+
kcpdevcorev1alpha1 "github.com/kcp-dev/sdk/apis/core/v1alpha1"
3636
mccontroller "sigs.k8s.io/multicluster-runtime/pkg/controller"
3737
mchandler "sigs.k8s.io/multicluster-runtime/pkg/handler"
3838
mcmanager "sigs.k8s.io/multicluster-runtime/pkg/manager"

‎internal/controller/syncmanager/controller.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ import (
3030
"github.com/kcp-dev/api-syncagent/internal/discovery"
3131
syncagentv1alpha1 "github.com/kcp-dev/api-syncagent/sdk/apis/syncagent/v1alpha1"
3232

33-
kcpapisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
34-
kcpcorev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1"
3533
apiexportprovider "github.com/kcp-dev/multicluster-provider/apiexport"
34+
kcpapisv1alpha1 "github.com/kcp-dev/sdk/apis/apis/v1alpha1"
35+
kcpcorev1alpha1 "github.com/kcp-dev/sdk/apis/core/v1alpha1"
3636
mccontroller "sigs.k8s.io/multicluster-runtime/pkg/controller"
3737
mcmanager "sigs.k8s.io/multicluster-runtime/pkg/manager"
3838

0 commit comments

Comments
 (0)