Skip to content

Commit 64e3dd7

Browse files
weshayutinmprycclaude
authored
updates for 1.4 compat (#314)
Signed-off-by: Wesley Hayutin <weshayutin@gmail.com> Signed-off-by: Michal Pryc <mpryc@redhat.com> Co-authored-by: Michal Pryc <mpryc@redhat.com> Co-authored-by: Claude <noreply@anthropic.com>
1 parent e6677a0 commit 64e3dd7

File tree

45 files changed

+628
-338
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+628
-338
lines changed

‎config/crd/bases/oadp.openshift.io_nonadminbackups.yaml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -188,13 +188,11 @@ spec:
188188
items:
189189
type: string
190190
type: array
191-
x-kubernetes-list-type: atomic
192191
required:
193192
- key
194193
- operator
195194
type: object
196195
type: array
197-
x-kubernetes-list-type: atomic
198196
matchLabels:
199197
additionalProperties:
200198
type: string
@@ -380,13 +378,11 @@ spec:
380378
items:
381379
type: string
382380
type: array
383-
x-kubernetes-list-type: atomic
384381
required:
385382
- key
386383
- operator
387384
type: object
388385
type: array
389-
x-kubernetes-list-type: atomic
390386
matchLabels:
391387
additionalProperties:
392388
type: string
@@ -443,13 +439,11 @@ spec:
443439
items:
444440
type: string
445441
type: array
446-
x-kubernetes-list-type: atomic
447442
required:
448443
- key
449444
- operator
450445
type: object
451446
type: array
452-
x-kubernetes-list-type: atomic
453447
matchLabels:
454448
additionalProperties:
455449
type: string
@@ -839,13 +833,11 @@ spec:
839833
items:
840834
type: string
841835
type: array
842-
x-kubernetes-list-type: atomic
843836
required:
844837
- key
845838
- operator
846839
type: object
847840
type: array
848-
x-kubernetes-list-type: atomic
849841
matchLabels:
850842
additionalProperties:
851843
type: string
@@ -1031,13 +1023,11 @@ spec:
10311023
items:
10321024
type: string
10331025
type: array
1034-
x-kubernetes-list-type: atomic
10351026
required:
10361027
- key
10371028
- operator
10381029
type: object
10391030
type: array
1040-
x-kubernetes-list-type: atomic
10411031
matchLabels:
10421032
additionalProperties:
10431033
type: string
@@ -1094,13 +1084,11 @@ spec:
10941084
items:
10951085
type: string
10961086
type: array
1097-
x-kubernetes-list-type: atomic
10981087
required:
10991088
- key
11001089
- operator
11011090
type: object
11021091
type: array
1103-
x-kubernetes-list-type: atomic
11041092
matchLabels:
11051093
additionalProperties:
11061094
type: string

‎config/crd/bases/oadp.openshift.io_nonadminbackupstoragelocationrequests.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,8 @@ spec:
118118
be a valid secret key.
119119
type: string
120120
name:
121-
default: ""
122121
description: |-
123122
Name of the referent.
124-
This field is effectively required, but due to backwards compatibility is
125-
allowed to be empty. Instances of this type with an empty value here are
126-
almost certainly wrong.
127123
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
128124
type: string
129125
optional:

‎config/crd/bases/oadp.openshift.io_nonadminbackupstoragelocations.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,8 @@ spec:
8686
a valid secret key.
8787
type: string
8888
name:
89-
default: ""
9089
description: |-
9190
Name of the referent.
92-
This field is effectively required, but due to backwards compatibility is
93-
allowed to be empty. Instances of this type with an empty value here are
94-
almost certainly wrong.
9591
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
9692
type: string
9793
optional:

‎config/crd/bases/oadp.openshift.io_nonadminrestores.yaml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,11 @@ spec:
151151
items:
152152
type: string
153153
type: array
154-
x-kubernetes-list-type: atomic
155154
required:
156155
- key
157156
- operator
158157
type: object
159158
type: array
160-
x-kubernetes-list-type: atomic
161159
matchLabels:
162160
additionalProperties:
163161
type: string
@@ -307,13 +305,11 @@ spec:
307305
items:
308306
type: string
309307
type: array
310-
x-kubernetes-list-type: atomic
311308
required:
312309
- key
313310
- operator
314311
type: object
315312
type: array
316-
x-kubernetes-list-type: atomic
317313
matchLabels:
318314
additionalProperties:
319315
type: string
@@ -372,13 +368,11 @@ spec:
372368
items:
373369
type: string
374370
type: array
375-
x-kubernetes-list-type: atomic
376371
required:
377372
- key
378373
- operator
379374
type: object
380375
type: array
381-
x-kubernetes-list-type: atomic
382376
matchLabels:
383377
additionalProperties:
384378
type: string

‎go.mod‎

Lines changed: 117 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -5,103 +5,171 @@ go 1.23.0
55
toolchain go1.23.6
66

77
require (
8-
github.com/go-logr/logr v1.4.2
8+
github.com/go-logr/logr v1.4.1
99
github.com/google/uuid v1.6.0
1010
github.com/onsi/ginkgo/v2 v2.19.0
11-
github.com/onsi/gomega v1.33.1
12-
github.com/openshift/oadp-operator v1.0.2-0.20250813014433-d5a424bd6488
11+
github.com/onsi/gomega v1.34.1
12+
github.com/openshift/oadp-operator v1.0.2-0.20250913003306-ab5b96fecb7d
1313
github.com/sirupsen/logrus v1.9.3
1414
github.com/stretchr/testify v1.10.0
15-
github.com/vmware-tanzu/velero v1.16.0-rc.1
15+
github.com/vmware-tanzu/velero v1.14.1-rc.1
1616
go.uber.org/zap v1.27.0
17-
golang.org/x/sync v0.15.0
18-
k8s.io/api v0.31.3
19-
k8s.io/apimachinery v0.31.3
20-
k8s.io/client-go v0.31.3
21-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
22-
sigs.k8s.io/controller-runtime v0.19.3
17+
golang.org/x/sync v0.12.0
18+
k8s.io/api v0.29.2
19+
k8s.io/apimachinery v0.29.2
20+
k8s.io/client-go v0.29.0
21+
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
22+
sigs.k8s.io/controller-runtime v0.17.2
2323
)
2424

2525
require (
26+
cloud.google.com/go v0.112.1 // indirect
27+
cloud.google.com/go/compute/metadata v0.3.0 // indirect
28+
cloud.google.com/go/iam v1.1.7 // indirect
29+
cloud.google.com/go/storage v1.40.0 // indirect
30+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 // indirect
31+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.6.0 // indirect
32+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0 // indirect
33+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.5.0 // indirect
34+
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.2 // indirect
35+
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
2636
github.com/aws/aws-sdk-go v1.44.253 // indirect
27-
github.com/aws/aws-sdk-go-v2 v1.30.3 // indirect
37+
github.com/aws/aws-sdk-go-v2 v1.24.1 // indirect
2838
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.4 // indirect
2939
github.com/aws/aws-sdk-go-v2/config v1.26.3 // indirect
30-
github.com/aws/aws-sdk-go-v2/credentials v1.17.26 // indirect
31-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.11 // indirect
40+
github.com/aws/aws-sdk-go-v2/credentials v1.16.14 // indirect
41+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.11 // indirect
3242
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.11 // indirect
33-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.15 // indirect
34-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.15 // indirect
35-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
43+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10 // indirect
44+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10 // indirect
45+
github.com/aws/aws-sdk-go-v2/internal/ini v1.7.2 // indirect
3646
github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.10 // indirect
37-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.3 // indirect
47+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4 // indirect
3848
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.2.10 // indirect
39-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17 // indirect
49+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.10 // indirect
4050
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.10 // indirect
4151
github.com/aws/aws-sdk-go-v2/service/s3 v1.48.0 // indirect
42-
github.com/aws/aws-sdk-go-v2/service/sso v1.22.3 // indirect
43-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.4 // indirect
44-
github.com/aws/aws-sdk-go-v2/service/sts v1.30.3 // indirect
45-
github.com/aws/smithy-go v1.20.3 // indirect
52+
github.com/aws/aws-sdk-go-v2/service/sso v1.18.6 // indirect
53+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.6 // indirect
54+
github.com/aws/aws-sdk-go-v2/service/sts v1.26.7 // indirect
55+
github.com/aws/smithy-go v1.19.0 // indirect
4656
github.com/beorn7/perks v1.0.1 // indirect
47-
github.com/cespare/xxhash/v2 v2.3.0 // indirect
57+
github.com/bombsimon/logrusr/v3 v3.0.0 // indirect
58+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
59+
github.com/chmduquesne/rollinghash v4.0.0+incompatible // indirect
4860
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
61+
github.com/dustin/go-humanize v1.0.1 // indirect
62+
github.com/edsrzf/mmap-go v1.1.0 // indirect
4963
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
50-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
51-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
64+
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
65+
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
66+
github.com/fatih/color v1.16.0 // indirect
67+
github.com/felixge/httpsnoop v1.0.4 // indirect
68+
github.com/fsnotify/fsnotify v1.7.0 // indirect
69+
github.com/go-logr/stdr v1.2.2 // indirect
5270
github.com/go-logr/zapr v1.3.0 // indirect
71+
github.com/go-ole/go-ole v1.3.0 // indirect
5372
github.com/go-openapi/jsonpointer v0.19.6 // indirect
5473
github.com/go-openapi/jsonreference v0.20.2 // indirect
55-
github.com/go-openapi/swag v0.22.4 // indirect
74+
github.com/go-openapi/swag v0.22.3 // indirect
5675
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
76+
github.com/gobwas/glob v0.2.3 // indirect
77+
github.com/gofrs/flock v0.8.1 // indirect
5778
github.com/gogo/protobuf v1.3.2 // indirect
58-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
79+
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
80+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
5981
github.com/golang/protobuf v1.5.4 // indirect
6082
github.com/google/gnostic-models v0.6.8 // indirect
61-
github.com/google/go-cmp v0.6.0 // indirect
83+
github.com/google/go-cmp v0.7.0 // indirect
6284
github.com/google/gofuzz v1.2.0 // indirect
63-
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
85+
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
86+
github.com/google/s2a-go v0.1.7 // indirect
87+
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
88+
github.com/googleapis/gax-go/v2 v2.12.3 // indirect
89+
github.com/gorilla/websocket v1.5.0 // indirect
90+
github.com/hashicorp/cronexpr v1.1.2 // indirect
91+
github.com/hashicorp/go-hclog v1.2.0 // indirect
92+
github.com/hashicorp/go-plugin v1.6.0 // indirect
93+
github.com/hashicorp/yamux v0.1.1 // indirect
6494
github.com/imdario/mergo v0.3.13 // indirect
6595
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6696
github.com/jmespath/go-jmespath v0.4.0 // indirect
97+
github.com/joho/godotenv v1.3.0 // indirect
6798
github.com/josharian/intern v1.0.0 // indirect
6899
github.com/json-iterator/go v1.1.12 // indirect
69-
github.com/klauspost/compress v1.17.11 // indirect
100+
github.com/klauspost/compress v1.17.8 // indirect
101+
github.com/klauspost/cpuid/v2 v2.2.6 // indirect
102+
github.com/klauspost/pgzip v1.2.6 // indirect
103+
github.com/klauspost/reedsolomon v1.12.1 // indirect
104+
github.com/kopia/kopia v0.16.0 // indirect
70105
github.com/kubernetes-csi/external-snapshotter/client/v7 v7.0.0 // indirect
106+
github.com/kylelemons/godebug v1.1.0 // indirect
71107
github.com/mailru/easyjson v0.7.7 // indirect
108+
github.com/mattn/go-colorable v0.1.13 // indirect
109+
github.com/mattn/go-isatty v0.0.20 // indirect
110+
github.com/minio/md5-simd v1.1.2 // indirect
111+
github.com/minio/minio-go/v7 v7.0.69 // indirect
112+
github.com/minio/sha256-simd v1.0.1 // indirect
113+
github.com/mitchellh/go-testing-interface v1.0.0 // indirect
114+
github.com/moby/spdystream v0.2.0 // indirect
72115
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
73116
github.com/modern-go/reflect2 v1.0.2 // indirect
74117
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
118+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
119+
github.com/mxk/go-vss v1.2.0 // indirect
120+
github.com/natefinch/atomic v1.0.1 // indirect
121+
github.com/oklog/run v1.0.0 // indirect
122+
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
123+
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
75124
github.com/pkg/errors v0.9.1 // indirect
76-
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
77-
github.com/prometheus/client_golang v1.20.5 // indirect
125+
github.com/pmezard/go-difflib v1.0.0 // indirect
126+
github.com/prometheus/client_golang v1.19.0 // indirect
78127
github.com/prometheus/client_model v0.6.1 // indirect
79-
github.com/prometheus/common v0.62.0 // indirect
80-
github.com/prometheus/procfs v0.15.1 // indirect
81-
github.com/spf13/cobra v1.8.1 // indirect
128+
github.com/prometheus/common v0.52.3 // indirect
129+
github.com/prometheus/procfs v0.12.0 // indirect
130+
github.com/robfig/cron v1.1.0 // indirect
131+
github.com/rs/xid v1.5.0 // indirect
132+
github.com/spf13/cobra v1.7.0 // indirect
82133
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace // indirect
83-
github.com/x448/float16 v0.8.4 // indirect
134+
github.com/zeebo/blake3 v0.2.3 // indirect
135+
go.opencensus.io v0.24.0 // indirect
136+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
137+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
138+
go.opentelemetry.io/otel v1.25.0 // indirect
139+
go.opentelemetry.io/otel/metric v1.25.0 // indirect
140+
go.opentelemetry.io/otel/trace v1.25.0 // indirect
84141
go.uber.org/multierr v1.11.0 // indirect
85-
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
86-
golang.org/x/net v0.41.0 // indirect
142+
golang.org/x/crypto v0.36.0 // indirect
143+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
144+
golang.org/x/net v0.36.0 // indirect
87145
golang.org/x/oauth2 v0.27.0 // indirect
88-
golang.org/x/sys v0.33.0 // indirect
89-
golang.org/x/term v0.32.0 // indirect
90-
golang.org/x/text v0.26.0 // indirect
91-
golang.org/x/time v0.9.0 // indirect
92-
golang.org/x/tools v0.33.0 // indirect
146+
golang.org/x/sys v0.31.0 // indirect
147+
golang.org/x/term v0.30.0 // indirect
148+
golang.org/x/text v0.23.0 // indirect
149+
golang.org/x/time v0.5.0 // indirect
150+
golang.org/x/tools v0.26.0 // indirect
93151
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
94-
google.golang.org/protobuf v1.36.3 // indirect
95-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
152+
google.golang.org/api v0.172.0 // indirect
153+
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
154+
google.golang.org/genproto/googleapis/api v0.0.0-20240314234333-6e1732d8331c // indirect
155+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
156+
google.golang.org/grpc v1.63.2 // indirect
157+
google.golang.org/protobuf v1.34.1 // indirect
96158
gopkg.in/inf.v0 v0.9.1 // indirect
159+
gopkg.in/ini.v1 v1.67.0 // indirect
97160
gopkg.in/yaml.v2 v2.4.0 // indirect
98161
gopkg.in/yaml.v3 v3.0.1 // indirect
99-
k8s.io/apiextensions-apiserver v0.31.3 // indirect
100-
k8s.io/klog/v2 v2.130.1 // indirect
101-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
162+
k8s.io/apiextensions-apiserver v0.29.0 // indirect
163+
k8s.io/component-base v0.29.0 // indirect
164+
k8s.io/klog/v2 v2.120.1 // indirect
165+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
102166
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
103167
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
104168
sigs.k8s.io/yaml v1.4.0 // indirect
105169
)
106170

107-
replace github.com/vmware-tanzu/velero => github.com/openshift/velero v0.10.2-0.20250811140114-db545c8e2387
171+
replace github.com/vmware-tanzu/velero => github.com/openshift/velero v0.10.2-0.20250916194841-58873ca30add
172+
173+
replace github.com/openshift/oadp-operator => github.com/weshayutin/oadp-operator v0.0.0-20250917171019-6af3a5faca01
174+
175+
replace github.com/kopia/kopia => github.com/project-velero/kopia v0.0.0-20240417031915-e07d5b7de567

0 commit comments

Comments
 (0)