-
Notifications
You must be signed in to change notification settings - Fork 118
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
[RA2] Convert to rst #2733
[RA2] Convert to rst #2733
Conversation
CsatariGergely
commented
Nov 26, 2021
•
edited
Loading
edited
- Removal of raw HTML elements
- Removal of ToC
- Removal of bogometers
- Adding new line before and after lists
- Harmonizing buleted lists to use *
- Adding new line before and after headings
- Removal of raw HTML elements - Removal of ToC - Removal of bogometers - Adding new line before and after lists - Harmonizing buleted lists to use * - Adding new lie before and after headings Signed-off-by: Gergely Csatari <gergely.csatari@nokia.com>
@@ -36,17 +34,6 @@ This is Kubernetes based Reference Architecture (RA-2) | |||
| Chapter 07 | Lots of SME feedback | | |||
| Appendix B - Guidance For workload isolation (Multitenancy) with Kubernetes for application vendors | Still developing content | | |||
|
|||
## Table of Contents |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why delete these as these are easy traversal links for folks working in Github?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed in 3abd355
These changes have broken all of the links. For example, in section Cloud Infrastructure Software Profile Capabilities, the table has links in the last column labeled "Specification Reference". The reference "ra2.ch.011" has the link "chapter04.md#42-kubernetes-node" but 4.2 no longer exists and thus the link takes you to the top of chapter 4. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@CsatariGergely @pgoyal01 I agree with Pankaj. Without chapters and sections numbering, all the links are lost.
The documentation is difficult to read without the chapter's hierachy, there is a loss of guidance for github users.
@karinesevilla @pgoyal01 the intention of the documentation update is to leverage automation for things like header numbering, tables of contents etc. We also have to be conscious that we have 1 input format (currently GitHub-flavored-markdown, in the future maybe rst) and 2 output formats: docx for the GSMA document and html on read-the-docs. The rendering on GitHub is an additional output, yet it is not the output format of the release. Unfortunately, the markdown flavor on GitHub, which is typically used by many on a daily basis, does not allow for much automation. So, there is a tradeoff here between the ease of generating two release output formats and the development workflow on GitHub. Not sure if @CsatariGergely schedules another tech discuss meeting on this topic, but feel free to join and we'll discuss. |
@@ -38,30 +21,30 @@ To ensure alignment with the infrastructure profile catalogue, the following req | |||
- Those relating to Cloud Infrastructure Management | |||
- Those relating to Cloud Infrastructure Security | |||
|
|||
### 2.2.1 Cloud Infrastructure Software Profile Capabilities | |||
### Cloud Infrastructure Software Profile Capabilities | |||
|
|||
| Reference Model Section | Reference | Description | Requirement for Basic Profile | Requirement for High-Performance Profile| Specification Reference | | |||
|---|---|---|---|---|---| | |||
| [4.1.2](../../../ref_model/chapters/chapter04.md#412-exposed-infrastructure-capabilities) | e.cap.001 | Max number of vCPU that can be assigned to a single Pod by the Cloud Infrastructure | At least 16 | At least 16 | [ra2.ch.011](chapter04.md#42-kubernetes-node)| |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
does changing the links like so fix them? I think we may fix the link with a regex if so
| [4.1.2](../../../ref_model/chapters/chapter04.md#412-exposed-infrastructure-capabilities) | e.cap.001 | Max number of vCPU that can be assigned to a single Pod by the Cloud Infrastructure | At least 16 | At least 16 | [ra2.ch.011](chapter04.md#42-kubernetes-node)| | |
| [4.1.2](../../../ref_model/chapters/chapter04.md#412-exposed-infrastructure-capabilities) | e.cap.001 | Max number of vCPU that can be assigned to a single Pod by the Cloud Infrastructure | At least 16 | At least 16 | [ra2.ch.011](chapter04.md#kubernetes-node)| |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@karinesevilla @pgoyal01 the intention of the documentation update is to leverage automation for things like header numbering, tables of contents etc. We also have to be conscious that we have 1 input format (currently GitHub-flavored-markdown, in the future maybe rst) and 2 output formats: docx for the GSMA document and html on read-the-docs. The rendering on GitHub is an additional output, yet it is not the output format of the release. Unfortunately, the markdown flavor on GitHub, which is typically used by many on a daily basis, does not allow for much automation.
So, there is a tradeoff here between the ease of generating two release output formats and the development workflow on GitHub. Not sure if @CsatariGergely schedules another tech discuss meeting on this topic, but feel free to join and we'll discuss.
Sure, I've put it to next weeks meeting agenda.
@gkunz @CsatariGergely I got it. I understod that there is no other alternative. For the reference links, we will have to remove the numbering manually to keep them active. I agree with markdown cleaning |
Signed-off-by: Gergely Csatari <gergely.csatari@nokia.com>
Signed-off-by: Gergely Csatari <gergely.csatari@nokia.com>
Signed-off-by: Gergely Csatari <gergely.csatari@nokia.com>
I plan to do the whole rst conversion in this pr. |
Ok then it's too early to review :) |
Signed-off-by: Gergely Csatari <gergely.csatari@nokia.com>
Signed-off-by: Gergely Csatari <gergely.csatari@nokia.com>
Introduction | ||
------------ | ||
|
||
The intention of this Reference Architecture is to develop a usable Kubernetes based platform for the Telecom operator community. The RA will be based on the standard Kubernetes platform where ever possible. This Reference Architecture for Kubernetes will describe the high level system components and their interactions, taking the `goals and requirements <../../../common/chapter00.md>`__ and mapping them to real-world Kubernetes (and related) components. This document needs to be sufficiently detailed and robust such that it can be used to guide the production deployment of Kubernetes within an operator, whilst being flexible enough to evolve with and remain aligned with the wider Kubernetes ecosystem outside of Telco. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all references to CNTT md documents should be changed to rst else changes made in rst files going forward wouldn't be refelcted in the links
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
At the moment we use a Sphinx plugin to blindly change all ".md"-s to ".html"-s in the relative links. Becouse of this all links are automagically working, however this is a bit of hacking of how rst works. I started to correct this and then realized that with :doc:
directives the # anchors do not work, so the only way to refer correctly to chapters is to use :ref:
-s what would require a manual annotating of all headings. Somehow I feel that at least for the beginning we should just keep using the relative-link-corrector for the existing links and start using proper rst linking for new text. Gradually we can start replacing all ".md" links with proper ones later. @pgoyal01 , @collivier , @gkunz , @karinesevilla what do you think?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@CsatariGergely That would be fine but if edit the referenced equivalent rst file then we would need to change references to the md version everywhere else we would be pointing to outdated content. That can be error-prone.
It may be worth dividing up the work amongst us -- assign Issues (the WSLs can do that) -- to go and add :ref:
-s to each section header. We need to use a standard format and use only the text - no number. Wherever a reference uses a # should be changed to one with corresponding text.
Other Ideas?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Somehow I also have a feeling that manual labels are the most optimal on the long run, but I would like to get the conversion pr-s get merged before we start addressing them.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Cross-posting from another thread: In the RI1 and RI2 conversions, I have been using the :ref: directive in conjunction with the autosectionlabel extension to automatically create header references:
For intra-references using implicit header references, see https://github.com/cntt-n/CNTT/pull/2777/files#diff-774fcc11722dce98d0347ce9870d8c0959a06c61223d2ee4a1cc4516db7211b5R64
You have to use the autosectionlabel extention (see https://github.com/cntt-n/CNTT/pull/2777/files#diff-e59005d178179a798a25d32c0f18a66b77b4cd290462ac82d5594c23fb0ee0d6R15)
See also these options: https://github.com/cntt-n/CNTT/pull/2777/files#diff-e59005d178179a798a25d32c0f18a66b77b4cd290462ac82d5594c23fb0ee0d6R62 to avoid clashes of header references across files.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the references. I've tried the approach, but for some reason it is not working for me. I would propose to merge the big rst conversion pr-s and fix smaller issues in different pr-s. Smaller issues so far are:
- Consistent mechanism for referencing sections (preferably with :ref: and autosectionlabel)
- Support for top level and document level builds
@walterkozlowski can you review, approve and merge? |
I don't own |
- Conversion of abbreviations are undone - Creation of index.rst for RA1 and RA2 undone - Removal of README.md undone Signed-off-by: Gergely Csatari <gergely.csatari@nokia.com>
@rgstori I've undone the changes to |