Skip to content

Commit 53f23a6

Browse files
ChunyiLyuChunyiLyu
authored
Merge pull request #1139 from rabbitmq/k8s125
Bump k8s api to 1.25 (controller-runtime 0.13)
2 parents 13e8f3c + 35e8e89 commit 53f23a6

File tree

6 files changed

+121
-151
lines changed

6 files changed

+121
-151
lines changed

‎.github/workflows/pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches: [ main ]
66

77
env:
8-
GO_VERSION: 1.19.x
8+
GO_VERSION: 1.19.1
99
K8S_VERSION: v1.24.1
1010

1111
jobs:

‎config/crd/bases/rabbitmq.com_rabbitmqclusters.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2308,6 +2308,8 @@ spec:
23082308
type: boolean
23092309
hostPID:
23102310
type: boolean
2311+
hostUsers:
2312+
type: boolean
23112313
hostname:
23122314
type: string
23132315
imagePullSecrets:
@@ -3075,12 +3077,21 @@ spec:
30753077
type: object
30763078
type: object
30773079
x-kubernetes-map-type: atomic
3080+
matchLabelKeys:
3081+
items:
3082+
type: string
3083+
type: array
3084+
x-kubernetes-list-type: atomic
30783085
maxSkew:
30793086
format: int32
30803087
type: integer
30813088
minDomains:
30823089
format: int32
30833090
type: integer
3091+
nodeAffinityPolicy:
3092+
type: string
3093+
nodeTaintsPolicy:
3094+
type: string
30843095
topologyKey:
30853096
type: string
30863097
whenUnsatisfiable:

‎docs/api/rabbitmq.com.ref.asciidoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ PersistentVolumeClaim is an embedded version of k8s.io/api/core/v1.PersistentVol
7474
[cols="25a,75a", options="header"]
7575
|===
7676
| Field | Description
77-
| *`TypeMeta`* __link:https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#typemeta-v1-meta[$$TypeMeta$$]__ | Embedded metadata identifying a Kind and API Verison of an object. For more info, see: https://pkg.go.dev/k8s.io/apimachinery/pkg/apis/meta/v1#TypeMeta
77+
| *`TypeMeta`* __link:https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#typemeta-v1-meta[$$TypeMeta$$]__ | Embedded metadata identifying a Kind and API Version of an object. For more info, see: https://pkg.go.dev/k8s.io/apimachinery/pkg/apis/meta/v1#TypeMeta
7878
| *`metadata`* __xref:{anchor_prefix}-github-com-rabbitmq-cluster-operator-api-v1beta1-embeddedobjectmeta[$$EmbeddedObjectMeta$$]__ | Refer to Kubernetes API documentation for fields of `metadata`.
7979

8080
| *`spec`* __link:https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#persistentvolumeclaimspec-v1-core[$$PersistentVolumeClaimSpec$$]__ | Spec defines the desired characteristics of a volume requested by a pod author. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims
@@ -127,7 +127,7 @@ RabbitmqCluster is the Schema for the RabbitmqCluster API. Each instance of this
127127
| Field | Description
128128
| *`apiVersion`* __string__ | `rabbitmq.com/v1beta1`
129129
| *`kind`* __string__ | `RabbitmqCluster`
130-
| *`TypeMeta`* __link:https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#typemeta-v1-meta[$$TypeMeta$$]__ | Embedded metadata identifying a Kind and API Verison of an object. For more info, see: https://pkg.go.dev/k8s.io/apimachinery/pkg/apis/meta/v1#TypeMeta
130+
| *`TypeMeta`* __link:https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#typemeta-v1-meta[$$TypeMeta$$]__ | Embedded metadata identifying a Kind and API Version of an object. For more info, see: https://pkg.go.dev/k8s.io/apimachinery/pkg/apis/meta/v1#TypeMeta
131131
| *`metadata`* __link:https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#objectmeta-v1-meta[$$ObjectMeta$$]__ | Refer to Kubernetes API documentation for fields of `metadata`.
132132

133133
| *`spec`* __xref:{anchor_prefix}-github-com-rabbitmq-cluster-operator-api-v1beta1-rabbitmqclusterspec[$$RabbitmqClusterSpec$$]__ | Spec is the desired state of the RabbitmqCluster Custom Resource.
@@ -185,7 +185,7 @@ RabbitmqClusterList contains a list of RabbitmqClusters.
185185
| Field | Description
186186
| *`apiVersion`* __string__ | `rabbitmq.com/v1beta1`
187187
| *`kind`* __string__ | `RabbitmqClusterList`
188-
| *`TypeMeta`* __link:https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#typemeta-v1-meta[$$TypeMeta$$]__ | Embedded metadata identifying a Kind and API Verison of an object. For more info, see: https://pkg.go.dev/k8s.io/apimachinery/pkg/apis/meta/v1#TypeMeta
188+
| *`TypeMeta`* __link:https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#typemeta-v1-meta[$$TypeMeta$$]__ | Embedded metadata identifying a Kind and API Version of an object. For more info, see: https://pkg.go.dev/k8s.io/apimachinery/pkg/apis/meta/v1#TypeMeta
189189
| *`metadata`* __link:https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#listmeta-v1-meta[$$ListMeta$$]__ | Refer to Kubernetes API documentation for fields of `metadata`.
190190

191191
| *`items`* __xref:{anchor_prefix}-github-com-rabbitmq-cluster-operator-api-v1beta1-rabbitmqcluster[$$RabbitmqCluster$$] array__ | Array of RabbitmqCluster resources.

‎go.mod‎

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ require (
1616
github.com/sclevine/yj v0.0.0-20200815061347-554173e71934
1717
github.com/streadway/amqp v1.0.0
1818
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4
19-
golang.org/x/net v0.0.0-20220722155237-a158d28d115b
19+
golang.org/x/net v0.0.0-20220920183852-bf014ff85ad5
2020
gopkg.in/ini.v1 v1.67.0
21-
k8s.io/api v0.24.2
22-
k8s.io/apimachinery v0.24.4
23-
k8s.io/client-go v0.24.2
21+
k8s.io/api v0.25.0
22+
k8s.io/apimachinery v0.25.0
23+
k8s.io/client-go v0.25.0
2424
k8s.io/klog/v2 v2.80.1
25-
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
26-
sigs.k8s.io/controller-runtime v0.12.3
25+
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
26+
sigs.k8s.io/controller-runtime v0.13.0
2727
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20220217024943-cfd92767d28e
2828
sigs.k8s.io/controller-tools v0.9.2
2929
sigs.k8s.io/kind v0.15.0
@@ -34,8 +34,8 @@ require (
3434
bitbucket.org/creachadair/shell v0.0.6 // indirect
3535
cloud.google.com/go v0.99.0 // indirect
3636
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
37-
github.com/Azure/go-autorest/autorest v0.11.18 // indirect
38-
github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect
37+
github.com/Azure/go-autorest/autorest v0.11.27 // indirect
38+
github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
3939
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
4040
github.com/Azure/go-autorest/logger v0.2.1 // indirect
4141
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
@@ -49,6 +49,7 @@ require (
4949
github.com/alecthomas/participle/v2 v2.0.0-beta.5 // indirect
5050
github.com/alessio/shellescape v1.4.1 // indirect
5151
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
52+
github.com/benbjohnson/clock v1.1.0 // indirect
5253
github.com/beorn7/perks v1.0.1 // indirect
5354
github.com/bgentry/speakeasy v0.1.0 // indirect
5455
github.com/census-instrumentation/opencensus-proto v0.3.0 // indirect
@@ -61,17 +62,17 @@ require (
6162
github.com/davecgh/go-spew v1.1.1 // indirect
6263
github.com/dustin/go-humanize v1.0.0 // indirect
6364
github.com/elliotchance/orderedmap v1.4.0 // indirect
64-
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
65-
github.com/envoyproxy/go-control-plane v0.10.1 // indirect
65+
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
66+
github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1 // indirect
6667
github.com/envoyproxy/protoc-gen-validate v0.6.2 // indirect
6768
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
6869
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
6970
github.com/fatih/color v1.13.0 // indirect
7071
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
71-
github.com/fsnotify/fsnotify v1.5.1 // indirect
72+
github.com/fsnotify/fsnotify v1.5.4 // indirect
7273
github.com/fullstorydev/grpcurl v1.8.2 // indirect
7374
github.com/go-errors/errors v1.0.1 // indirect
74-
github.com/go-logr/zapr v1.2.0 // indirect
75+
github.com/go-logr/zapr v1.2.3 // indirect
7576
github.com/go-openapi/jsonpointer v0.19.5 // indirect
7677
github.com/go-openapi/jsonreference v0.19.5 // indirect
7778
github.com/go-openapi/swag v0.19.14 // indirect
@@ -80,6 +81,7 @@ require (
8081
github.com/goccy/go-json v0.9.11 // indirect
8182
github.com/goccy/go-yaml v1.9.5 // indirect
8283
github.com/gogo/protobuf v1.3.2 // indirect
84+
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
8385
github.com/golang/glog v1.0.0 // indirect
8486
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
8587
github.com/golang/mock v1.6.0 // indirect
@@ -124,7 +126,7 @@ require (
124126
github.com/olekukonko/tablewriter v0.0.5 // indirect
125127
github.com/pelletier/go-toml v1.9.4 // indirect
126128
github.com/pkg/errors v0.9.1 // indirect
127-
github.com/prometheus/client_golang v1.12.1 // indirect
129+
github.com/prometheus/client_golang v1.12.2 // indirect
128130
github.com/prometheus/client_model v0.2.0 // indirect
129131
github.com/prometheus/common v0.32.1 // indirect
130132
github.com/prometheus/procfs v0.7.3 // indirect
@@ -143,15 +145,15 @@ require (
143145
github.com/zmap/zcrypto v0.0.0-20210511125630-18f1e0152cfc // indirect
144146
github.com/zmap/zlint/v3 v3.1.0 // indirect
145147
go.etcd.io/bbolt v1.3.6 // indirect
146-
go.etcd.io/etcd/api/v3 v3.5.1 // indirect
147-
go.etcd.io/etcd/client/pkg/v3 v3.5.1 // indirect
148-
go.etcd.io/etcd/client/v2 v2.305.1 // indirect
149-
go.etcd.io/etcd/client/v3 v3.5.1 // indirect
148+
go.etcd.io/etcd/api/v3 v3.5.4 // indirect
149+
go.etcd.io/etcd/client/pkg/v3 v3.5.4 // indirect
150+
go.etcd.io/etcd/client/v2 v2.305.4 // indirect
151+
go.etcd.io/etcd/client/v3 v3.5.4 // indirect
150152
go.etcd.io/etcd/etcdctl/v3 v3.5.0 // indirect
151153
go.etcd.io/etcd/etcdutl/v3 v3.5.0 // indirect
152-
go.etcd.io/etcd/pkg/v3 v3.5.0 // indirect
153-
go.etcd.io/etcd/raft/v3 v3.5.0 // indirect
154-
go.etcd.io/etcd/server/v3 v3.5.0 // indirect
154+
go.etcd.io/etcd/pkg/v3 v3.5.4 // indirect
155+
go.etcd.io/etcd/raft/v3 v3.5.4 // indirect
156+
go.etcd.io/etcd/server/v3 v3.5.4 // indirect
155157
go.etcd.io/etcd/tests/v3 v3.5.0 // indirect
156158
go.etcd.io/etcd/v3 v3.5.0 // indirect
157159
go.opentelemetry.io/contrib v0.20.0 // indirect
@@ -167,34 +169,34 @@ require (
167169
go.starlark.net v0.0.0-20200821142938-949cc6f4b097 // indirect
168170
go.uber.org/atomic v1.7.0 // indirect
169171
go.uber.org/multierr v1.7.0 // indirect
170-
go.uber.org/zap v1.19.1 // indirect
172+
go.uber.org/zap v1.21.0 // indirect
171173
golang.org/x/crypto v0.0.0-20220824171710-5757bc0c5503 // indirect
172174
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
173175
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
174-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
176+
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
175177
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
176178
golang.org/x/text v0.3.7 // indirect
177-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
179+
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
178180
golang.org/x/tools v0.1.12 // indirect
179181
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
180182
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
181183
google.golang.org/appengine v1.6.7 // indirect
182-
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
183-
google.golang.org/grpc v1.42.0 // indirect
184+
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
185+
google.golang.org/grpc v1.47.0 // indirect
184186
google.golang.org/protobuf v1.28.0 // indirect
185187
gopkg.in/cheggaaa/pb.v1 v1.0.28 // indirect
186188
gopkg.in/inf.v0 v0.9.1 // indirect
187189
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
188190
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
189191
gopkg.in/yaml.v2 v2.4.0 // indirect
190192
gopkg.in/yaml.v3 v3.0.1 // indirect
191-
k8s.io/apiextensions-apiserver v0.24.2 // indirect
192-
k8s.io/component-base v0.24.2 // indirect
193-
k8s.io/kube-openapi v0.0.0-20220401212409-b28bf2818661 // indirect
194-
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
193+
k8s.io/apiextensions-apiserver v0.25.0 // indirect
194+
k8s.io/component-base v0.25.0 // indirect
195+
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
196+
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
195197
sigs.k8s.io/kustomize/api v0.12.1 // indirect
196198
sigs.k8s.io/kustomize/cmd/config v0.10.9 // indirect
197199
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
198-
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
200+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
199201
sigs.k8s.io/yaml v1.3.0 // indirect
200202
)

0 commit comments

Comments
 (0)