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

Update for 1.20 and 1.23 scans #209

Open
wants to merge 3 commits into
base: main
Choose a base branch
from

Conversation

mitulshah-suse
Copy link

Related to #34

Copy link
Contributor

@btat btat left a comment

Choose a reason for hiding this comment

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

The sidebar.js file at the root needs to be updated as well to account for the page additions, removals, and rename(s) . I can't make suggestions or comment on it since it's not part of the PR so I added a commit for the sidebar.js file.

It also looks like PDFs haven't been uploaded yet. Could you please link the tickets where that's being tracked so we can keep an eye on that.

@mitulshah-suse
Copy link
Author

Issue for PDFs upload
https://github.com/rancherlabs/eio/issues/1319

@btat btat changed the title udpate for 1.20 and 1.23 scans Update for 1.20 and 1.23 scans Sep 20, 2022
@btat
Copy link
Contributor

btat commented Sep 20, 2022

LGTM (docs perspective). Will merge once the PDFs are uploaded and QA has reviewed.

@btat
Copy link
Contributor

btat commented Sep 22, 2022

Hi @prachidamle, who would be the QA contact to review this?

@macedogm
Copy link
Member

macedogm commented Sep 23, 2022

Besides QA, these changes also need to be reviewed by security.

@btat can you please assign me as a reviewer? I can't do that myself.

@prachidamle
Copy link
Member

@bmdepesa Could you assign this to someone in QA for reviewing the CIS doc changes, as requested above by @btat

Copy link

@ronhorton ronhorton left a comment

Choose a reason for hiding this comment

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

https://releases.rancher.com/documents/security/2.6/Rancher_RKE2_v2-6_CIS_v1-23_Hardening_Guide.pdf leads to an xml error page -

NoSuchKey
The specified key does not exist.

Copy link

@ronhorton ronhorton left a comment

Choose a reason for hiding this comment

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

missing link not uploaded as of test

@prachidamle
Copy link
Member

@btat @mitulshah-suse I think the hardening and self-assessment guide should be linked to docs links internally - why do we need to upload them separately?

@mitulshah-suse
Copy link
Author

@btat @mitulshah-suse I think the hardening and self-assessment guide should be linked to docs links internally - why do we need to upload them separately?

The internal links are already in place. Not sure why they are uploaded as well to be honest. I just followed the steps from an older ticket to raise the upload issue.

@btat
Copy link
Contributor

btat commented Sep 30, 2022

@btat @mitulshah-suse I think the hardening and self-assessment guide should be linked to docs links internally - why do we need to upload them separately?

The internal links are already in place. Not sure why they are uploaded as well to be honest. I just followed the steps from an older ticket to raise the upload issue.

Like Mitul, I'm just following the existing process. I dug back and found https://github.com/rancher/docs/issues/1157, which would suggest the PDFs existed before the Markdown version was added to the docs site. Perhaps the PDFs are distributed directly through other means outside of the docs? @catherineluse do you have any background knowledge on this?

@catherineluse
Copy link
Contributor

@btat Yes, Nelson generated the hardening guides in PDF format. I don't know where the source code or script is for that. Maybe Lucas knows.

@macedogm
Copy link
Member

macedogm commented Oct 5, 2022

@catherineluse @btat the scripts used to convert the scans from JSON to Markdown and the Markdown pages to PDF are available in https://github.com/rancher/docs/tree/master/scripts/converters. I took over Nelson's work with the hardening guides since we updated them to 2.6. After some thinking and while creating the K3s hardening guide for GA - rancher/rancher#37493, I would actually recommend to stop generating the PDFs. As the pages grew bigger and bigger and with some small changes in formatting after the migration to Docusaurus, I see that sometimes the PDFs doesn't look great and require changes in the format. I'm not even sure if the PDFs are adding any real value to the users (at least that I'm aware of). Perhaps it's better to stop generating until customers ask for it (in case they even do). Not sure if we need to get someone from Product for this decision.

@macedogm
Copy link
Member

macedogm commented Oct 5, 2022

FYI I haven't had time to review the updated guides and how they will be structured inside the security section. I plan to do this as soon as I finish some priority work for 2.6 and 2.7.

@btat
Copy link
Contributor

btat commented Dec 5, 2022

@macedogm could you please review this when you have a chance.

@macedogm
Copy link
Member

macedogm commented Mar 7, 2023

@btat based on #453 and #478, I believe that we can close this PR as superseded.

@btat
Copy link
Contributor

btat commented Mar 7, 2023

@btat based on #453 and #478, I believe that we can close this PR as superseded.

@macedogm since the tests in this PR are for Rancher 2.6, aren't they still applicable to the 2.6 docs?

@macedogm
Copy link
Member

macedogm commented Mar 8, 2023

@btat based on #453 and #478, I believe that we can close this PR as superseded.

@macedogm since the tests in this PR are for Rancher 2.6, aren't they still applicable to the 2.6 docs?

You are right. This is scoped to 2.6. It's still relevant.

@macedogm
Copy link
Member

macedogm commented Jul 4, 2023

Reassigning this PR to @andypitcher who is taking the lead with the hardening guides and CIS.

Andy, if you need any support, please let me know. Thanks!

@macedogm macedogm requested review from andypitcher and removed request for macedogm July 4, 2023 14:16
| Kubernetes v1.18 up to v1.23 | CIS v1.6 | [Link](../reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke1-self-assessment-guide-with-cis-v1.6-benchmark.md) | [Link](../reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke1-hardening-guide-with-cis-v1.6-benchmark.md) |
| Kubernetes v1.18 | CIS v1.6 | [Link](../reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke1-self-assessment-guide-with-cis-v1.6-benchmark.md) | [Link](../reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke1-hardening-guide-with-cis-v1.6-benchmark.md) |
| Kubernetes v1.19 up to v1.21 | CIS v1.20 | [Link](../reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke1-self-assessment-guide-with-cis-v1.20-benchmark.md) | [Link](../reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke1-hardening-guide-with-cis-v1.20-benchmark.md) |
| Kubernetes v1.22 up to v1.24 | CIS v1.23 | [Link](../reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke1-self-assessment-guide-with-cis-v1.23-benchmark.md) | [Link](../reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke1-hardening-guide-with-cis-v1.23-benchmark.md) |
Copy link
Contributor

Choose a reason for hiding this comment

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

With the dev of CIS-1.24 (k8s v1.24) and CIS-1.7 (k8s v1.25), I suggest to update L36 to have CIS-1.23 covering up to k8s v1.23:

- Kubernetes v1.22 up to v1.24
+ Kubernetes v1.22 up to v1.23

Copy link
Contributor

@andypitcher andypitcher left a comment

Choose a reason for hiding this comment

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

LGTM, we will update this page when CIS-1.24 and CIS-1.7 docs will be achieved.

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.

None yet

7 participants