Skip to content

Commit e758bf0

Browse files
authored
Merge pull request #65 from mjudeikis/bump.kcp
Bump to kcp main (k/k 1.34.2)
2 parents 7bb5cf6 + 89e6fd2 commit e758bf0

File tree

5 files changed

+27
-127
lines changed

5 files changed

+27
-127
lines changed

examples/logicalclusters/go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ require (
2424
github.com/kcp-dev/multicluster-provider v0.2.0
2525
github.com/kcp-dev/sdk v0.29.0
2626
github.com/spf13/pflag v1.0.6
27-
k8s.io/apimachinery v0.34.1
28-
k8s.io/client-go v0.34.1
27+
k8s.io/apimachinery v0.34.2
28+
k8s.io/client-go v0.34.2
2929
sigs.k8s.io/controller-runtime v0.22.4
3030
sigs.k8s.io/multicluster-runtime v0.22.4-beta.1
3131
)
@@ -50,7 +50,7 @@ require (
5050
github.com/google/uuid v1.6.0 // indirect
5151
github.com/josharian/intern v1.0.0 // indirect
5252
github.com/json-iterator/go v1.1.12 // indirect
53-
github.com/kcp-dev/apimachinery/v2 v2.29.0 // indirect
53+
github.com/kcp-dev/apimachinery/v2 v2.29.1-0.20251209121225-cf3c0b624983 // indirect
5454
github.com/mailru/easyjson v0.9.0 // indirect
5555
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5656
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
@@ -77,8 +77,8 @@ require (
7777
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
7878
gopkg.in/inf.v0 v0.9.1 // indirect
7979
gopkg.in/yaml.v3 v3.0.1 // indirect
80-
k8s.io/api v0.34.1 // indirect
81-
k8s.io/apiextensions-apiserver v0.34.1 // indirect
80+
k8s.io/api v0.34.2 // indirect
81+
k8s.io/apiextensions-apiserver v0.34.2 // indirect
8282
k8s.io/klog/v2 v2.130.1 // indirect
8383
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
8484
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect

examples/logicalclusters/go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8Hm
5858
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
5959
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
6060
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
61-
github.com/kcp-dev/apimachinery/v2 v2.29.0 h1:hoIomHs0v8N9+kvKYfjM/tVh5l27NH1zCDUV0kRLxn4=
62-
github.com/kcp-dev/apimachinery/v2 v2.29.0/go.mod h1:KizREtsxF5malriCj+Cr87TghwHQIMZYXbVycNBbGHs=
61+
github.com/kcp-dev/apimachinery/v2 v2.29.1-0.20251209121225-cf3c0b624983 h1:4hCauFTFMwvIhwL9fqZ5omjeZ+vsOUNO1tLsrCeprxM=
62+
github.com/kcp-dev/apimachinery/v2 v2.29.1-0.20251209121225-cf3c0b624983/go.mod h1:DOv0iw5tcgzFBhudwLFe2WHCLqtlgNkuO4AcqbZ4zVo=
6363
github.com/kcp-dev/client-go v0.29.0 h1:F5pX3Ohy2jUjPZVHNkLCxtFIwvdB8rB/iu3Ops8Yw8w=
6464
github.com/kcp-dev/client-go v0.29.0/go.mod h1:Kl+d0bVdvyLULfZLjWA2Zfem8iOJRC0YbK6PpCOwUZg=
6565
github.com/kcp-dev/logicalcluster/v3 v3.0.5 h1:JbYakokb+5Uinz09oTXomSUJVQsqfxEvU4RyHUYxHOU=
@@ -197,16 +197,16 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
197197
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
198198
k8s.io/api v0.33.5 h1:YR+uhYj05jdRpcksv8kjSliW+v9hwXxn6Cv10aR8Juw=
199199
k8s.io/api v0.33.5/go.mod h1:2gzShdwXKT5yPGiqrTrn/U/nLZ7ZyT4WuAj3XGDVgVs=
200-
k8s.io/apiextensions-apiserver v0.34.1 h1:NNPBva8FNAPt1iSVwIE0FsdrVriRXMsaWFMqJbII2CI=
201-
k8s.io/apiextensions-apiserver v0.34.1/go.mod h1:hP9Rld3zF5Ay2Of3BeEpLAToP+l4s5UlxiHfqRaRcMc=
200+
k8s.io/apiextensions-apiserver v0.34.2 h1:WStKftnGeoKP4AZRz/BaAAEJvYp4mlZGN0UCv+uvsqo=
201+
k8s.io/apiextensions-apiserver v0.34.2/go.mod h1:398CJrsgXF1wytdaanynDpJ67zG4Xq7yj91GrmYN2SE=
202202
k8s.io/apimachinery v0.33.5 h1:NiT64hln4TQXeYR18/ES39OrNsjGz8NguxsBgp+6QIo=
203203
k8s.io/apimachinery v0.33.5/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
204-
k8s.io/apiserver v0.34.1 h1:U3JBGdgANK3dfFcyknWde1G6X1F4bg7PXuvlqt8lITA=
205-
k8s.io/apiserver v0.34.1/go.mod h1:eOOc9nrVqlBI1AFCvVzsob0OxtPZUCPiUJL45JOTBG0=
204+
k8s.io/apiserver v0.34.2 h1:2/yu8suwkmES7IzwlehAovo8dDE07cFRC7KMDb1+MAE=
205+
k8s.io/apiserver v0.34.2/go.mod h1:gqJQy2yDOB50R3JUReHSFr+cwJnL8G1dzTA0YLEqAPI=
206206
k8s.io/client-go v0.33.5 h1:I8BdmQGxInpkMEnJvV6iG7dqzP3JRlpZZlib3OMFc3o=
207207
k8s.io/client-go v0.33.5/go.mod h1:W8PQP4MxbM4ypgagVE65mUUqK1/ByQkSALF9tzuQ6u0=
208-
k8s.io/component-base v0.34.1 h1:v7xFgG+ONhytZNFpIz5/kecwD+sUhVE6HU7qQUiRM4A=
209-
k8s.io/component-base v0.34.1/go.mod h1:mknCpLlTSKHzAQJJnnHVKqjxR7gBeHRv0rPXA7gdtQ0=
208+
k8s.io/component-base v0.34.2 h1:HQRqK9x2sSAsd8+R4xxRirlTjowsg6fWCPwWYeSvogQ=
209+
k8s.io/component-base v0.34.2/go.mod h1:9xw2FHJavUHBFpiGkZoKuYZ5pdtLKe97DEByaA+hHbM=
210210
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
211211
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
212212
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4=

go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ go 1.24.0
55
require (
66
github.com/go-logr/logr v1.4.2
77
github.com/hashicorp/golang-lru/v2 v2.0.7
8-
github.com/kcp-dev/apimachinery/v2 v2.29.0
8+
github.com/kcp-dev/apimachinery/v2 v2.29.1-0.20251209121225-cf3c0b624983
99
github.com/kcp-dev/logicalcluster/v3 v3.0.5
10-
github.com/kcp-dev/sdk v0.29.0
10+
github.com/kcp-dev/sdk v0.28.1-0.20251209130449-436a0347809b
1111
github.com/martinlindhe/base36 v1.1.1
1212
github.com/onsi/ginkgo/v2 v2.22.1
1313
github.com/onsi/gomega v1.36.2
@@ -16,10 +16,10 @@ require (
1616
go.uber.org/zap v1.27.0
1717
golang.org/x/sync v0.14.0
1818
golang.org/x/sys v0.33.0
19-
k8s.io/api v0.34.1
20-
k8s.io/apiextensions-apiserver v0.34.1
21-
k8s.io/apimachinery v0.34.1
22-
k8s.io/client-go v0.34.1
19+
k8s.io/api v0.34.2
20+
k8s.io/apiextensions-apiserver v0.34.2
21+
k8s.io/apimachinery v0.34.2
22+
k8s.io/client-go v0.34.2
2323
k8s.io/klog/v2 v2.130.1
2424
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
2525
sigs.k8s.io/controller-runtime v0.22.4

0 commit comments

Comments
 (0)