Skip to content

Merge https://github.com/openshift/hypershift-oadp-plugin:main (fd95e11) into main #298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oadp-rebasebot-app wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Merge https://github.com/openshift/hypershift-oadp-plugin:main (fd95e11) into main #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/openshift/hypershift/api v0.0.0-20260524140149-6d994e441608
github.com/sirupsen/logrus v1.9.4
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/apiextensions-apiserver v0.36.0
sigs.k8s.io/controller-runtime v0.24.0
Expand Down Expand Up @@ -111,6 +111,8 @@ require (
sigs.k8s.io/yaml v1.6.0 // indirect
)

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.20260805134104-2091b09b93bb

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-20260805134104-2091b09b93bb
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,10 @@ github.com/openshift/hypershift/api v0.0.0-20260524140149-6d994e441608 h1:JxJ4x3
github.com/openshift/hypershift/api v0.0.0-20260524140149-6d994e441608/go.mod h1:ix5Gp7mQxUFIYQWrlC1o/FpXKl2oJVWOHI9UZb0hOUw=
github.com/openshift/installer v1.4.22-ec5 h1:NG9X2iZG5mbUVZIBhpMtMrGNK7Tbm9dDGAI6aXh/QZc=
github.com/openshift/installer v1.4.22-ec5/go.mod h1:PbGvWlLRbmmSsaTQBAjhXPzliz9XJAYUdXcY0t/3UiY=
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.20260805134104-2091b09b93bb h1:FmyNqhhtdJ2vgIT6XZmIwcs9RHHKS1RuBWqI/S3nkis=
github.com/openshift/velero v0.10.2-0.20260805134104-2091b09b93bb/go.mod h1:v0uPqPhsCaBvT3ObdH07qaHRnG3bE1D8fEaAWlUtWs4=
github.com/openshift/velero/pkg/apis v0.0.0-20260805134104-2091b09b93bb h1:Wezb2zsAX8R0op1YLU0cMO78hA6ZiED4PYXMZZoadDo=
github.com/openshift/velero/pkg/apis v0.0.0-20260805134104-2091b09b93bb/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/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
Expand Down Expand Up @@ -205,8 +207,6 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
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=
Expand Down
44 changes: 44 additions & 0 deletions vendor/github.com/vmware-tanzu/velero/internal/resourcepolicies/resource_policies.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 19 additions & 1 deletion ...or/github.com/vmware-tanzu/velero/internal/resourcepolicies/volume_resources_validator.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/vmware-tanzu/velero/pkg/apis/velero/v1/backup_repository_types.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions vendor/github.com/vmware-tanzu/velero/pkg/apis/velero/v1/backup_types.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions vendor/github.com/vmware-tanzu/velero/pkg/apis/velero/v1/delete_backup_request_types.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions vendor/github.com/vmware-tanzu/velero/pkg/apis/velero/v1/download_request_types.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions vendor/github.com/vmware-tanzu/velero/pkg/apis/velero/v1/pod_volume_backup_types.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions vendor/github.com/vmware-tanzu/velero/pkg/apis/velero/v1/pod_volume_restore_type.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions vendor/github.com/vmware-tanzu/velero/pkg/apis/velero/v1/restore_types.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions vendor/github.com/vmware-tanzu/velero/pkg/apis/velero/v1/schedule_types.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions vendor/github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1/data_download_types.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions vendor/github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1/data_upload_types.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 43 additions & 0 deletions vendor/github.com/vmware-tanzu/velero/pkg/util/datamover/datamover.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ github.com/spf13/cobra
# github.com/spf13/pflag v1.0.10
## explicit; go 1.12
github.com/spf13/pflag
# github.com/vmware-tanzu/velero v1.18.1 => github.com/openshift/velero v0.10.2-0.20260716151240-e2178e7e7c29
# github.com/vmware-tanzu/velero v1.18.1 => github.com/openshift/velero v0.10.2-0.20260805134104-2091b09b93bb
## explicit; go 1.26.0
github.com/vmware-tanzu/velero/internal/credentials
github.com/vmware-tanzu/velero/internal/resourcepolicies
Expand Down Expand Up @@ -390,13 +390,14 @@ github.com/vmware-tanzu/velero/pkg/types
github.com/vmware-tanzu/velero/pkg/uploader
github.com/vmware-tanzu/velero/pkg/util/boolptr
github.com/vmware-tanzu/velero/pkg/util/collections
github.com/vmware-tanzu/velero/pkg/util/datamover
github.com/vmware-tanzu/velero/pkg/util/filesystem
github.com/vmware-tanzu/velero/pkg/util/kube
github.com/vmware-tanzu/velero/pkg/util/logging
github.com/vmware-tanzu/velero/pkg/util/results
github.com/vmware-tanzu/velero/pkg/util/wildcard
github.com/vmware-tanzu/velero/third_party/kubernetes/pkg/kubectl/cmd/util
# github.com/vmware-tanzu/velero/pkg/apis v0.0.0-20260713215154-c825e3c136bc
# github.com/vmware-tanzu/velero/pkg/apis v0.0.0 => github.com/openshift/velero/pkg/apis v0.0.0-20260805134104-2091b09b93bb
## explicit; go 1.26.0
github.com/vmware-tanzu/velero/pkg/apis/velero/shared
github.com/vmware-tanzu/velero/pkg/apis/velero/v1
Expand Down Expand Up @@ -1099,4 +1100,5 @@ sigs.k8s.io/structured-merge-diff/v6/value
# sigs.k8s.io/yaml v1.6.0
## explicit; go 1.22
sigs.k8s.io/yaml
# github.com/vmware-tanzu/velero => github.com/openshift/velero v0.10.2-0.20260716151240-e2178e7e7c29
# github.com/vmware-tanzu/velero => github.com/openshift/velero v0.10.2-0.20260805134104-2091b09b93bb
# github.com/vmware-tanzu/velero/pkg/apis => github.com/openshift/velero/pkg/apis v0.0.0-20260805134104-2091b09b93bb