From c372765eba3550cd0a9a06076650926566833ea9 Mon Sep 17 00:00:00 2001 From: David Nuzik Date: Fri, 15 Nov 2019 11:32:49 -0700 Subject: [PATCH 1/2] Change wording for node labels and taints - Make it more clear that you can still modify / add / remove labels and taints, just not with k3s after node registration You can still change these with the kubectl client, so the wording was changed to make this more clear to avoid confusion. --- content/k3s/latest/en/configuration/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/k3s/latest/en/configuration/_index.md b/content/k3s/latest/en/configuration/_index.md index fbeb83ef1af..66f282ed3c4 100644 --- a/content/k3s/latest/en/configuration/_index.md +++ b/content/k3s/latest/en/configuration/_index.md @@ -155,7 +155,7 @@ mount namespace. Node Labels and Taints ---------------------- -K3s agents can be configured with options `--node-label` and `--node-taint` which adds set of Labels and Taints to kubelet, the two options only adds labels/taints at registration time, so they can only be added once and not changed after that, an example of options to add new label is: +K3s agents can be configured with the options `--node-label` and `--node-taint` which adds a label and taint to the kubelet. The two options only add labels and/or taints at registration time, so they can only be added once and not changed after that again by running K3s again. If you want to change node labels and taints after node registration you should use `kubectl`. Below is an example showing how to add labels and a taint: ``` --node-label foo=bar \ --node-label hello=world \ From af6c148e8daa77488047020f3d6efcf9ef443823 Mon Sep 17 00:00:00 2001 From: David Nuzik Date: Fri, 15 Nov 2019 11:36:04 -0700 Subject: [PATCH 2/2] remove duplicate "again" --- content/k3s/latest/en/configuration/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/k3s/latest/en/configuration/_index.md b/content/k3s/latest/en/configuration/_index.md index 66f282ed3c4..b1b5ece6f97 100644 --- a/content/k3s/latest/en/configuration/_index.md +++ b/content/k3s/latest/en/configuration/_index.md @@ -155,7 +155,7 @@ mount namespace. Node Labels and Taints ---------------------- -K3s agents can be configured with the options `--node-label` and `--node-taint` which adds a label and taint to the kubelet. The two options only add labels and/or taints at registration time, so they can only be added once and not changed after that again by running K3s again. If you want to change node labels and taints after node registration you should use `kubectl`. Below is an example showing how to add labels and a taint: +K3s agents can be configured with the options `--node-label` and `--node-taint` which adds a label and taint to the kubelet. The two options only add labels and/or taints at registration time, so they can only be added once and not changed after that again by running K3s. If you want to change node labels and taints after node registration you should use `kubectl`. Below is an example showing how to add labels and a taint: ``` --node-label foo=bar \ --node-label hello=world \