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

[virt] Adding CNV docs to OKD #37215

Merged
merged 1 commit into from Oct 12, 2021
Merged

[virt] Adding CNV docs to OKD #37215

merged 1 commit into from Oct 12, 2021

Conversation

ousleyp
Copy link
Member

@ousleyp ousleyp commented Oct 7, 2021

  • This PR adds the CNV docs to the openshift-origin distro and changes the top-level ToC label to "Virtualization" to avoid "OpenShift" appearing in OKD (or vice versa). Similarly, the "Installing OpenShift Virtualization" ToC label is now "Installing" (which matches OpenShift).

  • There is now an ifdef statement in the virt-document-attributes file so that {VirtProductName} renders as "OKD Virtualization" in the openshift-origin distro.

  • Most changes originate from this PR by @sandrobonazzola: OKD: Add Virtualization documentation #36612

  • CP to enterprise-4.9

  • QE approved; needs peer review

  • Note: Netlify does not do an openshift-origin preview build. You can view the changes pertaining to openshift-enterprise here. I uploaded a preview build for the OKD changes, which you can view here: http://file.rdu.redhat.com/pousley/101221/okd-virt-docs/welcome/

@ousleyp ousleyp added CNV Label for all CNV PRs branch/enterprise-4.9 labels Oct 7, 2021
@ousleyp ousleyp added this to the Future Release milestone Oct 7, 2021
@openshift-ci openshift-ci bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 7, 2021
@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 7, 2021
@netlify
Copy link

netlify bot commented Oct 7, 2021

✔️ Deploy Preview for osdocs ready!

🔨 Explore the source changes: 323e10b97cf71169e1e9191374a14e95a62a1c0a

🔍 Inspect the deploy log: https://app.netlify.com/sites/osdocs/deploys/615f3d340c6f2600082ec17a

😎 Browse the preview: https://deploy-preview-37215--osdocs.netlify.app

@netlify
Copy link

netlify bot commented Oct 7, 2021

✔️ Deploy Preview for osdocs ready!

🔨 Explore the source changes: 97ffc1ef6e084646563a914885dfa947a53d1710

🔍 Inspect the deploy log: https://app.netlify.com/sites/osdocs/deploys/615f3d54f36def000814b498

😎 Browse the preview: https://deploy-preview-37215--osdocs.netlify.app

@netlify
Copy link

netlify bot commented Oct 7, 2021

✔️ Deploy Preview for osdocs ready!

🔨 Explore the source changes: cd0c22e

🔍 Inspect the deploy log: https://app.netlify.com/sites/osdocs/deploys/615f4011569b180008647510

😎 Browse the preview: https://deploy-preview-37215--osdocs.netlify.app

Copy link
Contributor

@sandrobonazzola sandrobonazzola left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 8, 2021
@sandrobonazzola sandrobonazzola removed their assignment Oct 8, 2021
_topic_map.yml Show resolved Hide resolved
@ILpinto
Copy link

ILpinto commented Oct 12, 2021

/lgtm

@openshift-ci
Copy link

openshift-ci bot commented Oct 12, 2021

@ILpinto: changing LGTM is restricted to collaborators

In response to this:

/lgtm

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.

Copy link
Contributor

@sjhala-ccs sjhala-ccs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thanks for taking this on, Pan!

@sjhala-ccs sjhala-ccs added the peer-review-done Signifies that the peer review team has reviewed this PR label Oct 12, 2021
@ousleyp ousleyp merged commit 667147b into openshift:main Oct 12, 2021
@ousleyp
Copy link
Member Author

ousleyp commented Oct 12, 2021

/cherrypick enterprise-4.9

@openshift-cherrypick-robot

@ousleyp: #37215 failed to apply on top of branch "enterprise-4.9":

Applying: adding CNV docs to OKD
Using index info to reconstruct a base tree...
M	_topic_map.yml
A	virt/virt-4-8-release-notes.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): virt/virt-4-8-release-notes.adoc deleted in HEAD and modified in adding CNV docs to OKD. Version adding CNV docs to OKD of virt/virt-4-8-release-notes.adoc left in tree.
Auto-merging _topic_map.yml
CONFLICT (content): Merge conflict in _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 adding CNV docs to OKD
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:

/cherrypick enterprise-4.9

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.9 CNV Label for all CNV PRs lgtm Indicates that a PR is ready to be merged. peer-review-done Signifies that the peer review team has reviewed this PR size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants