From 7a3bdd69f0ea7a8bb6ca178541e106bfda2d8a23 Mon Sep 17 00:00:00 2001 From: David Nuzik Date: Tue, 12 Nov 2019 14:40:35 -0700 Subject: [PATCH 1/3] Remove metrics-server mention in configuration page - We now includ our own metrics-server and thus standard kubectl top nodes, etc functionality works out of the box. Since this works like standard k8s now with the top command, etc we don't need to document the custom-method to deploy metrics-server so we should simply remove this section. --- content/k3s/latest/en/configuration/_index.md | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/content/k3s/latest/en/configuration/_index.md b/content/k3s/latest/en/configuration/_index.md index aefafb94156..5084f2c1c4e 100644 --- a/content/k3s/latest/en/configuration/_index.md +++ b/content/k3s/latest/en/configuration/_index.md @@ -162,14 +162,3 @@ k3s agents can be configured with options `--node-label` and `--node-taint` whic --node-taint key1=value1:NoExecute ``` -Metrics Server --------------- - -To add functionality for commands such as `k3s kubectl top nodes` metrics-server must be installed, -to install see the instructions located at https://github.com/kubernetes-incubator/metrics-server/. - -**NOTE** : By default the image used in `metrics-server-deployment.yaml` is valid only for **amd64** devices, -this should be edited as appropriate for your architecture. As of this writing metrics-server provides -the following images relevant to k3s: `amd64:v0.3.3`, `arm64:v0.3.2`, and `arm:v0.3.2`. Further information -on the images provided through gcr.io can be found at https://console.cloud.google.com/gcr/images/google-containers/GLOBAL. - From eed95ec66033ea507f60e1adf15bd4a474205b7e Mon Sep 17 00:00:00 2001 From: David Nuzik Date: Tue, 12 Nov 2019 18:41:22 -0700 Subject: [PATCH 2/3] Add older-configuration section and put old metrics-server info there instead. - Addresses comments in the PR adding to keep this content but move it. - Added some context to this page and info about how v1.0.0 and newer has the metrics-server by default so this is clear to the user. --- .../older-configuration/_index.md | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 content/k3s/latest/en/configuration/older-configuration/_index.md diff --git a/content/k3s/latest/en/configuration/older-configuration/_index.md b/content/k3s/latest/en/configuration/older-configuration/_index.md new file mode 100644 index 00000000000..d4d4d76ed13 --- /dev/null +++ b/content/k3s/latest/en/configuration/older-configuration/_index.md @@ -0,0 +1,21 @@ +--- +title: "Configuration Info Prior to v1.0.0" +weight: 10 +--- + +>**Note:** Running k3s v1.0.0 or newer is recommended. + +This page outlines any configuration info that is relevant to versions older than v1.0.0 but was removed or no longer needed in v1.0.0 and newer. + +Metrics Server +-------------- + +>**Note:** k3s v1.0.0 includes the metrics-server by default. + +To add functionality for commands such as `k3s kubectl top nodes` metrics-server must be installed, +to install see the instructions located at https://github.com/kubernetes-incubator/metrics-server/. + +**NOTE** : By default the image used in `metrics-server-deployment.yaml` is valid only for **amd64** devices, +this should be edited as appropriate for your architecture. As of this writing metrics-server provides +the following images relevant to k3s: `amd64:v0.3.3`, `arm64:v0.3.2`, and `arm:v0.3.2`. Further information +on the images provided through gcr.io can be found at https://console.cloud.google.com/gcr/images/google-containers/GLOBAL. \ No newline at end of file From a725da986bc26ef8f351f8f2ac20e89e45e0c06b Mon Sep 17 00:00:00 2001 From: David Nuzik Date: Tue, 12 Nov 2019 18:45:25 -0700 Subject: [PATCH 3/3] Add Metrics Server back in to config page but link to older config page - Forgot about one comment Catherine had. I added a link to the older config page on the main config page. --- content/k3s/latest/en/configuration/_index.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/content/k3s/latest/en/configuration/_index.md b/content/k3s/latest/en/configuration/_index.md index 5084f2c1c4e..a5f1b996abf 100644 --- a/content/k3s/latest/en/configuration/_index.md +++ b/content/k3s/latest/en/configuration/_index.md @@ -162,3 +162,7 @@ k3s agents can be configured with options `--node-label` and `--node-taint` whic --node-taint key1=value1:NoExecute ``` +Metrics Server +-------------- + +>**Note:** v1.0.0 and newer includes the metrics-server by default. For older versions of k3s, please visit [Configuration Info Prior to v1.0.0]({{< baseurl >}}/k3s/latest/en/configuration/older-configuration/).