From 0602aba2d95a99735861da7926c7f5b08f81337f Mon Sep 17 00:00:00 2001 From: oadp-team-rebase-bot Date: Tue, 28 Jul 2026 15:32:30 +0000 Subject: [PATCH] UPSTREAM: : Updating go modules --- go.mod | 6 ++++-- go.sum | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index f29c5991..783897fb 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/sirupsen/logrus v1.9.4 github.com/stretchr/testify v1.11.1 github.com/vmware-tanzu/velero v1.18.1 - github.com/vmware-tanzu/velero/pkg/apis v0.0.0-20260713215154-c825e3c136bc + github.com/vmware-tanzu/velero/pkg/apis v0.0.0 k8s.io/api v0.36.0 k8s.io/apimachinery v0.36.0 k8s.io/client-go v0.36.0 @@ -157,6 +157,8 @@ require ( ) // Use same velero fork as the controller for compatibility -replace github.com/vmware-tanzu/velero => github.com/openshift/velero v0.10.2-0.20260716151240-e2178e7e7c29 +replace github.com/vmware-tanzu/velero => github.com/openshift/velero v0.10.2-0.20260723224224-37c17dda0586 exclude github.com/kcp-dev/kcp/sdk v0.0.0-00010101000000-000000000000 + +replace github.com/vmware-tanzu/velero/pkg/apis => github.com/openshift/velero/pkg/apis v0.0.0-20260723224224-37c17dda0586 diff --git a/go.sum b/go.sum index ebafe366..874ccd41 100644 --- a/go.sum +++ b/go.sum @@ -330,8 +330,10 @@ github.com/onsi/gomega v1.40.0 h1:Vtol0e1MghCD2ZVIilPDIg44XSL9l2QAn8ZNaljWcJc= github.com/onsi/gomega v1.40.0/go.mod h1:M/Uqpu/8qTjtzCLUA2zJHX9Iilrau25x1PdoSRbWh5A= github.com/openshift/custom-resource-status v1.1.2 h1:C3DL44LEbvlbItfd8mT5jWrqPfHnSOQoQf/sypqA6A4= github.com/openshift/custom-resource-status v1.1.2/go.mod h1:DB/Mf2oTeiAmVVX1gN+NEqweonAPY0TKUwADizj8+ZA= -github.com/openshift/velero v0.10.2-0.20260716151240-e2178e7e7c29 h1:csf6KeWbu01yvHl7aLjf3l0jnAmRyP+w3MveiorYnz8= -github.com/openshift/velero v0.10.2-0.20260716151240-e2178e7e7c29/go.mod h1:1CKuSsX9EmPmtkIGpjkAC4hVJ22gOCu7kdwYMjEeyOI= +github.com/openshift/velero v0.10.2-0.20260723224224-37c17dda0586 h1:WhKX4Mu6R9rMiA0+aWPLZ7c+0u3yRtz7ptGrQwAFses= +github.com/openshift/velero v0.10.2-0.20260723224224-37c17dda0586/go.mod h1:v0uPqPhsCaBvT3ObdH07qaHRnG3bE1D8fEaAWlUtWs4= +github.com/openshift/velero/pkg/apis v0.0.0-20260723224224-37c17dda0586 h1:ssCsdf304MdlFUsq21KEa/FTCjwX4xlqEe/S05DG/VY= +github.com/openshift/velero/pkg/apis v0.0.0-20260723224224-37c17dda0586/go.mod h1:zxtjtSupjpT6oOO48gvFhOpTl3SOAkCwuGG7BOxN3Fk= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= @@ -379,8 +381,6 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= -github.com/vmware-tanzu/velero/pkg/apis v0.0.0-20260713215154-c825e3c136bc h1:JwFvio/oC9GFNnTDf5w/Xp7dOh4iMAEQIqCaKMjv49k= -github.com/vmware-tanzu/velero/pkg/apis v0.0.0-20260713215154-c825e3c136bc/go.mod h1:zxtjtSupjpT6oOO48gvFhOpTl3SOAkCwuGG7BOxN3Fk= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=