Skip to content

Commit 60210a7

Browse files
ZerpetZerpet
committed
Bump dependencies to kubernetes 1.28
There are many incompatible changes from 0.27 -> 0.28. A few structs, that were not deprecated, had been renamed/moved/removed. This update is important because it blocks consumers of the cluster operator, like messaging topology operator, to update their dependencies to controller-runtime 0.28. Signed-off-by: Aitor Perez Cedres <[email protected]>
1 parent 6a225d0 commit 60210a7

File tree

7 files changed

+118
-89
lines changed

7 files changed

+118
-89
lines changed

‎controllers/suite_test.go

+5-2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ package controllers_test
1313
import (
1414
"context"
1515
"path/filepath"
16+
"sigs.k8s.io/controller-runtime/pkg/metrics/server"
1617
"testing"
1718

1819
"k8s.io/client-go/util/retry"
@@ -84,8 +85,10 @@ var _ = BeforeSuite(func() {
8485
Expect(err).NotTo(HaveOccurred())
8586

8687
mgr, err := ctrl.NewManager(cfg, ctrl.Options{
87-
Scheme: scheme.Scheme,
88-
MetricsBindAddress: "0",
88+
Scheme: scheme.Scheme,
89+
Metrics: server.Options{
90+
BindAddress: "0",
91+
},
8992
})
9093
Expect(err).ToNot(HaveOccurred())
9194

‎go.mod

+24-23
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,29 @@ require (
66
github.com/cloudflare/cfssl v1.6.4
77
github.com/eclipse/paho.mqtt.golang v1.4.3
88
github.com/elastic/crd-ref-docs v0.0.9
9-
github.com/go-logr/logr v1.2.4
9+
github.com/go-logr/logr v1.3.0
1010
github.com/go-stomp/stomp v2.1.4+incompatible
1111
github.com/michaelklishin/rabbit-hole/v2 v2.15.0
1212
github.com/mikefarah/yq/v4 v4.35.2
13-
github.com/onsi/ginkgo/v2 v2.13.0
13+
github.com/onsi/ginkgo/v2 v2.13.1
1414
github.com/onsi/gomega v1.30.0
1515
github.com/rabbitmq/amqp091-go v1.9.0
1616
github.com/rabbitmq/rabbitmq-stream-go-client v1.3.0
1717
github.com/sclevine/yj v0.0.0-20200815061347-554173e71934
18-
golang.org/x/mod v0.13.0
19-
golang.org/x/net v0.17.0
18+
golang.org/x/mod v0.14.0
19+
golang.org/x/net v0.18.0
2020
golang.org/x/vuln v1.0.1
2121
gopkg.in/ini.v1 v1.67.0
22-
k8s.io/api v0.28.1
23-
k8s.io/apimachinery v0.28.2
24-
k8s.io/client-go v0.28.1
25-
k8s.io/klog/v2 v2.100.1
22+
k8s.io/api v0.28.4
23+
k8s.io/apimachinery v0.28.4
24+
k8s.io/client-go v0.28.4
25+
k8s.io/klog/v2 v2.110.1
2626
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
27-
sigs.k8s.io/controller-runtime v0.15.1
27+
sigs.k8s.io/controller-runtime v0.16.3
2828
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20220217024943-cfd92767d28e
2929
sigs.k8s.io/controller-tools v0.13.0
3030
sigs.k8s.io/kind v0.20.0
31-
sigs.k8s.io/kustomize/kustomize/v5 v5.1.1
31+
sigs.k8s.io/kustomize/kustomize/v5 v5.2.1
3232
)
3333

3434
require (
@@ -44,7 +44,7 @@ require (
4444
github.com/davecgh/go-spew v1.1.1 // indirect
4545
github.com/dimchansky/utfbom v1.1.1 // indirect
4646
github.com/elliotchance/orderedmap v1.5.0 // indirect
47-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
47+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
4848
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
4949
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
5050
github.com/fatih/color v1.15.0 // indirect
@@ -108,32 +108,33 @@ require (
108108
github.com/zmap/zcrypto v0.0.0-20210511125630-18f1e0152cfc // indirect
109109
github.com/zmap/zlint/v3 v3.1.0 // indirect
110110
go.starlark.net v0.0.0-20230814145427-12f4cb8177e4 // indirect
111-
go.uber.org/atomic v1.10.0 // indirect
112111
go.uber.org/multierr v1.11.0 // indirect
113-
go.uber.org/zap v1.24.0 // indirect
114-
golang.org/x/crypto v0.14.0 // indirect
112+
go.uber.org/zap v1.25.0 // indirect
113+
golang.org/x/crypto v0.15.0 // indirect
114+
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
115115
golang.org/x/oauth2 v0.8.0 // indirect
116116
golang.org/x/sync v0.4.0 // indirect
117-
golang.org/x/sys v0.13.0 // indirect
118-
golang.org/x/term v0.13.0 // indirect
119-
golang.org/x/text v0.13.0 // indirect
117+
golang.org/x/sys v0.14.0 // indirect
118+
golang.org/x/term v0.14.0 // indirect
119+
golang.org/x/text v0.14.0 // indirect
120120
golang.org/x/time v0.3.0 // indirect
121121
golang.org/x/tools v0.14.0 // indirect
122122
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
123-
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
123+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
124124
google.golang.org/appengine v1.6.7 // indirect
125125
google.golang.org/protobuf v1.31.0 // indirect
126+
gopkg.in/evanphx/json-patch.v5 v5.6.0 // indirect
126127
gopkg.in/inf.v0 v0.9.1 // indirect
127128
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
128129
gopkg.in/yaml.v2 v2.4.0 // indirect
129130
gopkg.in/yaml.v3 v3.0.1 // indirect
130-
k8s.io/apiextensions-apiserver v0.28.0 // indirect
131-
k8s.io/component-base v0.28.0 // indirect
131+
k8s.io/apiextensions-apiserver v0.28.3 // indirect
132+
k8s.io/component-base v0.28.3 // indirect
132133
k8s.io/kube-openapi v0.0.0-20230816210353-14e408962443 // indirect
133134
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
134-
sigs.k8s.io/kustomize/api v0.14.0 // indirect
135-
sigs.k8s.io/kustomize/cmd/config v0.11.3 // indirect
136-
sigs.k8s.io/kustomize/kyaml v0.14.3 // indirect
135+
sigs.k8s.io/kustomize/api v0.15.0 // indirect
136+
sigs.k8s.io/kustomize/cmd/config v0.12.0 // indirect
137+
sigs.k8s.io/kustomize/kyaml v0.15.0 // indirect
137138
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
138139
sigs.k8s.io/yaml v1.3.0 // indirect
139140
)

0 commit comments

Comments
 (0)