From 84d47c61649c6e6ee4978f30ee45a6b5b3bcca4f Mon Sep 17 00:00:00 2001 From: oadp-team-rebase-bot Date: Thu, 9 Oct 2025 15:22:45 +0000 Subject: [PATCH 1/2] UPSTREAM: : Updating go modules --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 188b70bcd0..4d74897c95 100644 --- a/go.mod +++ b/go.mod @@ -196,4 +196,4 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect ) -replace github.com/kopia/kopia => github.com/project-velero/kopia v0.0.0-20250227051353-20bfabbfc7a0 +replace github.com/kopia/kopia => github.com/migtools/kopia v0.0.0-20250227051353-20bfabbfc7a0 diff --git a/go.sum b/go.sum index d4194cf2e5..e4a26d5e49 100644 --- a/go.sum +++ b/go.sum @@ -529,6 +529,8 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/migtools/kopia v0.0.0-20250227051353-20bfabbfc7a0 h1:M+uk+JoJ9Rk+2e47PkxrPxIZ/z/jDnPUeHGroVJJVgs= +github.com/migtools/kopia v0.0.0-20250227051353-20bfabbfc7a0/go.mod h1:/HYpuL787Xbqz9zjo9WcPKbPBVKvfLQlB9Qnr8AQXn0= github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= github.com/minio/minio-go/v7 v7.0.84 h1:D1HVmAF8JF8Bpi6IU4V9vIEj+8pc+xU88EWMs2yed0E= @@ -607,8 +609,6 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/project-velero/kopia v0.0.0-20250227051353-20bfabbfc7a0 h1:yrFIqNlajYzR0pmHPWUNqBg4qg2GMnj7tvZXNjdPdYI= -github.com/project-velero/kopia v0.0.0-20250227051353-20bfabbfc7a0/go.mod h1:/HYpuL787Xbqz9zjo9WcPKbPBVKvfLQlB9Qnr8AQXn0= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y= From f0d9048a89675f9bcce272638e038707b5f1a0c9 Mon Sep 17 00:00:00 2001 From: oadp-team-rebase-bot Date: Thu, 9 Oct 2025 15:22:48 +0000 Subject: [PATCH 2/2] UPSTREAM: : update restic @ 80230f042 (branch oadp-1.5) --- .gitmodules | 4 ++++ restic | 1 + 2 files changed, 5 insertions(+) create mode 100644 .gitmodules create mode 160000 restic diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..56d60e626d --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "restic"] + path = restic + url = https://github.com/openshift/restic + branch = oadp-1.5 diff --git a/restic b/restic new file mode 160000 index 0000000000..80230f042e --- /dev/null +++ b/restic @@ -0,0 +1 @@ +Subproject commit 80230f042eed06f1f388f6c1b366ab41f130bae1