forked from vmware-tanzu/velero
-
Notifications
You must be signed in to change notification settings - Fork 19
Rebase bot - oadp-1.5 branch against v1.16.2 tag #431
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.
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
Merged
openshift-merge-bot
merged 69 commits into
openshift:oadp-1.5
from
mpryc:rebase-bot-oadp-dev
Aug 7, 2025
Merged
Changes from all commits
Commits
Show all changes
69 commits
Select commit
Hold shift + click to select a range
a8ce0fe
Add BSL status check for backup/restore operations.
blackpiglet 8aeb8a2
Merge pull request #9010 from blackpiglet/7785_1.16
ywk253100 3415f39
Bump golang to v1.23.10 to fix CVEs for 1.16.2 release (#9058)
theadarshsaxena 6709a8a
Allow for proper tracking of multiple hooks per container
sseago 1017d7a
Merge pull request #9060 from sseago/multiple-hook-tracking-1.16
ywk253100 043005c
Mounted cloud credentials should not be world-readable (#8919) (#9094)
sseago fd9f3fe
issue 9077: don't block backup deletion on list VS error (#9101)
Lyndon-Li 8f51c1c
Fix missing defaultVolumesToFsBackup flag output in Velero describe b…
shubham-pampattiwar 78fd58f
Update Backup describe string for DefaultVolumesToFSBackup flag (#9105)
shubham-pampattiwar 8adfd8d
Merge pull request #9103 from shubham-pampattiwar/fix-backup-desc-cp
shubham-pampattiwar 0fc7e2f
Add imagePullSecrets inheritance for VGDP pod and maintenance job. (#…
blackpiglet 189a5b2
Bump Golang, Ubuntu, and golang.org/x/oauth2 to fix CVEs. (#9104)
blackpiglet cc2dc02
1.16.2 changelog
Lyndon-Li 5ae1cae
Merge pull request #9107 from Lyndon-Li/release-1.16
Lyndon-Li befd9d4
Bump the Velero and plugin image versions for the upgrade and migrati…
blackpiglet a608082
Merge pull request #9108 from blackpiglet/bump_e2e_upgrade_versions
Lyndon-Li de680f5
merge upstream/v1.16.2 into oadp-1.5
mpryc ac16f2d
skip subresource in resource discovery (#6688)
reasonerjt da44c69
fix issue 6753
Lyndon-Li ecd22cb
Update restore controller logic for restore deletion (#6761)
ywk253100 72008b9
Fix #6752: add namespace exclude check.
cea3d13
add csi snapshot data movement doc
Lyndon-Li b60e3fb
Modify changelogs for v1.12
allenxu404 a38910e
issue 6786:always delete VSC regardless of the deletion policy
Lyndon-Li fa5e5d6
issue: move plugin depdending podvolume functions to util pkg
Lyndon-Li 01789ac
issue 6880: set ParallelUploadAboveSize as MaxInt64
Lyndon-Li 83d294a
changelog
kaovilai fcf9feb
Add support for block volumes (#6680) (#6897)
dzaninovic 268f7e0
Replace the base image with paketobuildpacks image
ywk253100 9ca86d2
issue 6734: spread backup pod evenly
Lyndon-Li 214dc8a
Add doc links for new features to release note
allenxu404 5f39337
fix issue 6647
Lyndon-Li 0ae3686
Perf improvements for existing resource restore
sseago f0d43e5
issue #6807: Retry failed create when using generateName
sseago c7422bd
Import auth provider plugins
0x113 030b444
Add v1.12.1 changelog
allenxu404 f3b4775
Make Windows build skip BlockMode code.
4cba16d
udmrepo use region specified in BSL when s3URL is empty
Lyndon-Li 1bdbec9
Change v1.12.1 changelog
allenxu404 85b8a14
Dockerfile.ubi/travis local files
dymurray d28d20c
Add BZ + Publish automation to repo (#82)
rayfordj 96e34d9
remove dependabot config from fork
sseago 8f3f709
Create Makefile.prow
kaovilai a854a78
set HOME in velero image for kopia, update controller-gen for CI (#280)
sseago d6c016d
build velero-helper binary for datamover pod
sseago 202af92
restore: Use warning when Create IsAlreadyExist and Get error
kaovilai ba3b41c
kopia/repository/config/aws.go: Set session.Options profile from config
kaovilai fd318ec
use ubi9-latest to build
sseago 8f54455
OADP-4225: add tzdata to Dockerfile.ubi
sseago 1c16168
fix: CI (#316)
343bb79
fix: ARM images (#332)
8ba5a4a
ubi: BUILDPLATFORM to build stage to enable cross compile. (#336)
kaovilai f77cb6a
OADP-4640: Downstream only to allow override kopia default algorithms…
mpryc 106051f
Downstream only: Rework of Makefile and incusion of lint
mpryc 469a1b7
Downstream only - fix lint error in downtream change (#343)
mpryc d3af272
run oadp-operator e2e test from the velero repo (#353)
weshayutin 20d5de1
DS Owners
kaovilai d2c7792
updated controller-gen version
sseago b184fdf
Include velero-restore-helper binary in velero image (#375)
openshift-cherrypick-robot 38eef1d
OADP-5952: downstream only, update error message disableFsBackup (#380)
weshayutin db7022a
Summary of Changes: (#381)
openshift-cherrypick-robot 9edfd8b
Prep for Konflux (#385)
rayfordj a7797b3
Red Hat Konflux update oadp-velero-oadp-1-5 (#386)
red-hat-konflux[bot] 997ab31
Konflux: multiarch, tags, labels (#402)
rayfordj 5b29bec
Red Hat Konflux update oadp-velero-oadp-1-5 (#411)
red-hat-konflux[bot] 3ae8d9b
chore(deps): update konflux references (#394)
red-hat-konflux[bot] d1b51ea
chore(deps): update konflux references (#413)
red-hat-konflux[bot] f448175
add velero release to the velero container tags (#424)
weshayutin 511856b
oadp-1.5: Update Konflux references (#430)
rayfordj File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,7 +13,7 @@ | |
| # limitations under the License. | ||
|
|
||
| # Velero binary build section | ||
| FROM --platform=$BUILDPLATFORM golang:1.23.8-bookworm AS velero-builder | ||
| FROM --platform=$BUILDPLATFORM golang:1.23.11-bookworm AS velero-builder | ||
|
|
||
| ARG GOPROXY | ||
| ARG BIN | ||
|
|
@@ -49,7 +49,7 @@ RUN mkdir -p /output/usr/bin && \ | |
| go clean -modcache -cache | ||
|
|
||
| # Restic binary build section | ||
| FROM --platform=$BUILDPLATFORM golang:1.23.8-bookworm AS restic-builder | ||
| FROM --platform=$BUILDPLATFORM golang:1.23.11-bookworm AS restic-builder | ||
|
|
||
| ARG GOPROXY | ||
| ARG BIN | ||
|
|
@@ -73,7 +73,7 @@ RUN mkdir -p /output/usr/bin && \ | |
| go clean -modcache -cache | ||
|
|
||
| # Velero image packing section | ||
| FROM paketobuildpacks/run-jammy-tiny:0.2.60 | ||
| FROM paketobuildpacks/run-jammy-tiny:0.2.73 | ||
|
|
||
| LABEL maintainer="Xun Jiang <[email protected]>" | ||
|
|
||
|
|
@@ -82,4 +82,3 @@ COPY --from=velero-builder /output / | |
| COPY --from=restic-builder /output / | ||
|
|
||
| USER cnb:cnb | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We need to create a separate PR against openshift/restic to manually make the go.mod change for oauth2