Commit Graph
7779 Commits
Author SHA1 Message Date
Billy Tat 0eaaeef9bc Reapply PR #788 2023-09-28 10:49:18 -07:00
Billy Tat e8497d1aae Merge pull request #888 from rancher/2023-Q3-v2.7x
Merge 2023-Q3-v2.7x into main
2023-09-28 10:15:38 -07:00
Billy Tat 8c09aef620 Merge pull request #890 from btat/pr-880-to-2.7
Apply PR #880 to version-2.7 docs
2023-09-28 09:50:19 -07:00
Billy Tat e11996173b Apply PR #880 to version-2.7 docs - [Backport 2.7] Add cattle-cluster-agent trace/debug logs 2023-09-28 09:48:53 -07:00
Felipe Colussi-olivaandMarty Hernandez Avedon fcda4e87d9 [Backport 2.7] Add cattle-cluster-agent trace/debug logs (#880)
* add cattle-cluster-agent trace/debug logs

* Update docs/troubleshooting/other-troubleshooting-tips/logging.md

Co-authored-by: Marty Hernandez Avedon <marty.avedon@suse.com>

* Update docs/troubleshooting/other-troubleshooting-tips/logging.md

Co-authored-by: Marty Hernandez Avedon <marty.avedon@suse.com>

* Update docs/troubleshooting/other-troubleshooting-tips/logging.md

Co-authored-by: Marty Hernandez Avedon <marty.avedon@suse.com>

* Update docs/troubleshooting/other-troubleshooting-tips/logging.md

Co-authored-by: Marty Hernandez Avedon <marty.avedon@suse.com>

---------

Co-authored-by: Marty Hernandez Avedon <marty.avedon@suse.com>
2023-09-28 12:45:50 -04:00
Billy Tat 79cd5aeaae Merge pull request #889 from btat/merge-main-to-2023-Q3-v2.7x
Merge main to 2023 q3 v2.7x
2023-09-27 16:49:27 -07:00
Billy Tat be59182664 Merge branch 'main' into merge-main-to-2023-Q3-v2.7x 2023-09-27 16:47:54 -07:00
Billy Tat 53abb61642 Merge pull request #887 from btat/versions-table
Add 2.7.7 entry to versions table
2023-09-27 16:33:00 -07:00
Billy Tat e0c164322b Add 2.7.7 entry to versions table 2023-09-27 16:32:29 -07:00
Billy Tat 892f92b40e Merge pull request #886 from btat/revert-erroneous-merge
Revert erroneous merges
2023-09-27 16:13:13 -07:00
Billy Tat 5eb3b2876f Revert "Merge branch 'main' into main-to-2023-Q3-v2.7x"
This reverts commit 45aa5bb9bd, reversing
changes made to 5380fffa27.
2023-09-27 15:42:04 -07:00
Billy Tat f967061cd4 Revert "Merge pull request #884 from btat/main-to-2023-Q3-v2.7x"
This reverts commit 03d60e2851, reversing
changes made to bcfcf6f62c.
2023-09-27 15:41:42 -07:00
Billy Tat 03d60e2851 Merge pull request #884 from btat/main-to-2023-Q3-v2.7x
Merge main to 2023-Q3-v2.7x
2023-09-27 15:31:17 -07:00
Billy Tat 45aa5bb9bd Merge branch 'main' into main-to-2023-Q3-v2.7x 2023-09-27 14:48:50 -07:00
Billy Tat bcfcf6f62c Merge pull request #809 from btat/cleanup-extra-dirs
Clean up unused directories/files
2023-09-27 13:33:24 -07:00
Marty Hernandez Avedon c7c9caa3e6 fixed broken link syntax: #[...].md > .md# (#872) 2023-09-22 17:34:01 -04:00
Marty Hernandez Avedon 38959f4ba9 #420 Canonical links for hardening guides (#870)
* canonicized k3s hardening guides

* canonicized rke1 hardening guides

* canonicized rke2 hardening guides
2023-09-22 16:40:03 -04:00
Marty Hernandez Avedon 0baf42a3e9 canonicized reference-guides/prometheus + /rancher-manager-architecture (#869) 2023-09-22 16:18:55 -04:00
Andy Pitcher 82226c2444 Merge pull request #852 from andypitcher/rke2-self-assessment-guide-with-cis-1.7
[cis-1.7] update rke2-self-assessment-guide
2023-09-21 08:56:19 -04:00
Guilherme Macedo 2afc007d46 Rebase and fix redirects for RKE2 hardening guides
Signed-off-by: Guilherme Macedo <guilherme@gmacedo.com>
2023-09-20 23:54:03 -03:00
Guilherme Macedo d26718df00 Rebase
Signed-off-by: Guilherme Macedo <guilherme@gmacedo.com>
2023-09-20 23:52:00 -03:00
Andy Pitcher 47773f06fe Rebase and add cis-1.7 k8s v1.26/v1.27 to RKE2 rancher-hardening-guides 2023-09-20 23:50:18 -03:00
Andy Pitcher 250171d9e4 Rebase and modify cis-1.7 page to include 1.26/1.27 2023-09-20 23:48:07 -03:00
Andy Pitcher 61ff71e235 Remove leading backslash 2023-09-20 23:37:08 -03:00
Andy Pitcher 15606d6db1 Escape <txt> values with backslash
Avoids markdown compilation issues
2023-09-20 23:37:08 -03:00
Andy Pitcher 40cd732265 Update rke2-self-assessment-guide-with-cis-v1.7 2023-09-20 23:37:08 -03:00
Andy Pitcher d532ef0ded Merge pull request #853 from andypitcher/rke1-self-assessment-guide-with-cis-1.7
[cis-1.7] update rke1-self-assessment-guide
2023-09-20 17:29:20 -04:00
Andy Pitcher 81464c73d6 Merge branch 'main' into rke1-self-assessment-guide-with-cis-1.7 2023-09-20 17:28:57 -04:00
Andy Pitcher 92fb7cea60 Merge pull request #861 from andypitcher/k3s-self-assessment-guide-with-cis-1.24
[cis-1.24] update k3s-self-assessment-guide
2023-09-20 16:50:45 -04:00
Andy Pitcher d7d3074e8f remove comma for k3s cis sidebar 2023-09-20 16:26:43 -04:00
Andy Pitcher 35f27f4130 Merge branch 'main' into k3s-self-assessment-guide-with-cis-1.24 2023-09-20 16:24:04 -04:00
Andy Pitcher 00c18c19cd Merge pull request #860 from andypitcher/rke2-self-assessment-guide-with-cis-1.24
[cis-1.24] update rke2-self-assessment-guide
2023-09-20 15:33:55 -04:00
Andy Pitcher 1c2b3f3cce Merge pull request #854 from andypitcher/k3s-self-assessment-guide-with-cis-1.7
[cis-1.7] update k3s-self-assessment-guide
2023-09-20 15:33:40 -04:00
Andy Pitcher da2c4a0f17 Merge pull request #856 from andypitcher/rke1-self-assessment-guide-with-cis-1.24
[cis-1.24] update rke1-self-assessment-guide
2023-09-20 15:31:32 -04:00
Andreas Lindhé 50ccc06da9 Remove blank newline in tables (#868)
This fixes a typo introduced in #865 (07da386179).
2023-09-20 12:41:01 -04:00
Guilherme Macedo a6369a0484 updates
Signed-off-by: Guilherme Macedo <guilherme@gmacedo.com>
2023-09-20 13:39:51 -03:00
Guilherme Macedo 484a832dff Update k3s-self-assessment-guide-with-cis-v1.24
Signed-off-by: Guilherme Macedo <guilherme@gmacedo.com>
2023-09-20 13:25:51 -03:00
Guilherme Macedo 685241022e updates
Signed-off-by: Guilherme Macedo <guilherme@gmacedo.com>
2023-09-20 13:18:43 -03:00
Andy Pitcher efe1d88afd Update sidebar for rke2 cis-1.24 2023-09-20 13:18:43 -03:00
Andy Pitcher f7e17a5885 Update rke2-self-assessment-guide-with-cis-v1.24 2023-09-20 13:18:43 -03:00
Andy Pitcher 67221fdd03 Add cis-1.27 to v2.7 (docusaurus, version-2.7) 2023-09-20 11:05:19 -04:00
Andy Pitcher aa8b1b8969 Add cis-1.27 to v2.7 (docusaurus, version-2.7) 2023-09-20 10:51:30 -04:00
Billy Tat 3dcb680c48 Merge pull request #866 from btat/image-display
Fix image not rendering
2023-09-19 15:27:00 -07:00
Marty Hernandez Avedon 07da386179 #845, #855 edit and rm helm chart values that are not yet available (#865)
* rm values that are not yet available

* applying changes to versioned docs
2023-09-19 16:57:18 -04:00
Billy Tat 1ffefb0c10 Fix image not rendering 2023-09-19 13:55:35 -07:00
Andy Pitcher 0fd25bbd39 Add cis-1.7 k8s v1.26/v1.27 to K3s rancher-hardening-guides 2023-09-19 15:00:34 -04:00
Andy Pitcher 4519cffa32 Modify cis-1.7 page to include 1.26/1.27 2023-09-19 14:27:25 -04:00
Andy Pitcher 1bc4dd2ff7 Modify cis-1.7 page to include 1.26/1.27 2023-09-19 14:17:20 -04:00
Marty Hernandez Avedon cf0e7a280d correcting double / in canonical urls (#863) 2023-09-19 12:54:40 -04:00
martyav 5380fffa27 merge conflict resolved 2023-09-19 12:42:52 -04:00