From dc755a1db9dbc8a32f747dc11667a6dd283a5e10 Mon Sep 17 00:00:00 2001 From: Billy Tat Date: Wed, 17 May 2023 14:19:20 -0700 Subject: [PATCH 1/4] 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" ``` From 98ea36869477504ee9a0906be03c5246da2ece23 Mon Sep 17 00:00:00 2001 From: Billy Tat Date: Thu, 18 May 2023 14:04:20 -0700 Subject: [PATCH 2/4] Apply dc755a1d 2.6 docs --- .../install-kubernetes.md | 8 ++++---- .../deploy-rancher-manager/helm-cli.md | 8 +++++--- .../kubernetes-cluster-setup/k3s-for-rancher.md | 12 +++++------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/versioned_docs/version-2.6/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md b/versioned_docs/version-2.6/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md index be62a722d3c..68160ef1c33 100644 --- a/versioned_docs/version-2.6/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md +++ b/versioned_docs/version-2.6/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/versioned_docs/version-2.6/getting-started/quick-start-guides/deploy-rancher-manager/helm-cli.md b/versioned_docs/version-2.6/getting-started/quick-start-guides/deploy-rancher-manager/helm-cli.md index a03c98fb3df..1d24359ce39 100644 --- a/versioned_docs/version-2.6/getting-started/quick-start-guides/deploy-rancher-manager/helm-cli.md +++ b/versioned_docs/version-2.6/getting-started/quick-start-guides/deploy-rancher-manager/helm-cli.md @@ -15,14 +15,16 @@ The full installation requirements are [here](../../../pages-for-subheaders/inst ## Install K3s on Linux +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: ``` -curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION="***" sh -s - server --cluster-init +curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION= sh -s - server --cluster-init ``` -Rancher needs to be installed on a supported Kubernetes version. To specify the K3s version, use the INSTALL_K3S_VERSION environment variable when running the K3s installation script. Refer to the [support maintenance terms](https://rancher.com/support-maintenance-terms/). - Using `--cluster-init` allows K3s to use embedded etcd as the datastore and has the ability to convert to an HA setup. Refer to [High Availability with Embedded DB](https://rancher.com/docs/k3s/latest/en/installation/ha-embedded/). Save the IP of the Linux machine. diff --git a/versioned_docs/version-2.6/how-to-guides/new-user-guides/kubernetes-cluster-setup/k3s-for-rancher.md b/versioned_docs/version-2.6/how-to-guides/new-user-guides/kubernetes-cluster-setup/k3s-for-rancher.md index 0828db18cff..b7e7267d39c 100644 --- a/versioned_docs/version-2.6/how-to-guides/new-user-guides/kubernetes-cluster-setup/k3s-for-rancher.md +++ b/versioned_docs/version-2.6/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" ``` From 4b01ab69abf8d84222f9bf100d593150bbf18691 Mon Sep 17 00:00:00 2001 From: Billy Tat Date: Thu, 18 May 2023 15:30:54 -0700 Subject: [PATCH 3/4] Update placeholder format of other values in command --- .../air-gapped-helm-cli-install/install-kubernetes.md | 5 ++--- .../air-gapped-helm-cli-install/install-kubernetes.md | 5 ++--- 2 files changed, 4 insertions(+), 6 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 68160ef1c33..cac2c14fdc4 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 @@ -83,11 +83,10 @@ INSTALL_K3S_SKIP_DOWNLOAD=true INSTALL_K3S_VERSION= ./install.sh Install K3s on each agent: ``` -INSTALL_K3S_SKIP_DOWNLOAD=true INSTALL_K3S_VERSION= K3S_URL=https://myserver:6443 K3S_TOKEN=mynodetoken ./install.sh +INSTALL_K3S_SKIP_DOWNLOAD=true INSTALL_K3S_VERSION= K3S_URL=:6443 K3S_TOKEN= ./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. -The node-token is on the server at `/var/lib/rancher/k3s/server/node-token` +Where `` is the IP or valid DNS of the server and `` is the node-token from the server found at `/var/lib/rancher/k3s/server/node-token`. :::note diff --git a/versioned_docs/version-2.6/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md b/versioned_docs/version-2.6/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md index 68160ef1c33..cac2c14fdc4 100644 --- a/versioned_docs/version-2.6/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md +++ b/versioned_docs/version-2.6/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md @@ -83,11 +83,10 @@ INSTALL_K3S_SKIP_DOWNLOAD=true INSTALL_K3S_VERSION= ./install.sh Install K3s on each agent: ``` -INSTALL_K3S_SKIP_DOWNLOAD=true INSTALL_K3S_VERSION= K3S_URL=https://myserver:6443 K3S_TOKEN=mynodetoken ./install.sh +INSTALL_K3S_SKIP_DOWNLOAD=true INSTALL_K3S_VERSION= K3S_URL=:6443 K3S_TOKEN= ./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. -The node-token is on the server at `/var/lib/rancher/k3s/server/node-token` +Where `` is the IP or valid DNS of the server and `` is the node-token from the server found at `/var/lib/rancher/k3s/server/node-token`. :::note From 2df1e2acca737874f03f9cbdf7bcd7a50e64fdb1 Mon Sep 17 00:00:00 2001 From: Billy Tat Date: Thu, 18 May 2023 17:39:58 -0700 Subject: [PATCH 4/4] Update placeholder format of other values in commands of other instances --- .../air-gapped-helm-cli-install/install-kubernetes.md | 2 +- .../rancher-behind-an-http-proxy/install-kubernetes.md | 6 ++++-- .../kubernetes-cluster-setup/k3s-for-rancher.md | 4 +++- .../air-gapped-helm-cli-install/install-kubernetes.md | 2 +- .../kubernetes-cluster-setup/k3s-for-rancher.md | 4 +++- 5 files changed, 12 insertions(+), 6 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 cac2c14fdc4..cc5679c0254 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 @@ -83,7 +83,7 @@ INSTALL_K3S_SKIP_DOWNLOAD=true INSTALL_K3S_VERSION= ./install.sh Install K3s on each agent: ``` -INSTALL_K3S_SKIP_DOWNLOAD=true INSTALL_K3S_VERSION= K3S_URL=:6443 K3S_TOKEN= ./install.sh +INSTALL_K3S_SKIP_DOWNLOAD=true INSTALL_K3S_VERSION= K3S_URL=https://:6443 K3S_TOKEN= ./install.sh ``` Where `` is the IP or valid DNS of the server and `` is the node-token from the server found at `/var/lib/rancher/k3s/server/node-token`. 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 75efc3704dd..051988180e9 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 @@ -34,14 +34,16 @@ To specify the K3s (Kubernetes) version, use the INSTALL_K3S_VERSION (e.g., `INS On the first node, create a new cluster: ``` -curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION= K3S_TOKEN=your_secret sh -s - server --cluster-init +curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION= K3S_TOKEN= sh -s - server --cluster-init ``` And then join the other nodes: ``` -curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION= K3S_TOKEN=your_secret sh -s - server --server https://:6443 +curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION= K3S_TOKEN= sh -s - server --server https://:6443 ``` +Where `` is the IP or valid DNS of the server and `` is the node-token from the server found at `/var/lib/rancher/k3s/server/node-token`. + For more information on installing K3s see the [K3s installation docs](https://docs.k3s.io/installation). To have a look at your cluster run: 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 b7e7267d39c..73322022319 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 @@ -34,9 +34,11 @@ When running the command to start the K3s Kubernetes API server, you will pass i 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 | INSTALL_K3S_VERSION= sh -s - server \ - --datastore-endpoint="mysql://username:password@tcp(hostname:3306)/database-name" + --datastore-endpoint="" ``` + Where `` is the connection URI for your datastore. For example, `mysql://username:password@tcp(hostname:3306)/database-name` if you're using MySQL. Valid datastores include etcd, MySQL, PostgreSQL, or SQLite (default). + :::note The datastore endpoint can also be passed in using the environment variable `$K3S_DATASTORE_ENDPOINT`. diff --git a/versioned_docs/version-2.6/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md b/versioned_docs/version-2.6/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md index cac2c14fdc4..cc5679c0254 100644 --- a/versioned_docs/version-2.6/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md +++ b/versioned_docs/version-2.6/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md @@ -83,7 +83,7 @@ INSTALL_K3S_SKIP_DOWNLOAD=true INSTALL_K3S_VERSION= ./install.sh Install K3s on each agent: ``` -INSTALL_K3S_SKIP_DOWNLOAD=true INSTALL_K3S_VERSION= K3S_URL=:6443 K3S_TOKEN= ./install.sh +INSTALL_K3S_SKIP_DOWNLOAD=true INSTALL_K3S_VERSION= K3S_URL=https://:6443 K3S_TOKEN= ./install.sh ``` Where `` is the IP or valid DNS of the server and `` is the node-token from the server found at `/var/lib/rancher/k3s/server/node-token`. diff --git a/versioned_docs/version-2.6/how-to-guides/new-user-guides/kubernetes-cluster-setup/k3s-for-rancher.md b/versioned_docs/version-2.6/how-to-guides/new-user-guides/kubernetes-cluster-setup/k3s-for-rancher.md index b7e7267d39c..73322022319 100644 --- a/versioned_docs/version-2.6/how-to-guides/new-user-guides/kubernetes-cluster-setup/k3s-for-rancher.md +++ b/versioned_docs/version-2.6/how-to-guides/new-user-guides/kubernetes-cluster-setup/k3s-for-rancher.md @@ -34,9 +34,11 @@ When running the command to start the K3s Kubernetes API server, you will pass i 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 | INSTALL_K3S_VERSION= sh -s - server \ - --datastore-endpoint="mysql://username:password@tcp(hostname:3306)/database-name" + --datastore-endpoint="" ``` + Where `` is the connection URI for your datastore. For example, `mysql://username:password@tcp(hostname:3306)/database-name` if you're using MySQL. Valid datastores include etcd, MySQL, PostgreSQL, or SQLite (default). + :::note The datastore endpoint can also be passed in using the environment variable `$K3S_DATASTORE_ENDPOINT`.