From f416a6a749c1fe6b0f333ba2b9efb3300d37957d Mon Sep 17 00:00:00 2001 From: Derek Nola Date: Tue, 19 Apr 2022 12:38:02 -0700 Subject: [PATCH 1/2] [K3s] Update incorrect template example link We split the templates into linux and windows versions, making the old link incorrect. --- content/k3s/latest/en/advanced/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/k3s/latest/en/advanced/_index.md b/content/k3s/latest/en/advanced/_index.md index 907ecf6cead..dc432f82602 100644 --- a/content/k3s/latest/en/advanced/_index.md +++ b/content/k3s/latest/en/advanced/_index.md @@ -143,7 +143,7 @@ K3s will generate config.toml for containerd in `/var/lib/rancher/k3s/agent/etc/ For advanced customization for this file you can create another file called `config.toml.tmpl` in the same directory and it will be used instead. -The `config.toml.tmpl` will be treated as a Go template file, and the `config.Node` structure is being passed to the template. [This template](https://github.com/rancher/k3s/blob/master/pkg/agent/templates/templates.go#L16-L32) example on how to use the structure to customize the configuration file. +The `config.toml.tmpl` will be treated as a Go template file, and the `config.Node` structure is being passed to the template. See [this folder](https://github.com/k3s-io/k3s/blob/master/pkg/agent/templates) for linux and windows examples on how to use the structure to customize the configuration file. # Running K3s with Rootless mode (Experimental) From a6158c5dd6d1f64c890a8c9884f14915d77f2dd8 Mon Sep 17 00:00:00 2001 From: Derek Nola Date: Tue, 19 Apr 2022 13:39:24 -0700 Subject: [PATCH 2/2] Update content/k3s/latest/en/advanced/_index.md Co-authored-by: Jen Travinski --- content/k3s/latest/en/advanced/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/k3s/latest/en/advanced/_index.md b/content/k3s/latest/en/advanced/_index.md index dc432f82602..554a0e5469a 100644 --- a/content/k3s/latest/en/advanced/_index.md +++ b/content/k3s/latest/en/advanced/_index.md @@ -143,7 +143,7 @@ K3s will generate config.toml for containerd in `/var/lib/rancher/k3s/agent/etc/ For advanced customization for this file you can create another file called `config.toml.tmpl` in the same directory and it will be used instead. -The `config.toml.tmpl` will be treated as a Go template file, and the `config.Node` structure is being passed to the template. See [this folder](https://github.com/k3s-io/k3s/blob/master/pkg/agent/templates) for linux and windows examples on how to use the structure to customize the configuration file. +The `config.toml.tmpl` will be treated as a Go template file, and the `config.Node` structure is being passed to the template. See [this folder](https://github.com/k3s-io/k3s/blob/master/pkg/agent/templates) for Linux and Windows examples on how to use the structure to customize the configuration file. # Running K3s with Rootless mode (Experimental)