Skip to content

[4.3] BZ-1775210: Mention to have the proxy env variables set for DR proced…#21185

Merged
bergerhoffer merged 1 commit intoopenshift:enterprise-4.3from
bergerhoffer:BZ-1775210-43
May 4, 2020
Merged

[4.3] BZ-1775210: Mention to have the proxy env variables set for DR proced…#21185
bergerhoffer merged 1 commit intoopenshift:enterprise-4.3from
bergerhoffer:BZ-1775210-43

Conversation

@bergerhoffer
Copy link
Copy Markdown
Contributor

@bergerhoffer bergerhoffer commented Apr 15, 2020

…ures

Transferred from #18705 so that that PR can be used to update 4.4+, as the procedures changed.

Preview: http://file.rdu.redhat.com/~ahoffer/2020/BZ-1775210-43/backup_and_restore/backing-up-etcd.html (internal)

@bergerhoffer bergerhoffer changed the title BZ-1775210: Mention to have the proxy env variables set for DR proced… [4.3] BZ-1775210: Mention to have the proxy env variables set for DR proced… Apr 15, 2020
@bergerhoffer
Copy link
Copy Markdown
Contributor Author

@geliu2016 This is the new PR for 4.3/4.2, if you can give it a quick double check that it's okay.

@geliu2016
Copy link
Copy Markdown

LGTM, thanks

@bergerhoffer bergerhoffer merged commit 854308f into openshift:enterprise-4.3 May 4, 2020
@bergerhoffer
Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.3

@openshift-cherrypick-robot
Copy link
Copy Markdown

@bergerhoffer: base branch (enterprise-4.3) needs to differ from target branch (enterprise-4.3)

Details

In response to this:

/cherrypick enterprise-4.3

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.

@bergerhoffer
Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.2

@openshift-cherrypick-robot
Copy link
Copy Markdown

@bergerhoffer: #21185 failed to apply on top of branch "enterprise-4.2":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	modules/backup-etcd.adoc
M	modules/dr-recover-lost-control-plane-hosts.adoc
M	modules/dr-restoring-cluster-state.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/dr-restoring-cluster-state.adoc
CONFLICT (content): Merge conflict in modules/dr-restoring-cluster-state.adoc
Auto-merging modules/dr-recover-lost-control-plane-hosts.adoc
CONFLICT (content): Merge conflict in modules/dr-recover-lost-control-plane-hosts.adoc
Auto-merging modules/backup-etcd.adoc
CONFLICT (content): Merge conflict in modules/backup-etcd.adoc
Patch failed at 0001 BZ-1775210: Mention to have the proxy env variables set for DR procedures

Details

In response to this:

/cherrypick enterprise-4.2

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants