From 4fc59cf47cf934fadb628dc4c6922a55dcb3fc44 Mon Sep 17 00:00:00 2001 From: Jennifer Travinski Date: Mon, 4 Oct 2021 14:36:35 -0400 Subject: [PATCH 1/3] Changed lvl 2 to lvl 3 subheaders for page consistency --- content/k3s/latest/en/advanced/_index.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/k3s/latest/en/advanced/_index.md b/content/k3s/latest/en/advanced/_index.md index b2da9136bbd..ac4f88ed7c9 100644 --- a/content/k3s/latest/en/advanced/_index.md +++ b/content/k3s/latest/en/advanced/_index.md @@ -344,7 +344,7 @@ sudo reboot Standard Raspbian Buster installations do not start with `cgroups` enabled. **K3S** needs `cgroups` to start the systemd service. `cgroups`can be enabled by appending `cgroup_memory=1 cgroup_enable=memory` to `/boot/cmdline.txt`. -## example of /boot/cmdline.txt +### example of /boot/cmdline.txt ``` console=serial0,115200 console=tty1 root=PARTUUID=58b06195-02 rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait cgroup_memory=1 cgroup_enable=memory ``` @@ -417,7 +417,7 @@ reboot # Enabling Lazy Pulling of eStargz (Experimental) -## What's lazy pulling and eStargz? +### What's lazy pulling and eStargz? Pulling images is known as one of the time-consuming steps in the container lifecycle. According to [Harter, et al.](https://www.usenix.org/conference/fast16/technical-sessions/presentation/harter), @@ -436,7 +436,7 @@ Because of the compatibility, eStargz can be pushed to standard container regist eStargz is developed based on the [stargz format proposed by Google CRFS project](https://github.com/google/crfs) but comes with practical features including content verification and performance optimization. For more details about lazy pulling and eStargz, please refer to [Stargz Snapshotter project repository](https://github.com/containerd/stargz-snapshotter). -## Configure k3s for lazy pulling of eStargz +### Configure k3s for lazy pulling of eStargz As shown in the following, `--snapshotter=stargz` option is needed for k3s server and agent. From be4dd7b2d89b8de739295827db88182c9b7d1858 Mon Sep 17 00:00:00 2001 From: Jennifer Travinski Date: Mon, 4 Oct 2021 14:53:34 -0400 Subject: [PATCH 2/3] Added Rancher logging instructions not installed through Rancher --- content/k3s/latest/en/advanced/_index.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/content/k3s/latest/en/advanced/_index.md b/content/k3s/latest/en/advanced/_index.md index ac4f88ed7c9..7bc5012f309 100644 --- a/content/k3s/latest/en/advanced/_index.md +++ b/content/k3s/latest/en/advanced/_index.md @@ -24,6 +24,7 @@ This section contains advanced information describing the different ways you can - [SELinux Support](#selinux-support) - [Additional preparation for (Red Hat/CentOS) Enterprise Linux](#additional-preparation-for-red-hat-centos-enterprise-linux) - [Enabling Lazy Pulling of eStargz (Experimental)](#enabling-lazy-pulling-of-estargz-experimental) +- [Additional Logging Sources](#additional-logging-sources) # Certificate Rotation @@ -468,3 +469,14 @@ spec: ports: - containerPort: 80 ``` + +# Additional Logging Sources + +Rancher logging for K3s can be installed without using Rancher. The following instructions should be executed to do so: + +``` +helm repo add rancher-charts https://charts.rancher.io +helm repo update +helm install --create-namespace -n cattle-logging-system rancher-logging-crd rancher-charts/rancher-logging-crd +helm install --create-namespace -n cattle-logging-system rancher-logging --se tadditionalLoggingSources.k3s.enabled=true rancher-charts/rancher-logging +``` \ No newline at end of file From 71232c02f47fdb5b6c645554af6a5e51d8ab6489 Mon Sep 17 00:00:00 2001 From: Jennifer Travinski Date: Wed, 6 Oct 2021 10:10:02 -0400 Subject: [PATCH 3/3] Added logging link, corrected typo --- content/k3s/latest/en/advanced/_index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/k3s/latest/en/advanced/_index.md b/content/k3s/latest/en/advanced/_index.md index 7bc5012f309..494650ebf82 100644 --- a/content/k3s/latest/en/advanced/_index.md +++ b/content/k3s/latest/en/advanced/_index.md @@ -472,11 +472,11 @@ spec: # Additional Logging Sources -Rancher logging for K3s can be installed without using Rancher. The following instructions should be executed to do so: +[Rancher logging]({{}}//rancher/v2.6/en/logging/helm-chart-options/) for K3s can be installed without using Rancher. The following instructions should be executed to do so: ``` helm repo add rancher-charts https://charts.rancher.io helm repo update helm install --create-namespace -n cattle-logging-system rancher-logging-crd rancher-charts/rancher-logging-crd -helm install --create-namespace -n cattle-logging-system rancher-logging --se tadditionalLoggingSources.k3s.enabled=true rancher-charts/rancher-logging +helm install --create-namespace -n cattle-logging-system rancher-logging --set additionalLoggingSources.k3s.enabled=true rancher-charts/rancher-logging ``` \ No newline at end of file