Skip to content

Commit 314ad22

Browse files
mkuratczykmkuratczyk
authored
Update apimachinery to 0.29 + all deps (#1522)
1 parent 8429e81 commit 314ad22

File tree

8 files changed

+395
-88
lines changed

8 files changed

+395
-88
lines changed

‎cluster-operator

55.3 MB
Binary file not shown.

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

+181-28
Large diffs are not rendered by default.

‎controllers/rabbitmqcluster_controller_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -803,7 +803,7 @@ var _ = Describe("RabbitmqClusterController", func() {
803803
},
804804
Spec: corev1.PersistentVolumeClaimSpec{
805805
AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
806-
Resources: corev1.ResourceRequirements{
806+
Resources: corev1.VolumeResourceRequirements{
807807
Requests: map[corev1.ResourceName]k8sresource.Quantity{
808808
corev1.ResourceStorage: q,
809809
},
@@ -819,7 +819,7 @@ var _ = Describe("RabbitmqClusterController", func() {
819819
},
820820
},
821821
Spec: corev1.PersistentVolumeClaimSpec{
822-
Resources: corev1.ResourceRequirements{
822+
Resources: corev1.VolumeResourceRequirements{
823823
Requests: corev1.ResourceList{
824824
corev1.ResourceStorage: myStorage,
825825
},
@@ -895,7 +895,7 @@ var _ = Describe("RabbitmqClusterController", func() {
895895
corev1.PersistentVolumeClaimSpec{
896896
AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
897897
VolumeMode: &volumeMode,
898-
Resources: corev1.ResourceRequirements{
898+
Resources: corev1.VolumeResourceRequirements{
899899
Requests: map[corev1.ResourceName]k8sresource.Quantity{
900900
corev1.ResourceStorage: q,
901901
},
@@ -913,7 +913,7 @@ var _ = Describe("RabbitmqClusterController", func() {
913913
corev1.PersistentVolumeClaimSpec{
914914
VolumeMode: &volumeMode,
915915
StorageClassName: &storageClassName,
916-
Resources: corev1.ResourceRequirements{
916+
Resources: corev1.VolumeResourceRequirements{
917917
Requests: map[corev1.ResourceName]k8sresource.Quantity{
918918
corev1.ResourceStorage: myStorage,
919919
},

‎go.mod

+43-41
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/elastic/crd-ref-docs v0.0.10
1111
github.com/go-logr/logr v1.4.1
1212
github.com/go-stomp/stomp v2.1.4+incompatible
13-
github.com/michaelklishin/rabbit-hole/v2 v2.15.0
13+
github.com/michaelklishin/rabbit-hole/v2 v2.16.0
1414
github.com/onsi/ginkgo/v2 v2.13.2
1515
github.com/onsi/gomega v1.30.0
1616
github.com/rabbitmq/amqp091-go v1.9.0
@@ -21,11 +21,11 @@ require (
2121
golang.org/x/text v0.14.0
2222
golang.org/x/vuln v1.0.1
2323
gopkg.in/ini.v1 v1.67.0
24-
k8s.io/api v0.28.4
25-
k8s.io/apimachinery v0.28.4
26-
k8s.io/client-go v0.28.4
24+
k8s.io/api v0.29.0
25+
k8s.io/apimachinery v0.29.0
26+
k8s.io/client-go v0.29.0
2727
k8s.io/klog/v2 v2.110.1
28-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
28+
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
2929
sigs.k8s.io/controller-runtime v0.16.3
3030
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20220217024943-cfd92767d28e
3131
sigs.k8s.io/controller-tools v0.13.0
@@ -46,16 +46,16 @@ require (
4646
github.com/davecgh/go-spew v1.1.1 // indirect
4747
github.com/dimchansky/utfbom v1.1.1 // indirect
4848
github.com/elliotchance/orderedmap v1.5.1 // indirect
49-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
50-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
51-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
49+
github.com/emicklei/go-restful/v3 v3.11.1 // indirect
50+
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
51+
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
5252
github.com/fatih/color v1.16.0 // indirect
53-
github.com/fsnotify/fsnotify v1.6.0 // indirect
53+
github.com/fsnotify/fsnotify v1.7.0 // indirect
5454
github.com/go-errors/errors v1.4.2 // indirect
55-
github.com/go-logr/zapr v1.2.4 // indirect
56-
github.com/go-openapi/jsonpointer v0.20.0 // indirect
57-
github.com/go-openapi/jsonreference v0.20.2 // indirect
58-
github.com/go-openapi/swag v0.22.4 // indirect
55+
github.com/go-logr/zapr v1.3.0 // indirect
56+
github.com/go-openapi/jsonpointer v0.20.2 // indirect
57+
github.com/go-openapi/jsonreference v0.20.4 // indirect
58+
github.com/go-openapi/swag v0.22.7 // indirect
5959
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
6060
github.com/gobuffalo/flect v1.0.2 // indirect
6161
github.com/goccy/go-json v0.10.2 // indirect
@@ -64,79 +64,81 @@ require (
6464
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6565
github.com/golang/protobuf v1.5.3 // indirect
6666
github.com/golang/snappy v0.0.4 // indirect
67-
github.com/google/certificate-transparency-go v1.1.4 // indirect
67+
github.com/google/certificate-transparency-go v1.1.7 // indirect
6868
github.com/google/gnostic-models v0.6.8 // indirect
6969
github.com/google/go-cmp v0.6.0 // indirect
7070
github.com/google/gofuzz v1.2.0 // indirect
71-
github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 // indirect
71+
github.com/google/pprof v0.0.0-20231229205709-960ae82b1e42 // indirect
7272
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
7373
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
74-
github.com/google/uuid v1.3.1 // indirect
75-
github.com/gorilla/websocket v1.5.0 // indirect
74+
github.com/google/uuid v1.5.0 // indirect
75+
github.com/gorilla/websocket v1.5.1 // indirect
7676
github.com/hashicorp/hcl v1.0.0 // indirect
7777
github.com/huandu/xstrings v1.3.3 // indirect
7878
github.com/imdario/mergo v0.3.16 // indirect
7979
github.com/inconshreveable/mousetrap v1.1.0 // indirect
8080
github.com/jinzhu/copier v0.4.0 // indirect
81-
github.com/jmoiron/sqlx v1.3.3 // indirect
81+
github.com/jmoiron/sqlx v1.3.5 // indirect
8282
github.com/josharian/intern v1.0.0 // indirect
8383
github.com/json-iterator/go v1.1.12 // indirect
84-
github.com/klauspost/compress v1.17.1 // indirect
84+
github.com/klauspost/compress v1.17.4 // indirect
8585
github.com/magiconair/properties v1.8.7 // indirect
8686
github.com/mailru/easyjson v0.7.7 // indirect
8787
github.com/mattn/go-colorable v0.1.13 // indirect
8888
github.com/mattn/go-isatty v0.0.20 // indirect
8989
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
90+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
9091
github.com/mitchellh/copystructure v1.2.0 // indirect
9192
github.com/mitchellh/reflectwalk v1.0.2 // indirect
9293
github.com/moby/spdystream v0.2.0 // indirect
9394
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
9495
github.com/modern-go/reflect2 v1.0.2 // indirect
9596
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
9697
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
97-
github.com/pelletier/go-toml v1.9.4 // indirect
98+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
99+
github.com/pelletier/go-toml v1.9.5 // indirect
98100
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
99101
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
100102
github.com/pkg/errors v0.9.1 // indirect
101-
github.com/prometheus/client_golang v1.16.0 // indirect
102-
github.com/prometheus/client_model v0.4.0 // indirect
103-
github.com/prometheus/common v0.44.0 // indirect
104-
github.com/prometheus/procfs v0.10.1 // indirect
103+
github.com/prometheus/client_golang v1.18.0 // indirect
104+
github.com/prometheus/client_model v0.5.0 // indirect
105+
github.com/prometheus/common v0.45.0 // indirect
106+
github.com/prometheus/procfs v0.12.0 // indirect
105107
github.com/spf13/afero v1.6.0 // indirect
106108
github.com/spf13/cobra v1.8.0 // indirect
107109
github.com/spf13/pflag v1.0.5 // indirect
108-
github.com/weppos/publicsuffix-go v0.15.1-0.20210511084619-b1f36a2d6c0b // indirect
110+
github.com/weppos/publicsuffix-go v0.30.2-0.20230730094716-a20f9abcc222 // indirect
109111
github.com/xlab/treeprint v1.2.0 // indirect
110112
github.com/yuin/gopher-lua v1.1.1 // indirect
111-
github.com/zmap/zcrypto v0.0.0-20210511125630-18f1e0152cfc // indirect
112-
github.com/zmap/zlint/v3 v3.1.0 // indirect
113+
github.com/zmap/zcrypto v0.0.0-20231219022726-a1f61fb1661c // indirect
114+
github.com/zmap/zlint/v3 v3.6.0 // indirect
113115
go.starlark.net v0.0.0-20230814145427-12f4cb8177e4 // indirect
114116
go.uber.org/multierr v1.11.0 // indirect
115-
go.uber.org/zap v1.25.0 // indirect
117+
go.uber.org/zap v1.26.0 // indirect
116118
golang.org/x/crypto v0.17.0 // indirect
117-
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
118-
golang.org/x/oauth2 v0.8.0 // indirect
119-
golang.org/x/sync v0.4.0 // indirect
120-
golang.org/x/sys v0.15.0 // indirect
121-
golang.org/x/term v0.15.0 // indirect
122-
golang.org/x/time v0.3.0 // indirect
123-
golang.org/x/tools v0.14.0 // indirect
119+
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
120+
golang.org/x/oauth2 v0.15.0 // indirect
121+
golang.org/x/sync v0.6.0 // indirect
122+
golang.org/x/sys v0.16.0 // indirect
123+
golang.org/x/term v0.16.0 // indirect
124+
golang.org/x/time v0.5.0 // indirect
125+
golang.org/x/tools v0.16.1 // indirect
124126
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
125127
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
126-
google.golang.org/appengine v1.6.7 // indirect
127-
google.golang.org/protobuf v1.31.0 // indirect
128+
google.golang.org/appengine v1.6.8 // indirect
129+
google.golang.org/protobuf v1.32.0 // indirect
128130
gopkg.in/evanphx/json-patch.v5 v5.6.0 // indirect
129131
gopkg.in/inf.v0 v0.9.1 // indirect
130132
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
131133
gopkg.in/yaml.v2 v2.4.0 // indirect
132134
gopkg.in/yaml.v3 v3.0.1 // indirect
133-
k8s.io/apiextensions-apiserver v0.28.3 // indirect
134-
k8s.io/component-base v0.28.3 // indirect
135-
k8s.io/kube-openapi v0.0.0-20230816210353-14e408962443 // indirect
135+
k8s.io/apiextensions-apiserver v0.29.0 // indirect
136+
k8s.io/component-base v0.29.0 // indirect
137+
k8s.io/kube-openapi v0.0.0-20240105020646-a37d4de58910 // indirect
136138
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
137139
sigs.k8s.io/kustomize/api v0.16.0 // indirect
138140
sigs.k8s.io/kustomize/cmd/config v0.13.0 // indirect
139141
sigs.k8s.io/kustomize/kyaml v0.16.0 // indirect
140-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
142+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
141143
sigs.k8s.io/yaml v1.4.0 // indirect
142144
)

0 commit comments

Comments
 (0)