Skip to content

Commit b0e6cd9

Browse files
authored
Merge pull request #41 from embik/controller-runtime-0.21
✨ Update to `sigs.k8s.io/controller-runtime` v0.21.0
2 parents 575b97b + f862602 commit b0e6cd9

File tree

16 files changed

+404
-381
lines changed

16 files changed

+404
-381
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ SHELL:=/usr/bin/env bash
2727
#
2828
# Go.
2929
#
30-
GO_VERSION ?= 1.23.7
30+
GO_VERSION ?= 1.24.2
3131

3232
# Use GOPROXY environment variable if set
3333
GOPROXY := $(shell go env GOPROXY)

examples/cluster-api/go.mod

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
module sigs.k8s.io/multicluster-runtime/examples/cluster-api
22

3-
go 1.23.0
3+
go 1.24.0
44

55
replace (
66
sigs.k8s.io/multicluster-runtime => ../..
77
sigs.k8s.io/multicluster-runtime/providers/cluster-api => ../../providers/cluster-api
88
)
99

1010
require (
11-
golang.org/x/sync v0.10.0
12-
k8s.io/api v0.32.2
13-
k8s.io/apimachinery v0.32.2
14-
k8s.io/client-go v0.32.2
11+
golang.org/x/sync v0.12.0
12+
k8s.io/api v0.33.0
13+
k8s.io/apimachinery v0.33.0
14+
k8s.io/client-go v0.33.0
1515
sigs.k8s.io/cluster-api v1.9.4
16-
sigs.k8s.io/controller-runtime v0.20.4
16+
sigs.k8s.io/controller-runtime v0.21.0
1717
sigs.k8s.io/multicluster-runtime v0.20.4-alpha.7
1818
sigs.k8s.io/multicluster-runtime/providers/cluster-api v0.20.4-alpha.6
1919
)
@@ -34,49 +34,46 @@ require (
3434
github.com/go-openapi/swag v0.23.0 // indirect
3535
github.com/gobuffalo/flect v1.0.3 // indirect
3636
github.com/gogo/protobuf v1.3.2 // indirect
37-
github.com/golang/protobuf v1.5.4 // indirect
3837
github.com/google/btree v1.1.3 // indirect
39-
github.com/google/gnostic-models v0.6.8 // indirect
40-
github.com/google/go-cmp v0.6.0 // indirect
41-
github.com/google/gofuzz v1.2.0 // indirect
38+
github.com/google/gnostic-models v0.6.9 // indirect
39+
github.com/google/go-cmp v0.7.0 // indirect
4240
github.com/google/uuid v1.6.0 // indirect
43-
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4441
github.com/josharian/intern v1.0.0 // indirect
4542
github.com/json-iterator/go v1.1.12 // indirect
4643
github.com/mailru/easyjson v0.7.7 // indirect
4744
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4845
github.com/modern-go/reflect2 v1.0.2 // indirect
4946
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5047
github.com/pkg/errors v0.9.1 // indirect
51-
github.com/prometheus/client_golang v1.19.1 // indirect
48+
github.com/prometheus/client_golang v1.22.0 // indirect
5249
github.com/prometheus/client_model v0.6.1 // indirect
53-
github.com/prometheus/common v0.55.0 // indirect
50+
github.com/prometheus/common v0.62.0 // indirect
5451
github.com/prometheus/procfs v0.15.1 // indirect
55-
github.com/spf13/cobra v1.8.1 // indirect
5652
github.com/spf13/pflag v1.0.5 // indirect
5753
github.com/x448/float16 v0.8.4 // indirect
58-
go.opentelemetry.io/otel v1.28.0 // indirect
59-
go.opentelemetry.io/otel/trace v1.28.0 // indirect
54+
go.opentelemetry.io/otel v1.33.0 // indirect
55+
go.opentelemetry.io/otel/trace v1.33.0 // indirect
6056
go.uber.org/multierr v1.11.0 // indirect
6157
go.uber.org/zap v1.27.0 // indirect
62-
golang.org/x/net v0.33.0 // indirect
63-
golang.org/x/oauth2 v0.24.0 // indirect
64-
golang.org/x/sys v0.28.0 // indirect
65-
golang.org/x/term v0.27.0 // indirect
66-
golang.org/x/text v0.21.0 // indirect
67-
golang.org/x/time v0.7.0 // indirect
58+
golang.org/x/net v0.38.0 // indirect
59+
golang.org/x/oauth2 v0.27.0 // indirect
60+
golang.org/x/sys v0.31.0 // indirect
61+
golang.org/x/term v0.30.0 // indirect
62+
golang.org/x/text v0.23.0 // indirect
63+
golang.org/x/time v0.9.0 // indirect
6864
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
69-
google.golang.org/protobuf v1.35.1 // indirect
65+
google.golang.org/protobuf v1.36.5 // indirect
7066
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
7167
gopkg.in/inf.v0 v0.9.1 // indirect
7268
gopkg.in/yaml.v3 v3.0.1 // indirect
73-
k8s.io/apiextensions-apiserver v0.32.1 // indirect
69+
k8s.io/apiextensions-apiserver v0.33.0 // indirect
7470
k8s.io/cluster-bootstrap v0.31.3 // indirect
75-
k8s.io/component-base v0.32.1 // indirect
71+
k8s.io/component-base v0.33.0 // indirect
7672
k8s.io/klog/v2 v2.130.1 // indirect
77-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
73+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
7874
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
7975
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
80-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
76+
sigs.k8s.io/randfill v1.0.0 // indirect
77+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
8178
sigs.k8s.io/yaml v1.4.0 // indirect
8279
)

examples/cluster-api/go.sum

Lines changed: 57 additions & 56 deletions
Large diffs are not rendered by default.

examples/kind/go.mod

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
module sigs.k8s.io/multicluster-runtime/examples/kind
22

3-
go 1.23.0
3+
go 1.24.0
44

55
replace (
66
sigs.k8s.io/multicluster-runtime => ../..
77
sigs.k8s.io/multicluster-runtime/providers/kind => ../../providers/kind
88
)
99

1010
require (
11-
golang.org/x/sync v0.8.0
12-
k8s.io/api v0.32.1
13-
k8s.io/apimachinery v0.32.1
14-
sigs.k8s.io/controller-runtime v0.20.4
11+
golang.org/x/sync v0.12.0
12+
k8s.io/api v0.33.0
13+
k8s.io/apimachinery v0.33.0
14+
sigs.k8s.io/controller-runtime v0.21.0
1515
sigs.k8s.io/multicluster-runtime v0.20.4-alpha.7
1616
sigs.k8s.io/multicluster-runtime/providers/kind v0.20.4-alpha.6
1717
)
@@ -32,11 +32,9 @@ require (
3232
github.com/go-openapi/jsonreference v0.20.2 // indirect
3333
github.com/go-openapi/swag v0.23.0 // indirect
3434
github.com/gogo/protobuf v1.3.2 // indirect
35-
github.com/golang/protobuf v1.5.4 // indirect
3635
github.com/google/btree v1.1.3 // indirect
37-
github.com/google/gnostic-models v0.6.8 // indirect
38-
github.com/google/go-cmp v0.6.0 // indirect
39-
github.com/google/gofuzz v1.2.0 // indirect
36+
github.com/google/gnostic-models v0.6.9 // indirect
37+
github.com/google/go-cmp v0.7.0 // indirect
4038
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
4139
github.com/google/uuid v1.6.0 // indirect
4240
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -49,33 +47,34 @@ require (
4947
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5048
github.com/pelletier/go-toml v1.9.5 // indirect
5149
github.com/pkg/errors v0.9.1 // indirect
52-
github.com/prometheus/client_golang v1.19.1 // indirect
50+
github.com/prometheus/client_golang v1.22.0 // indirect
5351
github.com/prometheus/client_model v0.6.1 // indirect
54-
github.com/prometheus/common v0.55.0 // indirect
52+
github.com/prometheus/common v0.62.0 // indirect
5553
github.com/prometheus/procfs v0.15.1 // indirect
5654
github.com/spf13/cobra v1.8.1 // indirect
5755
github.com/spf13/pflag v1.0.5 // indirect
5856
github.com/x448/float16 v0.8.4 // indirect
5957
go.uber.org/multierr v1.11.0 // indirect
6058
go.uber.org/zap v1.27.0 // indirect
61-
golang.org/x/net v0.30.0 // indirect
62-
golang.org/x/oauth2 v0.23.0 // indirect
63-
golang.org/x/sys v0.26.0 // indirect
64-
golang.org/x/term v0.25.0 // indirect
65-
golang.org/x/text v0.19.0 // indirect
66-
golang.org/x/time v0.7.0 // indirect
59+
golang.org/x/net v0.38.0 // indirect
60+
golang.org/x/oauth2 v0.27.0 // indirect
61+
golang.org/x/sys v0.31.0 // indirect
62+
golang.org/x/term v0.30.0 // indirect
63+
golang.org/x/text v0.23.0 // indirect
64+
golang.org/x/time v0.9.0 // indirect
6765
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
68-
google.golang.org/protobuf v1.35.1 // indirect
66+
google.golang.org/protobuf v1.36.5 // indirect
6967
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
7068
gopkg.in/inf.v0 v0.9.1 // indirect
7169
gopkg.in/yaml.v3 v3.0.1 // indirect
72-
k8s.io/apiextensions-apiserver v0.32.1 // indirect
73-
k8s.io/client-go v0.32.1 // indirect
70+
k8s.io/apiextensions-apiserver v0.33.0 // indirect
71+
k8s.io/client-go v0.33.0 // indirect
7472
k8s.io/klog/v2 v2.130.1 // indirect
75-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
73+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
7674
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
7775
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
7876
sigs.k8s.io/kind v0.26.0 // indirect
79-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
77+
sigs.k8s.io/randfill v1.0.0 // indirect
78+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
8079
sigs.k8s.io/yaml v1.4.0 // indirect
8180
)

0 commit comments

Comments
 (0)