Skip to content

Commit 43f6b30

Browse files
ChunyiLyuChunyiLyu
authored
Merge pull request #965 from rabbitmq/k8s-1.23
Bump to k8s api 1.23
2 parents 07137ab + b26e0f4 commit 43f6b30

File tree

7 files changed

+192
-56
lines changed

7 files changed

+192
-56
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.16.x
8+
GO_VERSION: 1.17.x
99

1010
jobs:
1111

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

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1265,6 +1265,16 @@ spec:
12651265
failureThreshold:
12661266
format: int32
12671267
type: integer
1268+
grpc:
1269+
properties:
1270+
port:
1271+
format: int32
1272+
type: integer
1273+
service:
1274+
type: string
1275+
required:
1276+
- port
1277+
type: object
12681278
httpGet:
12691279
properties:
12701280
host:
@@ -1359,6 +1369,16 @@ spec:
13591369
failureThreshold:
13601370
format: int32
13611371
type: integer
1372+
grpc:
1373+
properties:
1374+
port:
1375+
format: int32
1376+
type: integer
1377+
service:
1378+
type: string
1379+
required:
1380+
- port
1381+
type: object
13621382
httpGet:
13631383
properties:
13641384
host:
@@ -1507,6 +1527,16 @@ spec:
15071527
failureThreshold:
15081528
format: int32
15091529
type: integer
1530+
grpc:
1531+
properties:
1532+
port:
1533+
format: int32
1534+
type: integer
1535+
service:
1536+
type: string
1537+
required:
1538+
- port
1539+
type: object
15101540
httpGet:
15111541
properties:
15121542
host:
@@ -1846,6 +1876,16 @@ spec:
18461876
failureThreshold:
18471877
format: int32
18481878
type: integer
1879+
grpc:
1880+
properties:
1881+
port:
1882+
format: int32
1883+
type: integer
1884+
service:
1885+
type: string
1886+
required:
1887+
- port
1888+
type: object
18491889
httpGet:
18501890
properties:
18511891
host:
@@ -1924,6 +1964,10 @@ spec:
19241964
- containerPort
19251965
type: object
19261966
type: array
1967+
x-kubernetes-list-map-keys:
1968+
- containerPort
1969+
- protocol
1970+
x-kubernetes-list-type: map
19271971
readinessProbe:
19281972
properties:
19291973
exec:
@@ -1936,6 +1980,16 @@ spec:
19361980
failureThreshold:
19371981
format: int32
19381982
type: integer
1983+
grpc:
1984+
properties:
1985+
port:
1986+
format: int32
1987+
type: integer
1988+
service:
1989+
type: string
1990+
required:
1991+
- port
1992+
type: object
19391993
httpGet:
19401994
properties:
19411995
host:
@@ -2084,6 +2138,16 @@ spec:
20842138
failureThreshold:
20852139
format: int32
20862140
type: integer
2141+
grpc:
2142+
properties:
2143+
port:
2144+
format: int32
2145+
type: integer
2146+
service:
2147+
type: string
2148+
required:
2149+
- port
2150+
type: object
20872151
httpGet:
20882152
properties:
20892153
host:
@@ -2427,6 +2491,16 @@ spec:
24272491
failureThreshold:
24282492
format: int32
24292493
type: integer
2494+
grpc:
2495+
properties:
2496+
port:
2497+
format: int32
2498+
type: integer
2499+
service:
2500+
type: string
2501+
required:
2502+
- port
2503+
type: object
24302504
httpGet:
24312505
properties:
24322506
host:
@@ -2521,6 +2595,16 @@ spec:
25212595
failureThreshold:
25222596
format: int32
25232597
type: integer
2598+
grpc:
2599+
properties:
2600+
port:
2601+
format: int32
2602+
type: integer
2603+
service:
2604+
type: string
2605+
required:
2606+
- port
2607+
type: object
25242608
httpGet:
25252609
properties:
25262610
host:
@@ -2669,6 +2753,16 @@ spec:
26692753
failureThreshold:
26702754
format: int32
26712755
type: integer
2756+
grpc:
2757+
properties:
2758+
port:
2759+
format: int32
2760+
type: integer
2761+
service:
2762+
type: string
2763+
required:
2764+
- port
2765+
type: object
26722766
httpGet:
26732767
properties:
26742768
host:
@@ -2780,6 +2874,13 @@ spec:
27802874
type: string
27812875
type: object
27822876
x-kubernetes-map-type: atomic
2877+
os:
2878+
properties:
2879+
name:
2880+
type: string
2881+
required:
2882+
- name
2883+
type: object
27832884
overhead:
27842885
additionalProperties:
27852886
anyOf:

‎controllers/reconcile_scale_down.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"context"
55
"errors"
66
"fmt"
7+
ctrl "sigs.k8s.io/controller-runtime"
78

8-
"github.com/go-logr/logr"
99
"github.com/rabbitmq/cluster-operator/api/v1beta1"
1010
"github.com/rabbitmq/cluster-operator/internal/status"
1111
appsv1 "k8s.io/api/apps/v1"
@@ -15,7 +15,7 @@ import (
1515
// cluster scale down not supported
1616
// log error, publish warning event, and set ReconcileSuccess to false when scale down request detected
1717
func (r *RabbitmqClusterReconciler) scaleDown(ctx context.Context, cluster *v1beta1.RabbitmqCluster, current, sts *appsv1.StatefulSet) bool {
18-
logger := logr.FromContext(ctx)
18+
logger := ctrl.LoggerFrom(ctx)
1919

2020
currentReplicas := *current.Spec.Replicas
2121
desiredReplicas := *sts.Spec.Replicas

‎docs/api/autogen/config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
render:
2-
kubernetesVersion: "1.22"
2+
kubernetesVersion: "1.23"
33

‎go.mod‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/cloudflare/cfssl v1.6.1
77
github.com/eclipse/paho.mqtt.golang v1.3.5
88
github.com/elastic/crd-ref-docs v0.0.7
9-
github.com/go-logr/logr v0.4.0
9+
github.com/go-logr/logr v1.2.0
1010
github.com/go-stomp/stomp v2.1.4+incompatible
1111
github.com/michaelklishin/rabbit-hole/v2 v2.12.0
1212
github.com/mikefarah/yq/v4 v4.20.1
@@ -15,14 +15,14 @@ require (
1515
github.com/rabbitmq/rabbitmq-stream-go-client v0.0.0-20210811090309-627299932bac
1616
github.com/sclevine/yj v0.0.0-20200815061347-554173e71934
1717
github.com/streadway/amqp v1.0.0
18-
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d
18+
golang.org/x/net v0.0.0-20210825183410-e898025ed96a
1919
gopkg.in/ini.v1 v1.66.4
20-
k8s.io/api v0.22.2
21-
k8s.io/apimachinery v0.22.2
22-
k8s.io/client-go v0.22.2
23-
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a
24-
sigs.k8s.io/controller-runtime v0.10.3
25-
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20210623192810-985e819db7af
20+
k8s.io/api v0.23.0
21+
k8s.io/apimachinery v0.23.0
22+
k8s.io/client-go v0.23.0
23+
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b
24+
sigs.k8s.io/controller-runtime v0.11.1
25+
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20220217024943-cfd92767d28e
2626
sigs.k8s.io/controller-tools v0.7.0
2727
sigs.k8s.io/kind v0.11.1
2828
sigs.k8s.io/kustomize/kustomize/v4 v4.5.2
@@ -60,22 +60,22 @@ require (
6060
github.com/elliotchance/orderedmap v1.4.0 // indirect
6161
github.com/envoyproxy/go-control-plane v0.10.1 // indirect
6262
github.com/envoyproxy/protoc-gen-validate v0.6.2 // indirect
63-
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
63+
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
6464
github.com/evanphx/json-patch/v5 v5.2.0 // indirect
6565
github.com/fatih/color v1.13.0 // indirect
6666
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
6767
github.com/fsnotify/fsnotify v1.5.1 // indirect
6868
github.com/fullstorydev/grpcurl v1.8.2 // indirect
6969
github.com/go-errors/errors v1.0.1 // indirect
70-
github.com/go-logr/zapr v0.4.0 // indirect
70+
github.com/go-logr/zapr v1.2.0 // indirect
7171
github.com/go-openapi/jsonpointer v0.19.5 // indirect
7272
github.com/go-openapi/jsonreference v0.19.5 // indirect
7373
github.com/go-openapi/swag v0.19.14 // indirect
7474
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
7575
github.com/gobuffalo/flect v0.2.3 // indirect
7676
github.com/goccy/go-yaml v1.9.5 // indirect
7777
github.com/gogo/protobuf v1.3.2 // indirect
78-
github.com/golang/glog v0.0.0-20210429001901-424d2337a529 // indirect
78+
github.com/golang/glog v1.0.0 // indirect
7979
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
8080
github.com/golang/mock v1.6.0 // indirect
8181
github.com/golang/protobuf v1.5.2 // indirect
@@ -121,7 +121,7 @@ require (
121121
github.com/pmezard/go-difflib v1.0.0 // indirect
122122
github.com/prometheus/client_golang v1.11.0 // indirect
123123
github.com/prometheus/client_model v0.2.0 // indirect
124-
github.com/prometheus/common v0.26.0 // indirect
124+
github.com/prometheus/common v0.28.0 // indirect
125125
github.com/prometheus/procfs v0.6.0 // indirect
126126
github.com/rivo/uniseg v0.2.0 // indirect
127127
github.com/russross/blackfriday/v2 v2.1.0 // indirect
@@ -165,15 +165,15 @@ require (
165165
go.starlark.net v0.0.0-20200821142938-949cc6f4b097 // indirect
166166
go.uber.org/atomic v1.7.0 // indirect
167167
go.uber.org/multierr v1.7.0 // indirect
168-
go.uber.org/zap v1.19.0 // indirect
168+
go.uber.org/zap v1.19.1 // indirect
169169
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
170170
golang.org/x/mod v0.5.0 // indirect
171171
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
172172
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
173-
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
173+
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
174174
golang.org/x/text v0.3.7 // indirect
175175
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
176-
golang.org/x/tools v0.1.5 // indirect
176+
golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff // indirect
177177
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
178178
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
179179
google.golang.org/appengine v1.6.7 // indirect
@@ -187,13 +187,14 @@ require (
187187
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
188188
gopkg.in/yaml.v2 v2.4.0 // indirect
189189
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
190-
k8s.io/apiextensions-apiserver v0.22.2 // indirect
191-
k8s.io/component-base v0.22.2 // indirect
192-
k8s.io/klog/v2 v2.9.0 // indirect
193-
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect
190+
k8s.io/apiextensions-apiserver v0.23.0 // indirect
191+
k8s.io/component-base v0.23.0 // indirect
192+
k8s.io/klog/v2 v2.30.0 // indirect
193+
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
194+
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
194195
sigs.k8s.io/kustomize/api v0.11.2 // indirect
195196
sigs.k8s.io/kustomize/cmd/config v0.10.4 // indirect
196197
sigs.k8s.io/kustomize/kyaml v0.13.3 // indirect
197-
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
198-
sigs.k8s.io/yaml v1.2.0 // indirect
198+
sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
199+
sigs.k8s.io/yaml v1.3.0 // indirect
199200
)

0 commit comments

Comments
 (0)