Skip to content

Conversation

@codyhoag codyhoag added this to the Next Release milestone Apr 6, 2021
@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Apr 6, 2021
@netlify
Copy link

netlify bot commented Apr 6, 2021

Deploy preview for osdocs ready!

Built with commit ee37f23

https://deploy-preview-31268--osdocs.netlify.app

@codyhoag
Copy link
Contributor Author

codyhoag commented Apr 6, 2021

@jinyunma PTAL

@jinyunma
Copy link

jinyunma commented Apr 7, 2021

In section About installations in restricted networks, the IMPORTANT part mainly describes the UPI installation while this is IPI installation doc, it's better to be removed here, WDYT?

@jinyunma
Copy link

jinyunma commented Apr 7, 2021

I found that in Installing a cluster on VMC in a restricted network with user-provisioned infrastructure, it also describes Configuring the cluster-wide proxy during installation, which also supports in IPI installation in a restricted network. It's better to be added in this doc.

@codyhoag
Copy link
Contributor Author

@jinyunma I have addressed your feedback. Can you take a second look? Thanks!

@jinyunma
Copy link

@codyhoag, LGTM for update. I have one more question, when reviewing doc Installing a cluster on vSphere in a restricted network, I didn't notice this part, sorry for this. Could you also help to update that doc if possible?

@codyhoag codyhoag force-pushed the vmc-ipi-restricted-network branch from 96525fa to ee37f23 Compare April 13, 2021 15:32
@codyhoag
Copy link
Contributor Author

@jinyunma sure thing! Just added that proxy config section to vSphere IPI restricted networks sections to make them uniform. Thanks!

@codyhoag codyhoag added the peer-review-needed Signifies that the peer review team needs to review this PR label Apr 13, 2021
@ahardin-rh ahardin-rh added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Apr 13, 2021
@ahardin-rh
Copy link
Contributor

@codyhoag LGTM! Nicely done. 🚀

@codyhoag codyhoag merged commit 7d11ea2 into openshift:master Apr 13, 2021
@codyhoag
Copy link
Contributor Author

/cherrypick enterprise-4.8

@codyhoag
Copy link
Contributor Author

/cherrypick enterprise-4.7

@codyhoag
Copy link
Contributor Author

/cherrypick enterprise-4.6

@openshift-cherrypick-robot

@codyhoag: new pull request created: #31532

Details

In response to this:

/cherrypick enterprise-4.8

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.

@openshift-cherrypick-robot

@codyhoag: new pull request created: #31533

Details

In response to this:

/cherrypick enterprise-4.7

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.

@openshift-cherrypick-robot

@codyhoag: #31268 failed to apply on top of branch "enterprise-4.6":

Applying: OSDOCS-2014 Installing VMC IPI into restricted network
Using index info to reconstruct a base tree...
M	_topic_map.yml
A	installing/installing-preparing.adoc
M	modules/cli-installing-cli.adoc
M	modules/cluster-entitlements.adoc
M	modules/installation-about-restricted-network.adoc
M	modules/installation-configuration-parameters.adoc
M	modules/installation-initializing.adoc
M	modules/installation-vsphere-infrastructure.adoc
M	modules/ssh-agent-using.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/ssh-agent-using.adoc
Auto-merging modules/installation-vsphere-infrastructure.adoc
Auto-merging modules/installation-initializing.adoc
Auto-merging modules/installation-configuration-parameters.adoc
Auto-merging modules/installation-about-restricted-network.adoc
Auto-merging modules/cluster-entitlements.adoc
CONFLICT (content): Merge conflict in modules/cluster-entitlements.adoc
Auto-merging modules/cli-installing-cli.adoc
CONFLICT (modify/delete): installing/installing-preparing.adoc deleted in HEAD and modified in OSDOCS-2014 Installing VMC IPI into restricted network. Version OSDOCS-2014 Installing VMC IPI into restricted network of installing/installing-preparing.adoc left in tree.
Auto-merging _topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OSDOCS-2014 Installing VMC IPI into restricted network
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".

Details

In response to this:

/cherrypick enterprise-4.6

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

Labels

branch/enterprise-4.6 branch/enterprise-4.7 branch/enterprise-4.8 peer-review-done Signifies that the peer review team has reviewed this PR size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants