Skip to content

Commit 22f1cc3

Browse files
liranmaudaliranmauda
authored
Merge pull request #1709 from liranmauda/liran-bump-deps
Update rook api
2 parents 48bf40d + fc7d7c5 commit 22f1cc3

File tree

4 files changed

+226
-186
lines changed

4 files changed

+226
-186
lines changed

‎deploy/crds/noobaa.io_noobaas.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -634,8 +634,8 @@ spec:
634634
most preferred is the one with the greatest sum of weights, i.e.
635635
for each node that meets all of the scheduling requirements (resource
636636
request, requiredDuringScheduling anti-affinity expressions, etc.),
637-
compute a sum by iterating through the elements of this field and adding
638-
"weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the
637+
compute a sum by iterating through the elements of this field and subtracting
638+
"weight" from the sum if the node has pods which matches the corresponding podAffinityTerm; the
639639
node(s) with the highest sum are the most preferred.
640640
items:
641641
description: The weights of all of the matched WeightedPodAffinityTerm
@@ -1081,7 +1081,7 @@ spec:
10811081
Claims lists the names of resources, defined in spec.resourceClaims,
10821082
that are used by this container.
10831083
1084-
This is an alpha field and requires enabling the
1084+
This field depends on the
10851085
DynamicResourceAllocation feature gate.
10861086
10871087
This field is immutable. It can only be set for containers.
@@ -1149,7 +1149,7 @@ spec:
11491149
Claims lists the names of resources, defined in spec.resourceClaims,
11501150
that are used by this container.
11511151
1152-
This is an alpha field and requires enabling the
1152+
This field depends on the
11531153
DynamicResourceAllocation feature gate.
11541154
11551155
This field is immutable. It can only be set for containers.
@@ -1224,7 +1224,7 @@ spec:
12241224
Claims lists the names of resources, defined in spec.resourceClaims,
12251225
that are used by this container.
12261226
1227-
This is an alpha field and requires enabling the
1227+
This field depends on the
12281228
DynamicResourceAllocation feature gate.
12291229
12301230
This field is immutable. It can only be set for containers.
@@ -1616,7 +1616,7 @@ spec:
16161616
Claims lists the names of resources, defined in spec.resourceClaims,
16171617
that are used by this container.
16181618
1619-
This is an alpha field and requires enabling the
1619+
This field depends on the
16201620
DynamicResourceAllocation feature gate.
16211621
16221622
This field is immutable. It can only be set for containers.
@@ -1778,7 +1778,7 @@ spec:
17781778
Claims lists the names of resources, defined in spec.resourceClaims,
17791779
that are used by this container.
17801780
1781-
This is an alpha field and requires enabling the
1781+
This field depends on the
17821782
DynamicResourceAllocation feature gate.
17831783
17841784
This field is immutable. It can only be set for containers.

‎go.mod‎

Lines changed: 68 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/noobaa/noobaa-operator/v5
22

3-
go 1.24.1
3+
go 1.24.3
4+
5+
toolchain go1.24.7
46

57
replace (
68
// TODO: remove this replace once https://github.com/libopenstorage/secrets/pull/83 is merged
@@ -33,30 +35,30 @@ require (
3335
github.com/openshift/api v0.0.0-20241216151652-de9de05a8e43
3436
github.com/openshift/cloud-credential-operator v0.0.0-20231004191224-abdf0627a0cf
3537
github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87
36-
github.com/operator-framework/api v0.27.0
37-
github.com/operator-framework/operator-lib v0.15.0
38+
github.com/operator-framework/api v0.32.0
39+
github.com/operator-framework/operator-lib v0.19.0
3840
github.com/pkg/errors v0.9.1
3941
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.84.1
4042
github.com/robfig/cron/v3 v3.0.1
41-
github.com/rook/rook/pkg/apis v0.0.0-20250109065624-77b6565c4f32
43+
github.com/rook/rook/pkg/apis v0.0.0-20250915194743-ccbac6de987f
4244
github.com/sirupsen/logrus v1.9.3
43-
github.com/spf13/cobra v1.9.1
44-
github.com/spf13/pflag v1.0.7
45+
github.com/spf13/cobra v1.10.1
46+
github.com/spf13/pflag v1.0.10
4547
github.com/spf13/viper v1.16.0
46-
golang.org/x/term v0.34.0
48+
golang.org/x/term v0.35.0
4749
google.golang.org/api v0.162.0
48-
google.golang.org/grpc v1.74.2
49-
k8s.io/api v0.33.3
50+
google.golang.org/grpc v1.75.1
51+
k8s.io/api v0.34.1
5052
k8s.io/apiextensions-apiserver v0.33.3
51-
k8s.io/apimachinery v0.33.3
53+
k8s.io/apimachinery v0.34.1
5254
k8s.io/cli-runtime v0.33.3
53-
k8s.io/client-go v0.33.3
55+
k8s.io/client-go v0.34.1
5456
k8s.io/code-generator v0.33.3
5557
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01
5658
k8s.io/kube-aggregator v0.27.1
57-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff
59+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912
5860
k8s.io/kubectl v0.25.4
59-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
61+
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
6062
nhooyr.io/websocket v1.8.7
6163
sigs.k8s.io/container-object-storage-interface-api v0.1.0
6264
sigs.k8s.io/container-object-storage-interface-provisioner-sidecar v0.1.0
@@ -79,34 +81,49 @@ require (
7981
github.com/cloudnative-pg/machinery v0.3.1 // indirect
8082
github.com/containernetworking/cni v1.2.3 // indirect
8183
github.com/felixge/httpsnoop v1.0.4 // indirect
82-
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
83-
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
84+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
85+
github.com/go-jose/go-jose/v4 v4.1.1 // indirect
8486
github.com/go-logr/stdr v1.2.2 // indirect
8587
github.com/go-logr/zapr v1.3.0 // indirect
88+
github.com/go-openapi/swag/cmdutils v0.25.1 // indirect
89+
github.com/go-openapi/swag/conv v0.25.1 // indirect
90+
github.com/go-openapi/swag/fileutils v0.25.1 // indirect
91+
github.com/go-openapi/swag/jsonname v0.25.1 // indirect
92+
github.com/go-openapi/swag/jsonutils v0.25.1 // indirect
93+
github.com/go-openapi/swag/loading v0.25.1 // indirect
94+
github.com/go-openapi/swag/mangling v0.25.1 // indirect
95+
github.com/go-openapi/swag/netutils v0.25.1 // indirect
96+
github.com/go-openapi/swag/stringutils v0.25.1 // indirect
97+
github.com/go-openapi/swag/typeutils v0.25.1 // indirect
98+
github.com/go-openapi/swag/yamlutils v0.25.1 // indirect
8699
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
87100
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
88101
github.com/google/btree v1.1.3 // indirect
89102
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
90103
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
91104
github.com/hashicorp/vault/api/auth/kubernetes v0.8.0 // indirect
92-
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.5 // indirect
105+
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.7 // indirect
93106
github.com/kubernetes-csi/external-snapshotter/client/v8 v8.2.0 // indirect
94107
github.com/kylelemons/godebug v1.1.0 // indirect
95108
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
96109
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
110+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
97111
github.com/x448/float16 v0.8.4 // indirect
98-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
99-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
100-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
101-
go.opentelemetry.io/otel v1.36.0 // indirect
102-
go.opentelemetry.io/otel/metric v1.36.0 // indirect
103-
go.opentelemetry.io/otel/trace v1.36.0 // indirect
112+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
113+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
114+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
115+
go.opentelemetry.io/otel v1.38.0 // indirect
116+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
117+
go.opentelemetry.io/otel/trace v1.38.0 // indirect
104118
go.uber.org/automaxprocs v1.6.0 // indirect
105-
go.yaml.in/yaml/v2 v2.4.2 // indirect
106-
golang.org/x/sync v0.16.0 // indirect
107-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
108-
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
119+
go.yaml.in/yaml/v2 v2.4.3 // indirect
120+
go.yaml.in/yaml/v3 v3.0.4 // indirect
121+
golang.org/x/sync v0.17.0 // indirect
122+
golang.org/x/tools/go/expect v0.1.1-deprecated // indirect
123+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
124+
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f // indirect
109125
sigs.k8s.io/randfill v1.0.0 // indirect
126+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
110127
)
111128

112129
require (
@@ -127,46 +144,44 @@ require (
127144
github.com/bytedance/sonic v1.10.0 // indirect
128145
github.com/cespare/xxhash/v2 v2.3.0 // indirect
129146
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
130-
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
147+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
131148
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
132-
github.com/fsnotify/fsnotify v1.8.0 // indirect
149+
github.com/fsnotify/fsnotify v1.9.0 // indirect
133150
github.com/gemalto/flume v0.13.1 // indirect
134151
github.com/gin-gonic/gin v1.9.1 // indirect
135152
github.com/go-logr/logr v1.4.3 // indirect
136-
github.com/go-openapi/jsonpointer v0.21.1 // indirect
137-
github.com/go-openapi/jsonreference v0.21.0 // indirect
138-
github.com/go-openapi/swag v0.23.1 // indirect
153+
github.com/go-openapi/jsonpointer v0.22.1 // indirect
154+
github.com/go-openapi/jsonreference v0.21.2 // indirect
155+
github.com/go-openapi/swag v0.25.1 // indirect
139156
github.com/go-playground/validator/v10 v10.15.1 // indirect
140157
github.com/gogo/protobuf v1.3.2 // indirect
141158
github.com/golang-jwt/jwt/v4 v4.5.2
142159
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
143160
github.com/golang/protobuf v1.5.4 // indirect
144-
github.com/google/gnostic-models v0.6.9 // indirect
161+
github.com/google/gnostic-models v0.7.0 // indirect
145162
github.com/google/go-cmp v0.7.0 // indirect
146163
github.com/google/s2a-go v0.1.7 // indirect
147164
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
148165
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
149166
github.com/hashicorp/errwrap v1.1.0 // indirect
150167
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
151168
github.com/hashicorp/go-multierror v1.1.1 // indirect
152-
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
169+
github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
153170
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
154-
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8 // indirect
171+
github.com/hashicorp/go-secure-stdlib/parseutil v0.2.0 // indirect
155172
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
156173
github.com/hashicorp/go-sockaddr v1.0.7 // indirect
157174
github.com/hashicorp/hcl v1.0.1-vault-7 // indirect
158-
github.com/hashicorp/vault/api v1.15.0 // indirect
175+
github.com/hashicorp/vault/api v1.20.0 // indirect
159176
github.com/hashicorp/vault/api/auth/approle v0.8.0 // indirect
160177
github.com/inconshreveable/mousetrap v1.1.0 // indirect
161178
github.com/jmespath/go-jmespath v0.4.0 // indirect
162-
github.com/josharian/intern v1.0.0 // indirect
163179
github.com/json-iterator/go v1.1.12 // indirect
164180
github.com/klauspost/compress v1.18.0 // indirect
165181
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
166182
github.com/lib/pq v1.10.9
167183
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
168184
github.com/magiconair/properties v1.8.7 // indirect
169-
github.com/mailru/easyjson v0.9.0 // indirect
170185
github.com/marstr/collection v1.0.1 // indirect
171186
github.com/mattn/go-colorable v0.1.14 // indirect
172187
github.com/mattn/go-ieproxy v0.0.1 // indirect
@@ -178,15 +193,15 @@ require (
178193
github.com/moby/spdystream v0.5.0 // indirect
179194
github.com/moby/term v0.5.2 // indirect
180195
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
181-
github.com/modern-go/reflect2 v1.0.2 // indirect
196+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
182197
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
183198
github.com/opencontainers/go-digest v1.0.0 // indirect
184199
github.com/pelletier/go-toml/v2 v2.0.9 // indirect
185200
github.com/portworx/sched-ops v1.20.4-rc1.0.20220208024433-611d861089d4 // indirect
186-
github.com/prometheus/client_golang v1.23.0 // indirect
201+
github.com/prometheus/client_golang v1.23.2 // indirect
187202
github.com/prometheus/client_model v0.6.2 // indirect
188-
github.com/prometheus/common v0.65.0 // indirect
189-
github.com/prometheus/procfs v0.16.1 // indirect
203+
github.com/prometheus/common v0.66.1 // indirect
204+
github.com/prometheus/procfs v0.17.0 // indirect
190205
github.com/russross/blackfriday v1.5.2 // indirect
191206
github.com/ryanuber/go-glob v1.0.0 // indirect
192207
github.com/spf13/afero v1.9.5 // indirect
@@ -197,26 +212,25 @@ require (
197212
go.uber.org/multierr v1.11.0 // indirect
198213
go.uber.org/zap v1.27.0 // indirect
199214
golang.org/x/arch v0.4.0 // indirect
200-
golang.org/x/crypto v0.39.0 // indirect
201-
golang.org/x/mod v0.25.0 // indirect
202-
golang.org/x/net v0.41.0 // indirect
203-
golang.org/x/oauth2 v0.30.0 // indirect
204-
golang.org/x/sys v0.35.0 // indirect
205-
golang.org/x/text v0.27.0 // indirect
206-
golang.org/x/time v0.11.0 // indirect
207-
golang.org/x/tools v0.34.0 // indirect
215+
golang.org/x/crypto v0.42.0 // indirect
216+
golang.org/x/mod v0.28.0 // indirect
217+
golang.org/x/net v0.44.0 // indirect
218+
golang.org/x/oauth2 v0.31.0 // indirect
219+
golang.org/x/sys v0.36.0 // indirect
220+
golang.org/x/text v0.29.0 // indirect
221+
golang.org/x/time v0.13.0 // indirect
222+
golang.org/x/tools v0.37.0 // indirect
208223
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
209224
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
210-
google.golang.org/genproto/googleapis/api v0.0.0-20250528174236-200df99c418a // indirect
211-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
212-
google.golang.org/protobuf v1.36.7 // indirect
225+
google.golang.org/genproto/googleapis/api v0.0.0-20250922171735-9219d122eba9 // indirect
226+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250922171735-9219d122eba9 // indirect
227+
google.golang.org/protobuf v1.36.9 // indirect
213228
gopkg.in/inf.v0 v0.9.1 // indirect
214229
gopkg.in/ini.v1 v1.67.0 // indirect
215230
gopkg.in/yaml.v3 v3.0.1 // indirect
216231
k8s.io/klog/v2 v2.130.1 // indirect
217232
knative.dev/pkg v0.0.0-20220502225657-4fced0164c9a // indirect
218-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
219-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
233+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
220234
)
221235

222236
// see https://github.com/rook/rook/blob/master/go.mod#L42-L43

0 commit comments

Comments
 (0)