search

openshift / openshift-velero-plugin

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

OADP-1075 Dynamically build pod volume exclude annotation for BuildConfig pods #192

Closed kaovilai closed 1 year ago

kaovilai commented 1 year ago

container-storage-run volume was missed last time. https://github.com/openshift/openshift-controller-manager/blob/release-4.13/pkg/build/controller/strategy/util.go#L496

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

kaovilai commented 1 year ago

/cherry-pick oadp-1.2 for OADP-1075

openshift-cherrypick-robot commented 1 year ago

@kaovilai: once the present PR merges, I will cherry-pick it on top of oadp-1.2 in a new PR and assign it to you.

In response to [this](https://github.com/openshift/openshift-velero-plugin/pull/192#issuecomment-1523834642): >/cherry-pick oadp-1.2 >for [OADP-1075](https://issues.redhat.com//browse/OADP-1075) 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.
kaovilai commented 1 year ago

/cherry-pick oadp-1.1 for OADP-1650

openshift-cherrypick-robot commented 1 year ago

@kaovilai: once the present PR merges, I will cherry-pick it on top of oadp-1.1 in a new PR and assign it to you.

In response to [this](https://github.com/openshift/openshift-velero-plugin/pull/192#issuecomment-1523835035): >/cherry-pick oadp-1.1 >for [OADP-1650](https://issues.redhat.com//browse/OADP-1650) 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.
kaovilai commented 1 year ago

/cc @shubham-pampattiwar @weshayutin

openshift-ci[bot] commented 1 year ago

@kaovilai: 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).
openshift-ci[bot] commented 1 year ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kaovilai, 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/master/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
openshift-cherrypick-robot commented 1 year ago

@kaovilai: new pull request created: #193

In response to [this](https://github.com/openshift/openshift-velero-plugin/pull/192#issuecomment-1523834642): >/cherry-pick oadp-1.2 >for [OADP-1075](https://issues.redhat.com//browse/OADP-1075) 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.
openshift-cherrypick-robot commented 1 year ago

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

Applying: OADP-1075 Dynamic build pod volume exclude annotation
Using index info to reconstruct a base tree...
M   velero-plugins/pod/backup.go
M   velero-plugins/pod/backup_test.go
Falling back to patching base and 3-way merge...
Auto-merging velero-plugins/pod/backup_test.go
CONFLICT (content): Merge conflict in velero-plugins/pod/backup_test.go
Auto-merging velero-plugins/pod/backup.go
CONFLICT (content): Merge conflict in velero-plugins/pod/backup.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OADP-1075 Dynamic build pod volume exclude annotation
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/192#issuecomment-1523835035): >/cherry-pick oadp-1.1 >for [OADP-1650](https://issues.redhat.com//browse/OADP-1650) 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.