Skip to content

Commit 9b7212c

Browse files
kcp-ci-botkcp-ci-bot
authored
Merge pull request #15 from embik/update-multicluster-runtime-0.20.4-alpha.6
🌱 Update to `sigs.k8s.io/multicluster-runtime` (v0.20.4-alpha.6)
2 parents 476a75c + 0deb615 commit 9b7212c

File tree

6 files changed

+26
-26
lines changed

6 files changed

+26
-26
lines changed

‎.golangci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ linters-settings:
5959
- standard
6060
- default
6161
- prefix(k8s.io,sigs.k8s.io)
62+
- prefix(sigs.k8s.io/multicluster-runtime)
6263
- prefix(github.com/kcp-dev)
63-
- prefix(github.com/multicluster-runtime)
6464
- prefix(github.com/kcp-dev/multicluster-provider)
6565
- blank
6666
- dot

‎examples/apiexport/main.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/multicluster-provider/virtualworkspace"
2828

29-
mcbuilder "github.com/multicluster-runtime/multicluster-runtime/pkg/builder"
30-
mcmanager "github.com/multicluster-runtime/multicluster-runtime/pkg/manager"
31-
mcreconcile "github.com/multicluster-runtime/multicluster-runtime/pkg/reconcile"
29+
mcbuilder "sigs.k8s.io/multicluster-runtime/pkg/builder"
30+
mcmanager "sigs.k8s.io/multicluster-runtime/pkg/manager"
31+
mcreconcile "sigs.k8s.io/multicluster-runtime/pkg/reconcile"
3232

3333
apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
3434
corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1"

‎go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@ require (
99
github.com/kcp-dev/kcp/sdk v0.26.1
1010
github.com/kcp-dev/logicalcluster/v3 v3.0.5
1111
github.com/martinlindhe/base36 v1.1.1
12-
github.com/multicluster-runtime/multicluster-runtime v0.20.0-alpha.5
13-
github.com/onsi/ginkgo/v2 v2.21.0
14-
github.com/onsi/gomega v1.35.1
12+
github.com/onsi/ginkgo/v2 v2.22.0
13+
github.com/onsi/gomega v1.36.1
1514
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace
1615
github.com/stretchr/testify v1.10.0
1716
golang.org/x/sync v0.11.0
@@ -22,7 +21,8 @@ require (
2221
k8s.io/client-go v0.32.3
2322
k8s.io/klog/v2 v2.130.1
2423
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
25-
sigs.k8s.io/controller-runtime v0.20.1
24+
sigs.k8s.io/controller-runtime v0.20.4
25+
sigs.k8s.io/multicluster-runtime v0.20.4-alpha.6
2626
sigs.k8s.io/yaml v1.4.0
2727
)
2828

@@ -31,7 +31,7 @@ require (
3131
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3232
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3333
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
34-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
34+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
3535
github.com/fsnotify/fsnotify v1.7.0 // indirect
3636
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
3737
github.com/go-logr/zapr v1.3.0 // indirect

‎go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxER
1919
github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
2020
github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U=
2121
github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
22-
github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg=
23-
github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ=
22+
github.com/evanphx/json-patch/v5 v5.9.11 h1:/8HVnzMq13/3x9TPvjG08wUGqBTmZBsCWzjTM0wiaDU=
23+
github.com/evanphx/json-patch/v5 v5.9.11/go.mod h1:3j+LviiESTElxA4p3EMKAB9HXj3/XEtnUf6OZxqIQTM=
2424
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
2525
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
2626
github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
@@ -91,14 +91,12 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
9191
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
9292
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
9393
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
94-
github.com/multicluster-runtime/multicluster-runtime v0.20.0-alpha.5 h1:aoDDYIbqFXbRfWVbQEl5l5KktEVWntuwD2gpPMEIr4A=
95-
github.com/multicluster-runtime/multicluster-runtime v0.20.0-alpha.5/go.mod h1:6ZuT8VoTSr8nYyToyhnhAepyZoHAaCQzzabzbSFwAKc=
9694
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
9795
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
98-
github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM=
99-
github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
100-
github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
101-
github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
96+
github.com/onsi/ginkgo/v2 v2.22.0 h1:Yed107/8DjTr0lKCNt7Dn8yQ6ybuDRQoMGrNFKzMfHg=
97+
github.com/onsi/ginkgo/v2 v2.22.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
98+
github.com/onsi/gomega v1.36.1 h1:bJDPBO7ibjxcbHMgSCoo4Yj18UWbKDlLwX1x9sybDcw=
99+
github.com/onsi/gomega v1.36.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
102100
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
103101
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
104102
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -224,10 +222,12 @@ k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJ
224222
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4=
225223
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
226224
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
227-
sigs.k8s.io/controller-runtime v0.20.1 h1:JbGMAG/X94NeM3xvjenVUaBjy6Ui4Ogd/J5ZtjZnHaE=
228-
sigs.k8s.io/controller-runtime v0.20.1/go.mod h1:BrP3w158MwvB3ZbNpaAcIKkHQ7YGpYnzpoSTZ8E14WU=
225+
sigs.k8s.io/controller-runtime v0.20.4 h1:X3c+Odnxz+iPTRobG4tp092+CvBU9UK0t/bRf+n0DGU=
226+
sigs.k8s.io/controller-runtime v0.20.4/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
229227
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
230228
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
229+
sigs.k8s.io/multicluster-runtime v0.20.4-alpha.6 h1:xaBJoiYZY+DlaHBIXfS+ZUH+L5GOD6A+klL46vekggE=
230+
sigs.k8s.io/multicluster-runtime v0.20.4-alpha.6/go.mod h1:2N2/c3p08bYC9eDaRs0dllTxgAm5xiLDSkmGZpWKyw4=
231231
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA=
232232
sigs.k8s.io/structured-merge-diff/v4 v4.4.2/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4=
233233
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=

‎test/e2e/apiexport_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ import (
3838
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3939
"sigs.k8s.io/yaml"
4040

41+
mcbuilder "sigs.k8s.io/multicluster-runtime/pkg/builder"
42+
mcmanager "sigs.k8s.io/multicluster-runtime/pkg/manager"
43+
mcreconcile "sigs.k8s.io/multicluster-runtime/pkg/reconcile"
44+
4145
apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
4246
"github.com/kcp-dev/kcp/sdk/apis/core"
4347
tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1"
4448
"github.com/kcp-dev/logicalcluster/v3"
4549

46-
mcbuilder "github.com/multicluster-runtime/multicluster-runtime/pkg/builder"
47-
mcmanager "github.com/multicluster-runtime/multicluster-runtime/pkg/manager"
48-
mcreconcile "github.com/multicluster-runtime/multicluster-runtime/pkg/reconcile"
49-
5050
clusterclient "github.com/kcp-dev/multicluster-provider/client"
5151
"github.com/kcp-dev/multicluster-provider/envtest"
5252
"github.com/kcp-dev/multicluster-provider/virtualworkspace"

‎virtualworkspace/provider.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ import (
3535
"sigs.k8s.io/controller-runtime/pkg/cluster"
3636
"sigs.k8s.io/controller-runtime/pkg/log"
3737

38+
mcmanager "sigs.k8s.io/multicluster-runtime/pkg/manager"
39+
"sigs.k8s.io/multicluster-runtime/pkg/multicluster"
40+
3841
kcpcache "github.com/kcp-dev/apimachinery/v2/pkg/cache"
3942
"github.com/kcp-dev/logicalcluster/v3"
40-
41-
mcmanager "github.com/multicluster-runtime/multicluster-runtime/pkg/manager"
42-
"github.com/multicluster-runtime/multicluster-runtime/pkg/multicluster"
4343
)
4444

4545
var _ multicluster.Provider = &Provider{}

0 commit comments

Comments
 (0)