openshift / openshift-velero-plugin

General Velero plugin for backup and restore of openshift workloads.
Apache License 2.0
48 stars 38 forks source link

[oadp-1.2] OADP-1075 Add annotation to exclude build pod volumes during backup #189

Closed openshift-cherrypick-robot closed 1 year ago

openshift-cherrypick-robot commented 1 year ago

This is an automated cherry-pick of #171

/assign kaovilai

openshift-ci[bot] commented 1 year ago

@openshift-cherrypick-robot: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
kaovilai commented 1 year ago

one more lgtm from someone else please :D

openshift-ci[bot] commented 1 year ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kaovilai, openshift-cherrypick-robot, sseago

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files: - ~~[OWNERS](https://github.com/openshift/openshift-velero-plugin/blob/oadp-1.2/OWNERS)~~ [kaovilai,sseago] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
kaovilai commented 1 year ago

/cherry-pick oadp-1.1

openshift-cherrypick-robot commented 1 year ago

@kaovilai: #189 failed to apply on top of branch "oadp-1.1":

Applying: Add annotation to exclude build pod volumes during backup
.git/rebase-apply/patch:423: trailing whitespace.
    buildPod = corev1API.Pod{   
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M   go.mod
M   go.sum
M   velero-plugins/main.go
Falling back to patching base and 3-way merge...
Auto-merging velero-plugins/main.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add annotation to exclude build pod volumes during backup
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
In response to [this](https://github.com/openshift/openshift-velero-plugin/pull/189#issuecomment-1505972275): >/cherry-pick oadp-1.1 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.