Skip to content

Commit 29f4811

Browse files
authored
Merge pull request #301 from rabbitmq/cluster-operator-1.11.1
Use cluster 1.11.1 and go mod tidy
2 parents 4a51055 + 1c5d770 commit 29f4811

File tree

3 files changed

+168
-112
lines changed

3 files changed

+168
-112
lines changed

controllers/suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ var _ = BeforeSuite(func() {
6666
testEnv = &envtest.Environment{
6767
CRDDirectoryPaths: []string{
6868
filepath.Join("..", "config", "crd", "bases"),
69-
filepath.Join(build.Default.GOPATH, "pkg", "mod", "github.com", "rabbitmq", "cluster-operator@v1.10.0", "config", "crd", "bases"),
69+
filepath.Join(build.Default.GOPATH, "pkg", "mod", "github.com", "rabbitmq", "cluster-operator@v1.11.1", "config", "crd", "bases"),
7070
},
7171
}
7272

go.mod

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ require (
1111
github.com/maxbrunsfeld/counterfeiter/v6 v6.4.1
1212
github.com/michaelklishin/rabbit-hole/v2 v2.12.0
1313
github.com/onsi/ginkgo v1.16.5
14-
github.com/onsi/gomega v1.17.0
15-
github.com/rabbitmq/cluster-operator v1.10.0
14+
github.com/onsi/gomega v1.18.0
15+
github.com/rabbitmq/cluster-operator v1.11.1
1616
github.com/sclevine/yj v0.0.0-20200815061347-554173e71934
1717
k8s.io/api v0.22.2
1818
k8s.io/apimachinery v0.22.2
@@ -28,7 +28,7 @@ require (
2828

2929
require (
3030
bitbucket.org/creachadair/shell v0.0.6 // indirect
31-
cloud.google.com/go v0.93.3 // indirect
31+
cloud.google.com/go v0.99.0 // indirect
3232
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
3333
github.com/Azure/go-autorest/autorest v0.11.18 // indirect
3434
github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect
@@ -40,26 +40,26 @@ require (
4040
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
4141
github.com/PuerkitoBio/purell v1.1.1 // indirect
4242
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
43-
github.com/armon/go-metrics v0.3.9 // indirect
43+
github.com/armon/go-metrics v0.3.10 // indirect
4444
github.com/armon/go-radix v1.0.0 // indirect
4545
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
4646
github.com/beorn7/perks v1.0.1 // indirect
4747
github.com/bgentry/speakeasy v0.1.0 // indirect
4848
github.com/cenkalti/backoff/v3 v3.0.0 // indirect
4949
github.com/census-instrumentation/opencensus-proto v0.3.0 // indirect
50-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
51-
github.com/cncf/udpa/go v0.0.0-20210322005330-6414d713912e // indirect
52-
github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158 // indirect
50+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
51+
github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4 // indirect
52+
github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490 // indirect
5353
github.com/coreos/go-semver v0.3.0 // indirect
5454
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
55-
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
55+
github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
5656
github.com/davecgh/go-spew v1.1.1 // indirect
5757
github.com/dustin/go-humanize v1.0.0 // indirect
5858
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
59-
github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021 // indirect
60-
github.com/envoyproxy/protoc-gen-validate v0.6.1 // indirect
59+
github.com/envoyproxy/go-control-plane v0.10.1 // indirect
60+
github.com/envoyproxy/protoc-gen-validate v0.6.2 // indirect
6161
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
62-
github.com/fatih/color v1.12.0 // indirect
62+
github.com/fatih/color v1.13.0 // indirect
6363
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
6464
github.com/fsnotify/fsnotify v1.5.1 // indirect
6565
github.com/fullstorydev/grpcurl v1.8.2 // indirect
@@ -70,7 +70,7 @@ require (
7070
github.com/go-openapi/swag v0.19.14 // indirect
7171
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
7272
github.com/gobuffalo/flect v0.2.3 // indirect
73-
github.com/goccy/go-yaml v1.8.9 // indirect
73+
github.com/goccy/go-yaml v1.9.5 // indirect
7474
github.com/gogo/protobuf v1.3.2 // indirect
7575
github.com/golang/glog v0.0.0-20210429001901-424d2337a529 // indirect
7676
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -89,8 +89,8 @@ require (
8989
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
9090
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
9191
github.com/hashicorp/errwrap v1.1.0 // indirect
92-
github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
93-
github.com/hashicorp/go-hclog v0.16.2 // indirect
92+
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
93+
github.com/hashicorp/go-hclog v1.0.0 // indirect
9494
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
9595
github.com/hashicorp/go-multierror v1.1.1 // indirect
9696
github.com/hashicorp/go-plugin v1.4.3 // indirect
@@ -113,24 +113,24 @@ require (
113113
github.com/jmoiron/sqlx v1.3.3 // indirect
114114
github.com/jonboulle/clockwork v0.2.2 // indirect
115115
github.com/josharian/intern v1.0.0 // indirect
116-
github.com/json-iterator/go v1.1.11 // indirect
116+
github.com/json-iterator/go v1.1.12 // indirect
117117
github.com/mailru/easyjson v0.7.6 // indirect
118-
github.com/mattn/go-colorable v0.1.8 // indirect
119-
github.com/mattn/go-isatty v0.0.12 // indirect
118+
github.com/mattn/go-colorable v0.1.12 // indirect
119+
github.com/mattn/go-isatty v0.0.14 // indirect
120120
github.com/mattn/go-runewidth v0.0.12 // indirect
121121
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
122122
github.com/mitchellh/copystructure v1.0.0 // indirect
123123
github.com/mitchellh/go-homedir v1.1.0 // indirect
124124
github.com/mitchellh/go-testing-interface v1.0.0 // indirect
125-
github.com/mitchellh/mapstructure v1.4.2 // indirect
125+
github.com/mitchellh/mapstructure v1.4.3 // indirect
126126
github.com/mitchellh/reflectwalk v1.0.1 // indirect
127127
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
128-
github.com/modern-go/reflect2 v1.0.1 // indirect
128+
github.com/modern-go/reflect2 v1.0.2 // indirect
129129
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
130130
github.com/nxadm/tail v1.4.8 // indirect
131131
github.com/oklog/run v1.0.0 // indirect
132132
github.com/olekukonko/tablewriter v0.0.5 // indirect
133-
github.com/pelletier/go-toml v1.9.3 // indirect
133+
github.com/pelletier/go-toml v1.9.4 // indirect
134134
github.com/pierrec/lz4 v2.5.2+incompatible // indirect
135135
github.com/pkg/errors v0.9.1 // indirect
136136
github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -144,7 +144,7 @@ require (
144144
github.com/sirupsen/logrus v1.8.1 // indirect
145145
github.com/soheilhy/cmux v0.1.5 // indirect
146146
github.com/spf13/afero v1.6.0 // indirect
147-
github.com/spf13/cobra v1.2.1 // indirect
147+
github.com/spf13/cobra v1.3.0 // indirect
148148
github.com/spf13/pflag v1.0.5 // indirect
149149
github.com/stretchr/testify v1.7.0 // indirect
150150
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
@@ -155,9 +155,9 @@ require (
155155
github.com/zmap/zcrypto v0.0.0-20210511125630-18f1e0152cfc // indirect
156156
github.com/zmap/zlint/v3 v3.1.0 // indirect
157157
go.etcd.io/bbolt v1.3.6 // indirect
158-
go.etcd.io/etcd/api/v3 v3.5.0 // indirect
159-
go.etcd.io/etcd/client/pkg/v3 v3.5.0 // indirect
160-
go.etcd.io/etcd/client/v2 v2.305.0 // indirect
158+
go.etcd.io/etcd/api/v3 v3.5.1 // indirect
159+
go.etcd.io/etcd/client/pkg/v3 v3.5.1 // indirect
160+
go.etcd.io/etcd/client/v2 v2.305.1 // indirect
161161
go.etcd.io/etcd/client/v3 v3.5.0 // indirect
162162
go.etcd.io/etcd/etcdctl/v3 v3.5.0 // indirect
163163
go.etcd.io/etcd/etcdutl/v3 v3.5.0 // indirect
@@ -180,20 +180,20 @@ require (
180180
go.uber.org/atomic v1.9.0 // indirect
181181
go.uber.org/multierr v1.7.0 // indirect
182182
go.uber.org/zap v1.19.0 // indirect
183-
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect
184-
golang.org/x/mod v0.4.2 // indirect
185-
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d // indirect
186-
golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a // indirect
187-
golang.org/x/sys v0.0.0-20211031064116-611d5d643895 // indirect
183+
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
184+
golang.org/x/mod v0.5.0 // indirect
185+
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect
186+
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
187+
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
188188
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
189-
golang.org/x/text v0.3.6 // indirect
189+
golang.org/x/text v0.3.7 // indirect
190190
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
191191
golang.org/x/tools v0.1.5 // indirect
192192
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
193193
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
194194
google.golang.org/appengine v1.6.7 // indirect
195-
google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8 // indirect
196-
google.golang.org/grpc v1.41.0 // indirect
195+
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
196+
google.golang.org/grpc v1.42.0 // indirect
197197
google.golang.org/protobuf v1.27.1 // indirect
198198
gopkg.in/cheggaaa/pb.v1 v1.0.28 // indirect
199199
gopkg.in/inf.v0 v0.9.1 // indirect

0 commit comments

Comments
 (0)