Skip to content

Commit c074408

Browse files
authored
Merge pull request #8999 from sbueringer/pr-bump-cr-v0.16
⚠️ Bump to controller-runtime v0.16
2 parents 414b6f1 + 932cdc4 commit c074408

File tree

18 files changed

+381
-335
lines changed

18 files changed

+381
-335
lines changed

bootstrap/kubeadm/main.go

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ import (
4242
"sigs.k8s.io/controller-runtime/pkg/cache"
4343
"sigs.k8s.io/controller-runtime/pkg/client"
4444
"sigs.k8s.io/controller-runtime/pkg/controller"
45+
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
4546
"sigs.k8s.io/controller-runtime/pkg/webhook"
4647

4748
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
@@ -195,9 +196,11 @@ func main() {
195196
os.Exit(1)
196197
}
197198

198-
var watchNamespaces []string
199+
var watchNamespaces map[string]cache.Config
199200
if watchNamespace != "" {
200-
watchNamespaces = []string{watchNamespace}
201+
watchNamespaces = map[string]cache.Config{
202+
watchNamespace: {},
203+
}
201204
}
202205

203206
if profilerAddress != "" && enableContentionProfiling {
@@ -209,7 +212,6 @@ func main() {
209212

210213
ctrlOptions := ctrl.Options{
211214
Scheme: scheme,
212-
MetricsBindAddress: metricsBindAddr,
213215
LeaderElection: enableLeaderElection,
214216
LeaderElectionID: "kubeadm-bootstrap-manager-leader-election-capi",
215217
LeaseDuration: &leaderElectionLeaseDuration,
@@ -218,9 +220,12 @@ func main() {
218220
LeaderElectionResourceLock: resourcelock.LeasesResourceLock,
219221
HealthProbeBindAddress: healthAddr,
220222
PprofBindAddress: profilerAddress,
223+
Metrics: metricsserver.Options{
224+
BindAddress: metricsBindAddr,
225+
},
221226
Cache: cache.Options{
222-
Namespaces: watchNamespaces,
223-
SyncPeriod: &syncPeriod,
227+
DefaultNamespaces: watchNamespaces,
228+
SyncPeriod: &syncPeriod,
224229
ByObject: map[client.Object]cache.ByObject{
225230
// Note: Only Secrets with the cluster name label are cached.
226231
// The default client of the manager won't use the cache for secrets at all (see Client.Cache.DisableFor).

controllers/remote/cluster_cache_healthcheck_test.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import (
3131
"k8s.io/klog/v2/klogr"
3232
"sigs.k8s.io/controller-runtime/pkg/client"
3333
"sigs.k8s.io/controller-runtime/pkg/manager"
34+
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
3435

3536
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
3637
"sigs.k8s.io/cluster-api/util"
@@ -58,8 +59,10 @@ func TestClusterCacheHealthCheck(t *testing.T) {
5859
t.Log("Setting up a new manager")
5960
var err error
6061
mgr, err = manager.New(env.Config, manager.Options{
61-
Scheme: scheme.Scheme,
62-
MetricsBindAddress: "0",
62+
Scheme: scheme.Scheme,
63+
Metrics: metricsserver.Options{
64+
BindAddress: "0",
65+
},
6366
})
6467
g.Expect(err).ToNot(HaveOccurred())
6568

controllers/remote/cluster_cache_reconciler_test.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828
"sigs.k8s.io/controller-runtime/pkg/client"
2929
"sigs.k8s.io/controller-runtime/pkg/controller"
3030
"sigs.k8s.io/controller-runtime/pkg/manager"
31+
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
3132

3233
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
3334
"sigs.k8s.io/cluster-api/util"
@@ -80,8 +81,10 @@ func TestClusterCacheReconciler(t *testing.T) {
8081
t.Log("Setting up a new manager")
8182
var err error
8283
mgr, err = manager.New(env.Config, manager.Options{
83-
Scheme: scheme.Scheme,
84-
MetricsBindAddress: "0",
84+
Scheme: scheme.Scheme,
85+
Metrics: metricsserver.Options{
86+
BindAddress: "0",
87+
},
8588
})
8689
g.Expect(err).ToNot(HaveOccurred())
8790

controllers/remote/cluster_cache_tracker_test.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import (
3131
"sigs.k8s.io/controller-runtime/pkg/client/fake"
3232
"sigs.k8s.io/controller-runtime/pkg/handler"
3333
"sigs.k8s.io/controller-runtime/pkg/manager"
34+
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
3435
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3536

3637
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
@@ -68,8 +69,10 @@ func TestClusterCacheTracker(t *testing.T) {
6869
t.Log("Setting up a new manager")
6970
var err error
7071
mgr, err = manager.New(env.Config, manager.Options{
71-
Scheme: scheme.Scheme,
72-
MetricsBindAddress: "0",
72+
Scheme: scheme.Scheme,
73+
Metrics: metricsserver.Options{
74+
BindAddress: "0",
75+
},
7376
})
7477
g.Expect(err).ToNot(HaveOccurred())
7578

controlplane/kubeadm/main.go

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ import (
4444
"sigs.k8s.io/controller-runtime/pkg/cache"
4545
"sigs.k8s.io/controller-runtime/pkg/client"
4646
"sigs.k8s.io/controller-runtime/pkg/controller"
47+
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
4748
"sigs.k8s.io/controller-runtime/pkg/webhook"
4849

4950
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
@@ -198,9 +199,11 @@ func main() {
198199
os.Exit(1)
199200
}
200201

201-
var watchNamespaces []string
202+
var watchNamespaces map[string]cache.Config
202203
if watchNamespace != "" {
203-
watchNamespaces = []string{watchNamespace}
204+
watchNamespaces = map[string]cache.Config{
205+
watchNamespace: {},
206+
}
204207
}
205208

206209
if profilerAddress != "" && enableContentionProfiling {
@@ -212,7 +215,6 @@ func main() {
212215

213216
ctrlOptions := ctrl.Options{
214217
Scheme: scheme,
215-
MetricsBindAddress: metricsBindAddr,
216218
LeaderElection: enableLeaderElection,
217219
LeaderElectionID: "kubeadm-control-plane-manager-leader-election-capi",
218220
LeaseDuration: &leaderElectionLeaseDuration,
@@ -221,9 +223,12 @@ func main() {
221223
LeaderElectionResourceLock: resourcelock.LeasesResourceLock,
222224
HealthProbeBindAddress: healthAddr,
223225
PprofBindAddress: profilerAddress,
226+
Metrics: metricsserver.Options{
227+
BindAddress: metricsBindAddr,
228+
},
224229
Cache: cache.Options{
225-
Namespaces: watchNamespaces,
226-
SyncPeriod: &syncPeriod,
230+
DefaultNamespaces: watchNamespaces,
231+
SyncPeriod: &syncPeriod,
227232
ByObject: map[client.Object]cache.ByObject{
228233
// Note: Only Secrets with the cluster name label are cached.
229234
// The default client of the manager won't use the cache for secrets at all (see Client.Cache.DisableFor).

docs/book/src/developer/providers/migrations/v1.5-to-v1.6.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ maintainers of providers and consumers of our Go API.
1212
**Note**: Only the most relevant dependencies are listed, `k8s.io/` and `ginkgo`/`gomega` dependencies in Cluster API are kept in sync with the versions used by `sigs.k8s.io/controller-runtime`.
1313

1414
- sigs.k8s.io/kind: v0.20.x
15-
- sigs.k8s.io/controller-runtime: v0.15.x
15+
- sigs.k8s.io/controller-runtime: v0.15.x => v0.16.x
1616
- sigs.k8s.io/controller-tools: v0.12.x
1717

1818
## Changes by Kind
@@ -37,4 +37,4 @@ maintainers of providers and consumers of our Go API.
3737

3838
### Suggested changes for providers
3939

40-
- In order to reduce dependencies for API package consumers, CAPI has diverged from the default kubebuilder scheme builder. This new pattern may also be useful for reducing dependencies in provider API packages. For more information [see the implementers guide.](../implementers-guide/create_api.md#registering-apis-in-the-scheme)
40+
- In order to reduce dependencies for API package consumers, CAPI has diverged from the default kubebuilder scheme builder. This new pattern may also be useful for reducing dependencies in provider API packages. For more information [see the implementers guide.](../implementers-guide/create_api.md#registering-apis-in-the-scheme)

go.mod

Lines changed: 36 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,18 @@ require (
3535
golang.org/x/text v0.12.0
3636
gomodules.xyz/jsonpatch/v2 v2.4.0
3737
google.golang.org/grpc v1.55.1
38-
k8s.io/api v0.27.2
39-
k8s.io/apiextensions-apiserver v0.27.2
40-
k8s.io/apimachinery v0.27.2
41-
k8s.io/apiserver v0.27.2
42-
k8s.io/client-go v0.27.2
43-
k8s.io/cluster-bootstrap v0.27.2
44-
k8s.io/component-base v0.27.2
45-
k8s.io/klog/v2 v2.90.1
46-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
47-
k8s.io/kubectl v0.27.2
48-
k8s.io/utils v0.0.0-20230209194617-a36077c30491
49-
sigs.k8s.io/controller-runtime v0.15.1
38+
k8s.io/api v0.28.0
39+
k8s.io/apiextensions-apiserver v0.28.0
40+
k8s.io/apimachinery v0.28.0
41+
k8s.io/apiserver v0.28.0
42+
k8s.io/client-go v0.28.0
43+
k8s.io/cluster-bootstrap v0.28.0
44+
k8s.io/component-base v0.28.0
45+
k8s.io/klog/v2 v2.100.1
46+
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9
47+
k8s.io/kubectl v0.28.0
48+
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
49+
sigs.k8s.io/controller-runtime v0.16.0
5050
sigs.k8s.io/yaml v1.3.0
5151
)
5252

@@ -57,35 +57,35 @@ require (
5757
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
5858
github.com/ajeddeloh/go-json v0.0.0-20200220154158-5ae607161559 // indirect
5959
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
60-
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
60+
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
6161
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
6262
github.com/beorn7/perks v1.0.1 // indirect
6363
github.com/cespare/xxhash/v2 v2.2.0 // indirect
6464
github.com/chai2010/gettext-go v1.0.2 // indirect
6565
github.com/cloudflare/circl v1.3.3 // indirect
6666
github.com/coredns/caddy v1.1.0 // indirect
67-
github.com/coreos/go-semver v0.3.0 // indirect
67+
github.com/coreos/go-semver v0.3.1 // indirect
6868
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
69-
github.com/coreos/go-systemd/v22 v22.4.0 // indirect
69+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
7070
github.com/daviddengcn/go-colortext v1.0.0 // indirect
7171
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
7272
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
7373
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
7474
github.com/fatih/camelcase v1.0.0 // indirect
7575
github.com/fsnotify/fsnotify v1.6.0 // indirect
76-
github.com/fvbommel/sortorder v1.0.1 // indirect
76+
github.com/fvbommel/sortorder v1.1.0 // indirect
7777
github.com/go-errors/errors v1.4.2 // indirect
7878
github.com/go-logr/zapr v1.2.4 // indirect
7979
github.com/go-openapi/jsonpointer v0.19.6 // indirect
80-
github.com/go-openapi/jsonreference v0.20.1 // indirect
80+
github.com/go-openapi/jsonreference v0.20.2 // indirect
8181
github.com/go-openapi/swag v0.22.3 // indirect
8282
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
8383
github.com/gogo/protobuf v1.3.2 // indirect
8484
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
8585
github.com/golang/protobuf v1.5.3 // indirect
8686
github.com/google/btree v1.0.1 // indirect
87-
github.com/google/cel-go v0.12.6 // indirect
88-
github.com/google/gnostic v0.6.9 // indirect
87+
github.com/google/cel-go v0.16.0 // indirect
88+
github.com/google/gnostic-models v0.6.8 // indirect
8989
github.com/google/go-querystring v1.1.0 // indirect
9090
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
9191
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
@@ -107,7 +107,7 @@ require (
107107
github.com/mattn/go-runewidth v0.0.14 // indirect
108108
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
109109
github.com/mitchellh/copystructure v1.2.0 // indirect
110-
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
110+
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
111111
github.com/mitchellh/mapstructure v1.5.0 // indirect
112112
github.com/mitchellh/reflectwalk v1.0.2 // indirect
113113
github.com/moby/spdystream v0.2.0 // indirect
@@ -121,7 +121,7 @@ require (
121121
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
122122
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
123123
github.com/prometheus/client_model v0.4.0 // indirect
124-
github.com/prometheus/common v0.42.0 // indirect
124+
github.com/prometheus/common v0.44.0 // indirect
125125
github.com/prometheus/procfs v0.10.1 // indirect
126126
github.com/rivo/uniseg v0.4.2 // indirect
127127
github.com/russross/blackfriday/v2 v2.1.0 // indirect
@@ -132,32 +132,35 @@ require (
132132
github.com/stoewer/go-strcase v1.2.0 // indirect
133133
github.com/subosito/gotenv v1.4.2 // indirect
134134
github.com/vincent-petithory/dataurl v1.0.0 // indirect
135-
github.com/xlab/treeprint v1.1.0 // indirect
135+
github.com/xlab/treeprint v1.2.0 // indirect
136136
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
137-
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
138-
go.uber.org/atomic v1.9.0 // indirect
139-
go.uber.org/multierr v1.8.0 // indirect
140-
go.uber.org/zap v1.24.0 // indirect
137+
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
138+
go.uber.org/multierr v1.11.0 // indirect
139+
go.uber.org/zap v1.25.0 // indirect
141140
go4.org v0.0.0-20201209231011-d4a079459e60 // indirect
142141
golang.org/x/crypto v0.12.0 // indirect
142+
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
143143
golang.org/x/net v0.14.0 // indirect
144+
golang.org/x/sync v0.2.0 // indirect
144145
golang.org/x/sys v0.11.0 // indirect
145146
golang.org/x/term v0.11.0 // indirect
146147
golang.org/x/time v0.3.0 // indirect
147148
golang.org/x/tools v0.9.3 // indirect
148149
google.golang.org/appengine v1.6.7 // indirect
149-
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
150+
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
151+
google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
152+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
150153
google.golang.org/protobuf v1.31.0 // indirect
151154
gopkg.in/inf.v0 v0.9.1 // indirect
152155
gopkg.in/ini.v1 v1.67.0 // indirect
153156
gopkg.in/yaml.v2 v2.4.0 // indirect
154157
gopkg.in/yaml.v3 v3.0.1 // indirect
155-
k8s.io/cli-runtime v0.27.2 // indirect
156-
k8s.io/component-helpers v0.27.2 // indirect
157-
k8s.io/metrics v0.27.2 // indirect
158+
k8s.io/cli-runtime v0.28.0 // indirect
159+
k8s.io/component-helpers v0.28.0 // indirect
160+
k8s.io/metrics v0.28.0 // indirect
158161
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
159-
sigs.k8s.io/kustomize/api v0.13.2 // indirect
160-
sigs.k8s.io/kustomize/kustomize/v5 v5.0.1 // indirect
161-
sigs.k8s.io/kustomize/kyaml v0.14.1 // indirect
162+
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
163+
sigs.k8s.io/kustomize/kustomize/v5 v5.0.4-0.20230601165947-6ce0bf390ce3 // indirect
164+
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
162165
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
163166
)

0 commit comments

Comments
 (0)