From ecf5d0aa26fdef0ddc89ffd479f23996f85d6ca4 Mon Sep 17 00:00:00 2001 From: Priyank Date: Fri, 10 Jun 2022 16:36:22 +0530 Subject: [PATCH 1/2] Update _index.md Addressing issue https://github.com/k3s-io/k3s/issues/5627 --- .../en/installation/install-options/agent-config/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/k3s/latest/en/installation/install-options/agent-config/_index.md b/content/k3s/latest/en/installation/install-options/agent-config/_index.md index 3deb4ae887f..f16c8390796 100644 --- a/content/k3s/latest/en/installation/install-options/agent-config/_index.md +++ b/content/k3s/latest/en/installation/install-options/agent-config/_index.md @@ -61,7 +61,7 @@ In this section, you'll learn how to configure the K3s agent. |------|----------------------|-------------| | `--node-ip value, -i` value | N/A | IP address to advertise for node | | `--node-external-ip` value | N/A | External IP address to advertise for node | -| `--resolv-conf` value | `K3S_RESOLV_CONF` | Kubelet resolv.conf file | +| `--resolv-conf` value | `K3S_RESOLV_CONF` | Kubelet resolv.conf file. Note: If you wish to set kubelet parameter `--resolv-conf` to `""`, use `--kubelet-arg=resolv-conf=` instead | | `--flannel-iface` value | N/A | Override default flannel interface | | `--flannel-conf` value | N/A | Override default flannel config file | From ad28413768a812765fd826e38cf308a2dc5f9220 Mon Sep 17 00:00:00 2001 From: Priyank Date: Sun, 12 Jun 2022 20:56:23 +0530 Subject: [PATCH 2/2] Update content/k3s/latest/en/installation/install-options/agent-config/_index.md Co-authored-by: Brad Davidson --- .../en/installation/install-options/agent-config/_index.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/content/k3s/latest/en/installation/install-options/agent-config/_index.md b/content/k3s/latest/en/installation/install-options/agent-config/_index.md index f16c8390796..1ffdabc740c 100644 --- a/content/k3s/latest/en/installation/install-options/agent-config/_index.md +++ b/content/k3s/latest/en/installation/install-options/agent-config/_index.md @@ -61,10 +61,11 @@ In this section, you'll learn how to configure the K3s agent. |------|----------------------|-------------| | `--node-ip value, -i` value | N/A | IP address to advertise for node | | `--node-external-ip` value | N/A | External IP address to advertise for node | -| `--resolv-conf` value | `K3S_RESOLV_CONF` | Kubelet resolv.conf file. Note: If you wish to set kubelet parameter `--resolv-conf` to `""`, use `--kubelet-arg=resolv-conf=` instead | +| `--resolv-conf` value | `K3S_RESOLV_CONF` | Kubelet resolv.conf file | | `--flannel-iface` value | N/A | Override default flannel interface | | `--flannel-conf` value | N/A | Override default flannel config file | +> Note: if you wish to directly set the kubelet `--resolv-conf` value, use `--kubelet-arg=resolv-conf=value` instead. The k3s flag is only passed through to the kubelet if set to the path of a valid resolv.conf file. ### Customized Flags | Flag | Description | |------|--------------|