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-3038 imagestream: region auto discovery #223

Closed kaovilai closed 4 months ago

kaovilai commented 8 months ago

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

error update PR: https://github.com/openshift/oadp-operator/pull/1214

kaovilai commented 8 months ago

/cherry-pick oadp-1.1

openshift-cherrypick-robot commented 8 months 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/223#issuecomment-1792576128): >/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.
kaovilai commented 8 months ago

/cherry-pick oadp-1.2

openshift-cherrypick-robot commented 8 months 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/223#issuecomment-1792576218): >/cherry-pick oadp-1.2 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-ci[bot] commented 8 months 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).
kaovilai commented 5 months ago

/cherry-pick oadp-1.3

openshift-cherrypick-robot commented 5 months ago

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

In response to [this](https://github.com/openshift/openshift-velero-plugin/pull/223#issuecomment-1915409957): >/cherry-pick oadp-1.3 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 4 months ago

/unhold

openshift-ci[bot] commented 4 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kaovilai, mateusoliveira43, shubham-pampattiwar, weshayutin

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,shubham-pampattiwar] 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 4 months ago

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

Applying: imagestream: region auto discovery
.git/rebase-apply/patch:215: space before tab in indent.
            name: "openshift-velero-plugin-s3-auto-region-test-1",
.git/rebase-apply/patch:221: space before tab in indent.
            name: "openshift-velero-plugin-s3-auto-region-test-2",
.git/rebase-apply/patch:227: space before tab in indent.
            name: "openshift-velero-plugin-s3-auto-region-test-3",
.git/rebase-apply/patch:233: space before tab in indent.
            name: "openshift-velero-plugin-s3-auto-region-test-4",
warning: 4 lines add whitespace errors.
Using index info to reconstruct a base tree...
M   go.mod
M   velero-plugins/imagestream/registry.go
M   velero-plugins/imagestream/registry_test.go
Falling back to patching base and 3-way merge...
Auto-merging velero-plugins/imagestream/registry_test.go
CONFLICT (content): Merge conflict in velero-plugins/imagestream/registry_test.go
Auto-merging velero-plugins/imagestream/registry.go
CONFLICT (content): Merge conflict in velero-plugins/imagestream/registry.go
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 imagestream: region auto discovery
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/223#issuecomment-1792576128): >/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.
openshift-cherrypick-robot commented 4 months ago

@kaovilai: #223 failed to apply on top of branch "oadp-1.2":

Applying: imagestream: region auto discovery
.git/rebase-apply/patch:215: space before tab in indent.
            name: "openshift-velero-plugin-s3-auto-region-test-1",
.git/rebase-apply/patch:221: space before tab in indent.
            name: "openshift-velero-plugin-s3-auto-region-test-2",
.git/rebase-apply/patch:227: space before tab in indent.
            name: "openshift-velero-plugin-s3-auto-region-test-3",
.git/rebase-apply/patch:233: space before tab in indent.
            name: "openshift-velero-plugin-s3-auto-region-test-4",
warning: 4 lines add whitespace errors.
Using index info to reconstruct a base tree...
M   go.mod
M   velero-plugins/imagestream/registry.go
M   velero-plugins/imagestream/registry_test.go
Falling back to patching base and 3-way merge...
Auto-merging velero-plugins/imagestream/registry_test.go
Auto-merging velero-plugins/imagestream/registry.go
CONFLICT (content): Merge conflict in velero-plugins/imagestream/registry.go
Auto-merging 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 imagestream: region auto discovery
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/223#issuecomment-1792576218): >/cherry-pick oadp-1.2 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 4 months ago

@kaovilai: new pull request created: #225

In response to [this](https://github.com/openshift/openshift-velero-plugin/pull/223#issuecomment-1915409957): >/cherry-pick oadp-1.3 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.