Skip to content
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

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

Conversation

openshift-cherrypick-robot

This is an automated cherry-pick of #171

/assign kaovilai

Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>

comment typo imagestreams -> pods

go mod updates

formatting and nil annotations handling

Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Apr 12, 2023
@kaovilai kaovilai added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. and removed approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. labels Apr 12, 2023
@openshift-ci
Copy link

openshift-ci bot commented Apr 12, 2023

@openshift-cherrypick-robot: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@kaovilai
Copy link
Member

one more lgtm from someone else please :D

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 12, 2023
@openshift-ci
Copy link

openshift-ci bot commented Apr 12, 2023

[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:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kaovilai kaovilai added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Apr 12, 2023
@openshift-merge-robot openshift-merge-robot merged commit f6249d1 into openshift:oadp-1.2 Apr 12, 2023
4 checks passed
@kaovilai
Copy link
Member

/cherry-pick oadp-1.1

@openshift-cherrypick-robot
Copy link
Author

@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:

/cherry-pick oadp-1.1

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

kaovilai added a commit to kaovilai/openshift-velero-plugin that referenced this pull request Apr 12, 2023
)

comment typo imagestreams -> pods

go mod updates

formatting and nil annotations handling

from cherry-pick of 1.2, switch back from pkg/podvolume to pkg/restic

Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
Co-authored-by: Tiger Kaovilai <tkaovila@redhat.com>
Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
openshift-merge-robot pushed a commit that referenced this pull request Apr 13, 2023
comment typo imagestreams -> pods

go mod updates

formatting and nil annotations handling

from cherry-pick of 1.2, switch back from pkg/podvolume to pkg/restic

Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
Co-authored-by: OpenShift Cherrypick Robot <openshift-cherrypick-robot@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants