Skip to content

Commit c217f79

Browse files
authored
Merge pull request #1436 from rabbitmq/bump_kustomize_version
bumping client-go and kustomize versions
2 parents 0b92bca + 63f6eb1 commit c217f79

File tree

4 files changed

+79
-21
lines changed

4 files changed

+79
-21
lines changed

config/crd/bases/rabbitmq.com_rabbitmqclusters.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1525,6 +1525,8 @@ spec:
15251525
x-kubernetes-int-or-string: true
15261526
type: object
15271527
type: object
1528+
restartPolicy:
1529+
type: string
15281530
securityContext:
15291531
properties:
15301532
allowPrivilegeEscalation:
@@ -2167,6 +2169,8 @@ spec:
21672169
x-kubernetes-int-or-string: true
21682170
type: object
21692171
type: object
2172+
restartPolicy:
2173+
type: string
21702174
securityContext:
21712175
properties:
21722176
allowPrivilegeEscalation:
@@ -2816,6 +2820,8 @@ spec:
28162820
x-kubernetes-int-or-string: true
28172821
type: object
28182822
type: object
2823+
restartPolicy:
2824+
type: string
28192825
securityContext:
28202826
properties:
28212827
allowPrivilegeEscalation:

go.mod

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ require (
1919
golang.org/x/net v0.14.0
2020
golang.org/x/vuln v1.0.1
2121
gopkg.in/ini.v1 v1.67.0
22-
k8s.io/api v0.27.2
23-
k8s.io/apimachinery v0.27.4
24-
k8s.io/client-go v0.27.2
22+
k8s.io/api v0.28.1
23+
k8s.io/apimachinery v0.28.1
24+
k8s.io/client-go v0.28.1
2525
k8s.io/klog/v2 v2.100.1
26-
k8s.io/utils v0.0.0-20230209194617-a36077c30491
26+
k8s.io/utils v0.0.0-20230505201702-9f6742963106
2727
sigs.k8s.io/controller-runtime v0.15.1
2828
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20220217024943-cfd92767d28e
2929
sigs.k8s.io/controller-tools v0.12.1
3030
sigs.k8s.io/kind v0.20.0
31-
sigs.k8s.io/kustomize/kustomize/v4 v4.5.7
31+
sigs.k8s.io/kustomize/kustomize/v5 v5.1.1
3232
)
3333

3434
require (
@@ -39,22 +39,22 @@ require (
3939
github.com/a8m/envsubst v1.4.2 // indirect
4040
github.com/alecthomas/participle/v2 v2.0.0 // indirect
4141
github.com/alessio/shellescape v1.4.1 // indirect
42-
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
42+
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
4343
github.com/beorn7/perks v1.0.1 // indirect
4444
github.com/cespare/xxhash/v2 v2.2.0 // indirect
4545
github.com/davecgh/go-spew v1.1.1 // indirect
4646
github.com/dimchansky/utfbom v1.1.1 // indirect
4747
github.com/elliotchance/orderedmap v1.5.0 // indirect
4848
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
49-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
49+
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
5050
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
5151
github.com/fatih/color v1.15.0 // indirect
5252
github.com/fsnotify/fsnotify v1.6.0 // indirect
53-
github.com/go-errors/errors v1.0.1 // indirect
53+
github.com/go-errors/errors v1.4.2 // indirect
5454
github.com/go-logr/zapr v1.2.4 // indirect
55-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
56-
github.com/go-openapi/jsonreference v0.20.1 // indirect
57-
github.com/go-openapi/swag v0.22.3 // indirect
55+
github.com/go-openapi/jsonpointer v0.20.0 // indirect
56+
github.com/go-openapi/jsonreference v0.20.2 // indirect
57+
github.com/go-openapi/swag v0.22.4 // indirect
5858
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
5959
github.com/gobuffalo/flect v1.0.2 // indirect
6060
github.com/goccy/go-json v0.10.2 // indirect
@@ -65,6 +65,7 @@ require (
6565
github.com/golang/snappy v0.0.4 // indirect
6666
github.com/google/certificate-transparency-go v1.1.4 // indirect
6767
github.com/google/gnostic v0.5.7-v3refs // indirect
68+
github.com/google/gnostic-models v0.6.8 // indirect
6869
github.com/google/go-cmp v0.5.9 // indirect
6970
github.com/google/gofuzz v1.2.0 // indirect
7071
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
@@ -74,7 +75,7 @@ require (
7475
github.com/gorilla/websocket v1.5.0 // indirect
7576
github.com/hashicorp/hcl v1.0.0 // indirect
7677
github.com/huandu/xstrings v1.3.3 // indirect
77-
github.com/imdario/mergo v0.3.12 // indirect
78+
github.com/imdario/mergo v0.3.16 // indirect
7879
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7980
github.com/jinzhu/copier v0.3.5 // indirect
8081
github.com/jmoiron/sqlx v1.3.3 // indirect
@@ -109,15 +110,15 @@ require (
109110
github.com/spf13/cobra v1.7.0 // indirect
110111
github.com/spf13/pflag v1.0.5 // indirect
111112
github.com/weppos/publicsuffix-go v0.15.1-0.20210511084619-b1f36a2d6c0b // indirect
112-
github.com/xlab/treeprint v1.1.0 // indirect
113+
github.com/xlab/treeprint v1.2.0 // indirect
113114
github.com/zmap/zcrypto v0.0.0-20210511125630-18f1e0152cfc // indirect
114115
github.com/zmap/zlint/v3 v3.1.0 // indirect
115-
go.starlark.net v0.0.0-20200821142938-949cc6f4b097 // indirect
116+
go.starlark.net v0.0.0-20230814145427-12f4cb8177e4 // indirect
116117
go.uber.org/atomic v1.9.0 // indirect
117118
go.uber.org/multierr v1.8.0 // indirect
118119
go.uber.org/zap v1.24.0 // indirect
119120
golang.org/x/crypto v0.12.0 // indirect
120-
golang.org/x/oauth2 v0.5.0 // indirect
121+
golang.org/x/oauth2 v0.8.0 // indirect
121122
golang.org/x/sync v0.3.0 // indirect
122123
golang.org/x/sys v0.11.0 // indirect
123124
golang.org/x/term v0.11.0 // indirect
@@ -127,18 +128,18 @@ require (
127128
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
128129
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
129130
google.golang.org/appengine v1.6.7 // indirect
130-
google.golang.org/protobuf v1.30.0 // indirect
131+
google.golang.org/protobuf v1.31.0 // indirect
131132
gopkg.in/inf.v0 v0.9.1 // indirect
132133
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
133134
gopkg.in/yaml.v2 v2.4.0 // indirect
134135
gopkg.in/yaml.v3 v3.0.1 // indirect
135136
k8s.io/apiextensions-apiserver v0.27.2 // indirect
136137
k8s.io/component-base v0.27.2 // indirect
137-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
138+
k8s.io/kube-openapi v0.0.0-20230816210353-14e408962443 // indirect
138139
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
139-
sigs.k8s.io/kustomize/api v0.12.1 // indirect
140-
sigs.k8s.io/kustomize/cmd/config v0.10.9 // indirect
141-
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
140+
sigs.k8s.io/kustomize/api v0.14.0 // indirect
141+
sigs.k8s.io/kustomize/cmd/config v0.11.3 // indirect
142+
sigs.k8s.io/kustomize/kyaml v0.14.3 // indirect
142143
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
143144
sigs.k8s.io/yaml v1.3.0 // indirect
144145
)

0 commit comments

Comments
 (0)