Skip to content

Commit 09ba402

Browse files
dannyzakendannyzaken
authored
Merge pull request #1693 from dannyzaken/danny-cnpg-1.27
updated cloudnative dependency to 1.27.0
2 parents f43cb97 + 3bd3be9 commit 09ba402

File tree

12 files changed

+172
-177
lines changed

12 files changed

+172
-177
lines changed

‎deploy/crds/noobaa.io_noobaas.yaml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,6 @@ spec:
349349
pod labels will be ignored. The default value is empty.
350350
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
351351
Also, matchLabelKeys cannot be set when labelSelector isn't set.
352-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
353352
items:
354353
type: string
355354
type: array
@@ -364,7 +363,6 @@ spec:
364363
pod labels will be ignored. The default value is empty.
365364
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
366365
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
367-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
368366
items:
369367
type: string
370368
type: array
@@ -530,7 +528,6 @@ spec:
530528
pod labels will be ignored. The default value is empty.
531529
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
532530
Also, matchLabelKeys cannot be set when labelSelector isn't set.
533-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
534531
items:
535532
type: string
536533
type: array
@@ -545,7 +542,6 @@ spec:
545542
pod labels will be ignored. The default value is empty.
546543
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
547544
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
548-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
549545
items:
550546
type: string
551547
type: array
@@ -708,7 +704,6 @@ spec:
708704
pod labels will be ignored. The default value is empty.
709705
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
710706
Also, matchLabelKeys cannot be set when labelSelector isn't set.
711-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
712707
items:
713708
type: string
714709
type: array
@@ -723,7 +718,6 @@ spec:
723718
pod labels will be ignored. The default value is empty.
724719
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
725720
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
726-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
727721
items:
728722
type: string
729723
type: array
@@ -889,7 +883,6 @@ spec:
889883
pod labels will be ignored. The default value is empty.
890884
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
891885
Also, matchLabelKeys cannot be set when labelSelector isn't set.
892-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
893886
items:
894887
type: string
895888
type: array
@@ -904,7 +897,6 @@ spec:
904897
pod labels will be ignored. The default value is empty.
905898
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
906899
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
907-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
908900
items:
909901
type: string
910902
type: array

‎go.mod‎

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

3-
go 1.24
3+
go 1.24.1
44

55
replace (
66
// TODO: remove this replace once https://github.com/libopenstorage/secrets/pull/83 is merged
@@ -18,7 +18,7 @@ require (
1818
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
1919
github.com/aws/aws-sdk-go v1.48.12
2020
github.com/blang/semver/v4 v4.0.0
21-
github.com/cloudnative-pg/cloudnative-pg v1.25.0
21+
github.com/cloudnative-pg/cloudnative-pg v1.27.0
2222
github.com/coreos/go-semver v0.3.1
2323
github.com/docker/distribution v2.8.2+incompatible
2424
github.com/gemalto/kmip-go v0.0.10
@@ -28,41 +28,41 @@ require (
2828
github.com/kube-object-storage/lib-bucket-provisioner v0.0.0-20221122204822-d1a8c34382f1
2929
github.com/libopenstorage/secrets v0.0.0-20240416031220-a17cf7f72c6c
3030
github.com/marstr/randname v0.0.0-20200428202425-99aca53a2176
31-
github.com/onsi/ginkgo/v2 v2.22.1
32-
github.com/onsi/gomega v1.36.1
31+
github.com/onsi/ginkgo/v2 v2.23.4
32+
github.com/onsi/gomega v1.38.0
3333
github.com/openshift/api v0.0.0-20241216151652-de9de05a8e43
3434
github.com/openshift/cloud-credential-operator v0.0.0-20231004191224-abdf0627a0cf
3535
github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87
3636
github.com/operator-framework/api v0.27.0
3737
github.com/operator-framework/operator-lib v0.15.0
3838
github.com/pkg/errors v0.9.1
39-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.79.2
39+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.84.1
4040
github.com/robfig/cron/v3 v3.0.1
4141
github.com/rook/rook/pkg/apis v0.0.0-20250109065624-77b6565c4f32
4242
github.com/sirupsen/logrus v1.9.3
4343
github.com/spf13/cobra v1.9.1
44-
github.com/spf13/pflag v1.0.6
44+
github.com/spf13/pflag v1.0.7
4545
github.com/spf13/viper v1.16.0
46-
golang.org/x/term v0.30.0
46+
golang.org/x/term v0.34.0
4747
google.golang.org/api v0.162.0
48-
google.golang.org/grpc v1.71.0
49-
k8s.io/api v0.32.3
50-
k8s.io/apiextensions-apiserver v0.32.1
51-
k8s.io/apimachinery v0.32.3
52-
k8s.io/cli-runtime v0.32.0
53-
k8s.io/client-go v0.32.3
54-
k8s.io/code-generator v0.32.1
48+
google.golang.org/grpc v1.74.2
49+
k8s.io/api v0.33.3
50+
k8s.io/apiextensions-apiserver v0.33.3
51+
k8s.io/apimachinery v0.33.3
52+
k8s.io/cli-runtime v0.33.3
53+
k8s.io/client-go v0.33.3
54+
k8s.io/code-generator v0.33.3
5555
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01
5656
k8s.io/kube-aggregator v0.27.1
5757
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff
5858
k8s.io/kubectl v0.25.4
59-
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e
59+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
6060
nhooyr.io/websocket v1.8.7
6161
sigs.k8s.io/container-object-storage-interface-api v0.1.0
6262
sigs.k8s.io/container-object-storage-interface-provisioner-sidecar v0.1.0
6363
sigs.k8s.io/container-object-storage-interface-spec v0.1.0
64-
sigs.k8s.io/controller-runtime v0.19.3
65-
sigs.k8s.io/yaml v1.4.0
64+
sigs.k8s.io/controller-runtime v0.21.0
65+
sigs.k8s.io/yaml v1.6.0
6666
)
6767

6868
require (
@@ -74,45 +74,47 @@ require (
7474
github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
7575
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
7676
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
77-
github.com/cloudnative-pg/barman-cloud v0.0.0-20241218093921-134c7de4954a // indirect
78-
github.com/cloudnative-pg/machinery v0.0.0-20241219102532-2807bc88310d // indirect
77+
github.com/cloudnative-pg/barman-cloud v0.3.3 // indirect
78+
github.com/cloudnative-pg/cnpg-i v0.3.0 // indirect
79+
github.com/cloudnative-pg/machinery v0.3.1 // indirect
7980
github.com/containernetworking/cni v1.2.3 // indirect
8081
github.com/felixge/httpsnoop v1.0.4 // indirect
81-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
82+
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
8283
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
8384
github.com/go-logr/stdr v1.2.2 // indirect
8485
github.com/go-logr/zapr v1.3.0 // indirect
8586
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
8687
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
87-
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
88-
github.com/gorilla/websocket v1.5.3 // indirect
88+
github.com/google/btree v1.1.3 // indirect
89+
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
90+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
8991
github.com/hashicorp/vault/api/auth/kubernetes v0.8.0 // indirect
9092
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.5 // indirect
9193
github.com/kubernetes-csi/external-snapshotter/client/v8 v8.2.0 // indirect
9294
github.com/kylelemons/godebug v1.1.0 // indirect
9395
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
9496
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
95-
github.com/robfig/cron v1.2.0 // indirect
9697
github.com/x448/float16 v0.8.4 // indirect
9798
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
9899
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
99100
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
100-
go.opentelemetry.io/otel v1.35.0 // indirect
101-
go.opentelemetry.io/otel/metric v1.35.0 // indirect
102-
go.opentelemetry.io/otel/trace v1.35.0 // indirect
103-
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
104-
golang.org/x/sync v0.12.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
104+
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
105107
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
106-
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
108+
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
107109
sigs.k8s.io/randfill v1.0.0 // indirect
108110
)
109111

110112
require (
111113
cloud.google.com/go v0.112.0 // indirect
112-
cloud.google.com/go/compute/metadata v0.6.0 // indirect
114+
cloud.google.com/go/compute/metadata v0.7.0 // indirect
113115
cloud.google.com/go/iam v1.1.6 // indirect
114116
github.com/Azure/azure-pipeline-go v0.2.3 // indirect
115-
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
117+
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
116118
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
117119
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
118120
github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
@@ -130,7 +132,7 @@ require (
130132
github.com/fsnotify/fsnotify v1.8.0 // indirect
131133
github.com/gemalto/flume v0.13.1 // indirect
132134
github.com/gin-gonic/gin v1.9.1 // indirect
133-
github.com/go-logr/logr v1.4.2 // indirect
135+
github.com/go-logr/logr v1.4.3 // indirect
134136
github.com/go-openapi/jsonpointer v0.21.1 // indirect
135137
github.com/go-openapi/jsonreference v0.21.0 // indirect
136138
github.com/go-openapi/swag v0.23.1 // indirect
@@ -141,7 +143,6 @@ require (
141143
github.com/golang/protobuf v1.5.4 // indirect
142144
github.com/google/gnostic-models v0.6.9 // indirect
143145
github.com/google/go-cmp v0.7.0 // indirect
144-
github.com/google/gofuzz v1.2.0 // indirect
145146
github.com/google/s2a-go v0.1.7 // indirect
146147
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
147148
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
@@ -167,25 +168,25 @@ require (
167168
github.com/magiconair/properties v1.8.7 // indirect
168169
github.com/mailru/easyjson v0.9.0 // indirect
169170
github.com/marstr/collection v1.0.1 // indirect
170-
github.com/mattn/go-colorable v0.1.13 // indirect
171+
github.com/mattn/go-colorable v0.1.14 // indirect
171172
github.com/mattn/go-ieproxy v0.0.1 // indirect
172173
github.com/mattn/go-isatty v0.0.20 // indirect
173174
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
174175
github.com/mitchellh/go-homedir v1.1.0 // indirect
175176
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
176177
github.com/mitchellh/mapstructure v1.5.0 // indirect
177178
github.com/moby/spdystream v0.5.0 // indirect
178-
github.com/moby/term v0.5.0 // indirect
179+
github.com/moby/term v0.5.2 // indirect
179180
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
180181
github.com/modern-go/reflect2 v1.0.2 // indirect
181182
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
182183
github.com/opencontainers/go-digest v1.0.0 // indirect
183184
github.com/pelletier/go-toml/v2 v2.0.9 // indirect
184185
github.com/portworx/sched-ops v1.20.4-rc1.0.20220208024433-611d861089d4 // indirect
185-
github.com/prometheus/client_golang v1.21.1 // indirect
186-
github.com/prometheus/client_model v0.6.1 // indirect
187-
github.com/prometheus/common v0.63.0 // indirect
188-
github.com/prometheus/procfs v0.16.0 // indirect
186+
github.com/prometheus/client_golang v1.23.0 // indirect
187+
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
189190
github.com/russross/blackfriday v1.5.2 // indirect
190191
github.com/ryanuber/go-glob v1.0.0 // indirect
191192
github.com/spf13/afero v1.9.5 // indirect
@@ -196,26 +197,26 @@ require (
196197
go.uber.org/multierr v1.11.0 // indirect
197198
go.uber.org/zap v1.27.0 // indirect
198199
golang.org/x/arch v0.4.0 // indirect
199-
golang.org/x/crypto v0.36.0 // indirect
200-
golang.org/x/mod v0.24.0 // indirect
201-
golang.org/x/net v0.38.0 // indirect
202-
golang.org/x/oauth2 v0.28.0 // indirect
203-
golang.org/x/sys v0.31.0 // indirect
204-
golang.org/x/text v0.23.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
205206
golang.org/x/time v0.11.0 // indirect
206-
golang.org/x/tools v0.31.0 // indirect
207+
golang.org/x/tools v0.34.0 // indirect
207208
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
208209
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
209-
google.golang.org/genproto/googleapis/api v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
210-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
211-
google.golang.org/protobuf v1.36.5 // 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
212213
gopkg.in/inf.v0 v0.9.1 // indirect
213214
gopkg.in/ini.v1 v1.67.0 // indirect
214215
gopkg.in/yaml.v3 v3.0.1 // indirect
215216
k8s.io/klog/v2 v2.130.1 // indirect
216217
knative.dev/pkg v0.0.0-20220502225657-4fced0164c9a // indirect
217218
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
218-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
219+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
219220
)
220221

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

0 commit comments

Comments
 (0)