From dc755a1db9dbc8a32f747dc11667a6dd283a5e10 Mon Sep 17 00:00:00 2001 From: Billy Tat Date: Wed, 17 May 2023 14:19:20 -0700 Subject: [PATCH] Remove command to install K3s without specifying version Should specify version due to version compatibility. Also use consistent message. --- .../install-kubernetes.md | 8 ++++---- .../install-kubernetes.md | 8 +++++--- .../deploy-rancher-manager/helm-cli.md | 5 +++-- .../kubernetes-cluster-setup/k3s-for-rancher.md | 12 +++++------- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md b/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md index be62a722d3c..68160ef1c33 100644 --- a/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md +++ b/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md @@ -64,9 +64,9 @@ For more information on private registries configuration file for K3s, refer to ### 3. Install K3s -Rancher needs to be installed on a supported Kubernetes version. To find out which versions of Kubernetes are supported for your Rancher version, refer to the [support maintenance terms.](https://rancher.com/support-maintenance-terms/) +Rancher needs to be installed on a supported Kubernetes version. To find out which versions of Kubernetes are supported for your Rancher version, refer to the [Rancher Support Matrix](https://www.suse.com/suse-rancher/support-matrix/all-supported-versions/). -To specify the K3s version, use the INSTALL_K3S_VERSION environment variable when running the K3s installation script. +To specify the K3s (Kubernetes) version, use the INSTALL_K3S_VERSION (e.g., `INSTALL_K3S_VERSION="v1.24.10+k3s1"`) environment variable when running the K3s installation script. Obtain the K3s binary from the [releases](https://github.com/k3s-io/k3s/releases) page, matching the same version used to get the airgap images tar. Also obtain the K3s install script at https://get.k3s.io @@ -77,13 +77,13 @@ Place the install script anywhere on each node, and name it `install.sh`. Install K3s on each server: ``` -INSTALL_K3S_SKIP_DOWNLOAD=true ./install.sh +INSTALL_K3S_SKIP_DOWNLOAD=true INSTALL_K3S_VERSION= ./install.sh ``` Install K3s on each agent: ``` -INSTALL_K3S_SKIP_DOWNLOAD=true K3S_URL=https://myserver:6443 K3S_TOKEN=mynodetoken ./install.sh +INSTALL_K3S_SKIP_DOWNLOAD=true INSTALL_K3S_VERSION= K3S_URL=https://myserver:6443 K3S_TOKEN=mynodetoken ./install.sh ``` Note, take care to ensure you replace `myserver` with the IP or valid DNS of the server and replace `mynodetoken` with the node-token from the server. diff --git a/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-kubernetes.md b/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-kubernetes.md index cd1fe0ac0f0..75efc3704dd 100644 --- a/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-kubernetes.md +++ b/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-kubernetes.md @@ -28,16 +28,18 @@ NO_PROXY=127.0.0.0/8,10.0.0.0/8,cattle-system.svc,172.16.0.0/12,192.168.0.0/16,. EOF ``` -Then run the K3s installation script to create a new K3s cluster. Ensure that the K3s version you are installing is [supported by Rancher](https://www.suse.com/suse-rancher/support-matrix/all-supported-versions/). +Rancher needs to be installed on a supported Kubernetes version. To find out which versions of Kubernetes are supported for your Rancher version, refer to the [Rancher Support Matrix](https://www.suse.com/suse-rancher/support-matrix/all-supported-versions/). + +To specify the K3s (Kubernetes) version, use the INSTALL_K3S_VERSION (e.g., `INSTALL_K3S_VERSION="v1.24.10+k3s1"`) environment variable when running the K3s installation script. On the first node, create a new cluster: ``` -curl -sfL https://get.k3s.io | INSTALL_K3S_CHANNEL=v1.xx K3S_TOKEN=your_secret sh -s - server --cluster-init +curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION= K3S_TOKEN=your_secret sh -s - server --cluster-init ``` And then join the other nodes: ``` -curl -sfL https://get.k3s.io | INSTALL_K3S_CHANNEL=v1.xx K3S_TOKEN=your_secret sh -s - server --server https://:6443 +curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION= K3S_TOKEN=your_secret sh -s - server --server https://:6443 ``` For more information on installing K3s see the [K3s installation docs](https://docs.k3s.io/installation). diff --git a/docs/getting-started/quick-start-guides/deploy-rancher-manager/helm-cli.md b/docs/getting-started/quick-start-guides/deploy-rancher-manager/helm-cli.md index da22d9559e1..b6cbb50d561 100644 --- a/docs/getting-started/quick-start-guides/deploy-rancher-manager/helm-cli.md +++ b/docs/getting-started/quick-start-guides/deploy-rancher-manager/helm-cli.md @@ -12,10 +12,11 @@ Your Linux machine can be anywhere. It could be an Amazon EC2 instance, a Digita The full installation requirements are [here](../../../pages-for-subheaders/installation-requirements.md). - ## Install K3s on Linux -Rancher needs to be installed on a supported Kubernetes version. To specify the K3s version, use the INSTALL_K3S_VERSION (e.g., `INSTALL_K3S_VERSION="v1.24.10+k3s1"`) environment variable when running the K3s installation script. Refer to the [support maintenance terms](https://rancher.com/support-maintenance-terms/). +Rancher needs to be installed on a supported Kubernetes version. To find out which versions of Kubernetes are supported for your Rancher version, refer to the [Rancher Support Matrix](https://www.suse.com/suse-rancher/support-matrix/all-supported-versions/). + +To specify the K3s (Kubernetes) version, use the INSTALL_K3S_VERSION (e.g., `INSTALL_K3S_VERSION="v1.24.10+k3s1"`) environment variable when running the K3s installation script. Install a K3s cluster by running this command on the Linux machine: diff --git a/docs/how-to-guides/new-user-guides/kubernetes-cluster-setup/k3s-for-rancher.md b/docs/how-to-guides/new-user-guides/kubernetes-cluster-setup/k3s-for-rancher.md index 0828db18cff..b7e7267d39c 100644 --- a/docs/how-to-guides/new-user-guides/kubernetes-cluster-setup/k3s-for-rancher.md +++ b/docs/how-to-guides/new-user-guides/kubernetes-cluster-setup/k3s-for-rancher.md @@ -20,7 +20,10 @@ In both single-node setups, Rancher can be installed with Helm on the Kubernetes These instructions assume you have set up two nodes, a load balancer, a DNS record, and an external MySQL database as described in [this section.](../infrastructure-setup/ha-k3s-kubernetes-cluster.md) -Rancher needs to be installed on a supported Kubernetes version. To find out which versions of Kubernetes are supported for your Rancher version, refer to the [support maintenance terms.](https://rancher.com/support-maintenance-terms/) To specify the K3s version, use the INSTALL_K3S_VERSION environment variable when running the K3s installation script. +Rancher needs to be installed on a supported Kubernetes version. To find out which versions of Kubernetes are supported for your Rancher version, refer to the [Rancher Support Matrix](https://rancher.com/support-maintenance-terms/). + +To specify the K3s (Kubernetes) version, use the INSTALL_K3S_VERSION (e.g., `INSTALL_K3S_VERSION="v1.24.10+k3s1"`) environment variable when running the K3s installation script. + ## Installing Kubernetes ### 1. Install Kubernetes and Set up the K3s Server @@ -30,12 +33,7 @@ When running the command to start the K3s Kubernetes API server, you will pass i 1. Connect to one of the Linux nodes that you have prepared to run the Rancher server. 1. On the Linux node, run this command to start the K3s server and connect it to the external datastore: ``` - curl -sfL https://get.k3s.io | sh -s - server \ - --datastore-endpoint="mysql://username:password@tcp(hostname:3306)/database-name" - ``` - To specify the K3s version, use the INSTALL_K3S_VERSION environment variable: - ```sh - curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION=vX.Y.Z sh -s - server \ + curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION= sh -s - server \ --datastore-endpoint="mysql://username:password@tcp(hostname:3306)/database-name" ```