Skip to content

Commit e9f691b

Browse files
jparrillclaude
jparrill
and
claude
committed
fix(deps): update velero replace to track oadp-1.5 branch
The go.mod replace directive for Velero was pointing to a stale pseudo-version (commit 8fbcf3a8da11, 2025-05-14). Update it to track the oadp-1.5 branch of openshift/velero (commit 1b8c9c4464d0, 2026-03-17) which picks up CVE fixes and bug fixes while maintaining API compatibility. Also bumps Go directive to 1.25.8. Fixes: OCPBUGS-80948 Ref: https://redhat.atlassian.net/browse/OCPBUGS-80948 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Signed-off-by: Juan Manuel Parrilla Madrid <jparrill@redhat.com>
2 parents 941041b + d9fb0a6 commit e9f691b

84 files changed

Lines changed: 8679 additions & 51364 deletions

File tree

Some content is hidden

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

‎go.mod‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
module github.com/openshift/hypershift-oadp-plugin
22

3-
go 1.24.4
3+
go 1.25.8
44

55
require (
66
github.com/kubernetes-csi/external-snapshotter/client/v8 v8.2.0
77
github.com/onsi/gomega v1.38.2
88
github.com/openshift/hive/apis v0.0.0-20241220022629-3f49f26197ff
9-
github.com/openshift/hypershift/api v0.0.0-20260302164434-7af765d8054e
9+
github.com/openshift/hypershift/api v0.0.0-20260306152921-2bfe1933d8a1
1010
github.com/sirupsen/logrus v1.9.3
1111
github.com/vmware-tanzu/velero v1.14.0
1212
k8s.io/api v0.34.2
@@ -35,7 +35,7 @@ require (
3535
github.com/x448/float16 v0.8.4 // indirect
3636
go.yaml.in/yaml/v2 v2.4.2 // indirect
3737
go.yaml.in/yaml/v3 v3.0.4 // indirect
38-
golang.org/x/sync v0.18.0 // indirect
38+
golang.org/x/sync v0.20.0 // indirect
3939
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
4040
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
4141
sigs.k8s.io/randfill v1.0.0 // indirect
@@ -70,11 +70,11 @@ require (
7070
github.com/pkg/errors v0.9.1 // indirect
7171
github.com/spf13/cobra v1.9.1 // indirect
7272
github.com/spf13/pflag v1.0.7 // indirect
73-
golang.org/x/net v0.47.0 // indirect
73+
golang.org/x/net v0.52.0 // indirect
7474
golang.org/x/oauth2 v0.30.0 // indirect
75-
golang.org/x/sys v0.38.0 // indirect
76-
golang.org/x/term v0.37.0 // indirect
77-
golang.org/x/text v0.31.0 // indirect
75+
golang.org/x/sys v0.42.0 // indirect
76+
golang.org/x/term v0.41.0 // indirect
77+
golang.org/x/text v0.35.0 // indirect
7878
golang.org/x/time v0.11.0 // indirect
7979
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
8080
google.golang.org/grpc v1.72.1 // indirect
@@ -85,9 +85,9 @@ require (
8585
k8s.io/client-go v0.34.2
8686
k8s.io/klog/v2 v2.130.1 // indirect
8787
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
88-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
88+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
8989
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
9090
sigs.k8s.io/yaml v1.6.0 // indirect
9191
)
9292

93-
replace github.com/vmware-tanzu/velero => github.com/openshift/velero v0.10.2-0.20250514165055-8fbcf3a8da11
93+
replace github.com/vmware-tanzu/velero => github.com/openshift/velero v0.10.2-0.20260317163839-1b8c9c4464d0

‎go.sum‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -210,10 +210,10 @@ github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87
210210
github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87/go.mod h1:DB/Mf2oTeiAmVVX1gN+NEqweonAPY0TKUwADizj8+ZA=
211211
github.com/openshift/hive/apis v0.0.0-20241220022629-3f49f26197ff h1:6C1z4xMAruyeiTFGqahxNDpI1cXPCjpaFeIeIodty08=
212212
github.com/openshift/hive/apis v0.0.0-20241220022629-3f49f26197ff/go.mod h1:1vBNCcWNpQyFCz83PWYT/lHUFJ9ost2t5FijHElh6gQ=
213-
github.com/openshift/hypershift/api v0.0.0-20260302164434-7af765d8054e h1:X9X/xevArJm5z+7ByKPgyVNid3CU/LMj6Ih4AToQdGA=
214-
github.com/openshift/hypershift/api v0.0.0-20260302164434-7af765d8054e/go.mod h1:dN8V9JjUjvvJaF3SJFSkb5p2H3CkjwcFDMlABEkQyuU=
215-
github.com/openshift/velero v0.10.2-0.20250514165055-8fbcf3a8da11 h1:/BjkW8HljIX96clCuv/V+PzShD3coVcNilCXd/Axlfo=
216-
github.com/openshift/velero v0.10.2-0.20250514165055-8fbcf3a8da11/go.mod h1:+wInt9pLqlRiUZAWsO5eSxLZK9Q3jSV9MFaUrBfvGN0=
213+
github.com/openshift/hypershift/api v0.0.0-20260306152921-2bfe1933d8a1 h1:by2K4v8VEWRv+uPLA6hpAhM9h6RMKwJ7tOQxe1vpcYQ=
214+
github.com/openshift/hypershift/api v0.0.0-20260306152921-2bfe1933d8a1/go.mod h1:dN8V9JjUjvvJaF3SJFSkb5p2H3CkjwcFDMlABEkQyuU=
215+
github.com/openshift/velero v0.10.2-0.20260317163839-1b8c9c4464d0 h1:LB229KJL01aMA3mzRQoNHVFCsdlb3FHCOuAnRE9venk=
216+
github.com/openshift/velero v0.10.2-0.20260317163839-1b8c9c4464d0/go.mod h1:KEpTfFgye9RJEXdq5BpYS2e07GEQiI/8IBKpnQp1X54=
217217
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
218218
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
219219
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -293,8 +293,8 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
293293
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
294294
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
295295
golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
296-
golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
297-
golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
296+
golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
297+
golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
298298
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
299299
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
300300
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -313,8 +313,8 @@ golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qx
313313
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
314314
golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
315315
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
316-
golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
317-
golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
316+
golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0=
317+
golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw=
318318
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
319319
golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
320320
golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
@@ -324,8 +324,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
324324
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
325325
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
326326
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
327-
golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
328-
golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
327+
golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
328+
golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
329329
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
330330
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
331331
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -353,20 +353,20 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc
353353
golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
354354
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
355355
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
356-
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
357-
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
356+
golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
357+
golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
358358
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
359359
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
360-
golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
361-
golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
360+
golang.org/x/term v0.41.0 h1:QCgPso/Q3RTJx2Th4bDLqML4W6iJiaXFq2/ftQF13YU=
361+
golang.org/x/term v0.41.0/go.mod h1:3pfBgksrReYfZ5lvYM0kSO0LIkAl4Yl2bXOkKP7Ec2A=
362362
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
363363
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
364364
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
365365
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
366366
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
367367
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
368-
golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
369-
golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
368+
golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
369+
golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
370370
golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
371371
golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
372372
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -382,8 +382,8 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f
382382
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
383383
golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff/go.mod h1:YD9qOF0M9xpSpdWTBbzEl5e/RnCefISl8E5Noe10jFM=
384384
golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
385-
golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
386-
golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
385+
golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k=
386+
golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0=
387387
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
388388
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
389389
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎pkg/common/types.go‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package common
22

3-
import "time"
4-
53
const (
6-
CAPIPausedAnnotationName string = "cluster.x-k8s.io/paused"
74
CommonBackupAnnotationName string = "hypershift.openshift.io/common-backup-plugin"
85
CommonRestoreAnnotationName string = "hypershift.openshift.io/common-restore-plugin"
96
FSBackupLabelName string = "hypershift.openshift.io/fsbackup"
@@ -14,23 +11,12 @@ const (
1411

1512
PluginConfigMapName string = "hypershift-oadp-plugin-config"
1613

17-
// Default values for the backup plugin.
18-
defaultPVBackupTimeout time.Duration = 30 * time.Minute
19-
defaultPVBackupCheckPace time.Duration = 10 * time.Second
20-
defaultWaitForPausedTimeout time.Duration = 2 * time.Minute
21-
defaultWaitForTimeout time.Duration = 5 * time.Minute
22-
2314
DefaultK8sSAFilePath string = "/var/run/secrets/kubernetes.io/serviceaccount"
2415
KubevirtRHCOSLabel string = "hypershift.openshift.io/is-kubevirt-rhcos"
2516

2617
// Integration with Hypershift, more info here: https://github.com/openshift/hypershift/pull/6195
2718
HostedClusterRestoredFromBackupAnnotation string = "hypershift.openshift.io/restored-from-backup"
2819

29-
// OADP Plugin audit annotations for pause operations
30-
OADPPausedByAnnotation string = "oadp.openshift.io/paused-by"
31-
OADPPausedAtAnnotation string = "oadp.openshift.io/paused-at"
32-
HypershiftOADPPluginName string = "hypershift-oadp-plugin"
33-
3420
// hypershift/cluster-api kinds
3521
HostedClusterKind string = "HostedCluster"
3622
HostedControlPlaneKind string = "HostedControlPlane"

0 commit comments

Comments
 (0)