Skip to content

Commit bdfa61a

Browse files
authored
Merge pull request #450 from rabbitmq/k8s125
Bump k8s api to 1.25 (controller-runtime 0.13)
2 parents 7d421ab + db72e83 commit bdfa61a

File tree

5 files changed

+84
-390
lines changed

5 files changed

+84
-390
lines changed

api/v1alpha1/groupversion_info.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ This product may include a number of subcomponents with separate copyright notic
88
*/
99

1010
// Package v1alpha1 contains API Schema definitions for the rabbitmq.com v1alpha1 API group
11-
//+kubebuilder:object:generate=true
12-
//+groupName=rabbitmq.com
11+
// +kubebuilder:object:generate=true
12+
// +groupName=rabbitmq.com
1313
package v1alpha1
1414

1515
import (

go.mod

+22-21
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ require (
1515
github.com/rabbitmq/cluster-operator v1.14.0
1616
github.com/sclevine/yj v0.0.0-20200815061347-554173e71934
1717
gopkg.in/ini.v1 v1.67.0
18-
k8s.io/api v0.24.4
19-
k8s.io/apimachinery v0.24.4
20-
k8s.io/client-go v0.24.4
21-
k8s.io/code-generator v0.24.4
18+
k8s.io/api v0.25.0
19+
k8s.io/apimachinery v0.25.0
20+
k8s.io/client-go v0.25.0
21+
k8s.io/code-generator v0.25.0
2222
k8s.io/klog/v2 v2.80.0
23-
k8s.io/kube-openapi v0.0.0-20220614142933-1062c7ade5f8
24-
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
25-
sigs.k8s.io/controller-runtime v0.12.3
23+
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1
24+
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
25+
sigs.k8s.io/controller-runtime v0.13.0
2626
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20220217024943-cfd92767d28e
2727
sigs.k8s.io/controller-tools v0.9.2
2828
sigs.k8s.io/kustomize/kustomize/v4 v4.5.7
@@ -57,9 +57,10 @@ require (
5757
github.com/davecgh/go-spew v1.1.1 // indirect
5858
github.com/dustin/go-humanize v1.0.0 // indirect
5959
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
60-
github.com/envoyproxy/go-control-plane v0.10.1 // indirect
60+
github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1 // indirect
6161
github.com/envoyproxy/protoc-gen-validate v0.6.2 // indirect
6262
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
63+
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
6364
github.com/fatih/color v1.13.0 // indirect
6465
github.com/form3tech-oss/jwt-go v3.2.5+incompatible // indirect
6566
github.com/fsnotify/fsnotify v1.5.4 // indirect
@@ -156,15 +157,15 @@ require (
156157
github.com/zmap/zcrypto v0.0.0-20210511125630-18f1e0152cfc // indirect
157158
github.com/zmap/zlint/v3 v3.1.0 // indirect
158159
go.etcd.io/bbolt v1.3.6 // indirect
159-
go.etcd.io/etcd/api/v3 v3.5.1 // indirect
160-
go.etcd.io/etcd/client/pkg/v3 v3.5.1 // indirect
161-
go.etcd.io/etcd/client/v2 v2.305.1 // indirect
162-
go.etcd.io/etcd/client/v3 v3.5.1 // indirect
160+
go.etcd.io/etcd/api/v3 v3.5.4 // indirect
161+
go.etcd.io/etcd/client/pkg/v3 v3.5.4 // indirect
162+
go.etcd.io/etcd/client/v2 v2.305.4 // indirect
163+
go.etcd.io/etcd/client/v3 v3.5.4 // indirect
163164
go.etcd.io/etcd/etcdctl/v3 v3.5.0 // indirect
164165
go.etcd.io/etcd/etcdutl/v3 v3.5.0 // indirect
165-
go.etcd.io/etcd/pkg/v3 v3.5.0 // indirect
166-
go.etcd.io/etcd/raft/v3 v3.5.0 // indirect
167-
go.etcd.io/etcd/server/v3 v3.5.0 // indirect
166+
go.etcd.io/etcd/pkg/v3 v3.5.4 // indirect
167+
go.etcd.io/etcd/raft/v3 v3.5.4 // indirect
168+
go.etcd.io/etcd/server/v3 v3.5.4 // indirect
168169
go.etcd.io/etcd/tests/v3 v3.5.0 // indirect
169170
go.etcd.io/etcd/v3 v3.5.0 // indirect
170171
go.opentelemetry.io/contrib v0.20.0 // indirect
@@ -193,22 +194,22 @@ require (
193194
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
194195
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
195196
google.golang.org/appengine v1.6.7 // indirect
196-
google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3 // indirect
197-
google.golang.org/grpc v1.45.0 // indirect
197+
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
198+
google.golang.org/grpc v1.47.0 // indirect
198199
google.golang.org/protobuf v1.28.0 // indirect
199200
gopkg.in/cheggaaa/pb.v1 v1.0.28 // indirect
200201
gopkg.in/inf.v0 v0.9.1 // indirect
201202
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
202203
gopkg.in/square/go-jose.v2 v2.5.1 // indirect
203204
gopkg.in/yaml.v2 v2.4.0 // indirect
204205
gopkg.in/yaml.v3 v3.0.1 // indirect
205-
k8s.io/apiextensions-apiserver v0.24.2 // indirect
206-
k8s.io/component-base v0.24.2 // indirect
206+
k8s.io/apiextensions-apiserver v0.25.0 // indirect
207+
k8s.io/component-base v0.25.0 // indirect
207208
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
208-
sigs.k8s.io/json v0.0.0-20220525155127-227cbc7cc124 // indirect
209+
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
209210
sigs.k8s.io/kustomize/api v0.12.1 // indirect
210211
sigs.k8s.io/kustomize/cmd/config v0.10.9 // indirect
211212
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
212-
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
213+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
213214
sigs.k8s.io/yaml v1.3.0 // indirect
214215
)

0 commit comments

Comments
 (0)