From a9b4468303f16e29fd603db952bc975d5575c6db Mon Sep 17 00:00:00 2001 From: Jennifer Travinski Date: Tue, 26 Oct 2021 11:28:44 -0400 Subject: [PATCH 1/6] Fixed formatting error, updated verbiage --- .../resources/k8s-tutorials/ha-rke2/_index.md | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/content/rancher/v2.6/en/installation/resources/k8s-tutorials/ha-rke2/_index.md b/content/rancher/v2.6/en/installation/resources/k8s-tutorials/ha-rke2/_index.md index 97ac82b7368..6a5e434f734 100644 --- a/content/rancher/v2.6/en/installation/resources/k8s-tutorials/ha-rke2/_index.md +++ b/content/rancher/v2.6/en/installation/resources/k8s-tutorials/ha-rke2/_index.md @@ -26,7 +26,7 @@ If you do not specify a pre-shared secret, RKE2 will generate one and place it a To avoid certificate errors with the fixed registration address, you should launch the server with the tls-san parameter set. This option adds an additional hostname or IP as a Subject Alternative Name in the server's TLS cert, and it can be specified as a list if you would like to access via both the IP and the hostname. -Here is an example of what the RKE2 config file (at /etc/rancher/rke2/config.yaml) would look like if you are following this guide: +Create the RKE2 config file at `/etc/rancher/rke2/config.yaml` using the following example: ``` token: my-shared-secret @@ -34,7 +34,7 @@ tls-san: - my-kubernetes-domain.com - another-kubernetes-domain.com ``` -After that you need to run the install command and enable and start rke2: +After that, you need to run the install command and enable and start rke2: ``` curl -sfL https://get.rke2.io | INSTALL_RKE2_CHANNEL=v1.20 sh - @@ -42,19 +42,18 @@ systemctl enable rke2-server.service systemctl start rke2-server.service ``` 1. To join the rest of the nodes, you need to configure each additional node with the same shared token or the one generated automatically. Here is an example of the configuration file: -``` -token: my-shared-secret -server: https://:9345 -tls-san: - - my-kubernetes-domain.com - - another-kubernetes-domain.com -``` -After that you need to run the installer and enable then start rke2 -``` -curl -sfL https://get.rke2.io | sh - -systemctl enable rke2-server.service -systemctl start rke2-server.service -``` + + token: my-shared-secret + server: https://:9345 + tls-san: + - my-kubernetes-domain.com + - another-kubernetes-domain.com +After that, you need to run the installer and enable, then start, rke2: + + curl -sfL https://get.rke2.io | sh - + systemctl enable rke2-server.service + systemctl start rke2-server.service + 1. Repeat the same command on your third RKE2 server node. From b0028b63cf6ced166eca5ea2b57e8abcc5f673ee Mon Sep 17 00:00:00 2001 From: Jennifer Travinski Date: Tue, 26 Oct 2021 11:30:17 -0400 Subject: [PATCH 2/6] Updated verbiage in 2.5 --- .../installation/resources/k8s-tutorials/ha-rke2/_index.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/rancher/v2.5/en/installation/resources/k8s-tutorials/ha-rke2/_index.md b/content/rancher/v2.5/en/installation/resources/k8s-tutorials/ha-rke2/_index.md index b414cf0ebbd..776dbff0b96 100644 --- a/content/rancher/v2.5/en/installation/resources/k8s-tutorials/ha-rke2/_index.md +++ b/content/rancher/v2.5/en/installation/resources/k8s-tutorials/ha-rke2/_index.md @@ -29,7 +29,7 @@ If you do not specify a pre-shared secret, RKE2 will generate one and place it a To avoid certificate errors with the fixed registration address, you should launch the server with the tls-san parameter set. This option adds an additional hostname or IP as a Subject Alternative Name in the server's TLS cert, and it can be specified as a list if you would like to access via both the IP and the hostname. -Here is an example of what the RKE2 config file (at /etc/rancher/rke2/config.yaml) would look like if you are following this guide: +Create the RKE2 config file at `/etc/rancher/rke2/config.yaml` using the following example: ``` token: my-shared-secret @@ -37,7 +37,7 @@ tls-san: - my-kubernetes-domain.com - another-kubernetes-domain.com ``` -After that you need to run the install command and enable and start rke2: +After that, you need to run the install command and enable and start rke2: ``` curl -sfL https://get.rke2.io | INSTALL_RKE2_CHANNEL=v1.20 sh - @@ -51,7 +51,7 @@ systemctl start rke2-server.service tls-san: - my-kubernetes-domain.com - another-kubernetes-domain.com -After that you need to run the installer and enable then start rke2 +After that, you need to run the installer and enable, then start, rke2: curl -sfL https://get.rke2.io | sh - systemctl enable rke2-server.service From 2b71f039741df758cdb2b6bc2f9d7fb3fbc33017 Mon Sep 17 00:00:00 2001 From: Jennifer Travinski Date: Tue, 26 Oct 2021 18:05:52 -0400 Subject: [PATCH 3/6] Added config for rke2-agent service 2.5 --- .../resources/k8s-tutorials/ha-rke2/_index.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/content/rancher/v2.5/en/installation/resources/k8s-tutorials/ha-rke2/_index.md b/content/rancher/v2.5/en/installation/resources/k8s-tutorials/ha-rke2/_index.md index 776dbff0b96..944cc4c2911 100644 --- a/content/rancher/v2.5/en/installation/resources/k8s-tutorials/ha-rke2/_index.md +++ b/content/rancher/v2.5/en/installation/resources/k8s-tutorials/ha-rke2/_index.md @@ -29,7 +29,14 @@ If you do not specify a pre-shared secret, RKE2 will generate one and place it a To avoid certificate errors with the fixed registration address, you should launch the server with the tls-san parameter set. This option adds an additional hostname or IP as a Subject Alternative Name in the server's TLS cert, and it can be specified as a list if you would like to access via both the IP and the hostname. -Create the RKE2 config file at `/etc/rancher/rke2/config.yaml` using the following example: +First, you must configure the path to enable the rke2-agent service as follows: + +``` +mkdir -p /etc/rancher/rke2/ +vim /etc/rancher/rke2/config.yaml +``` + +Next, create the RKE2 config file at `/etc/rancher/rke2/config.yaml` using the following example: ``` token: my-shared-secret From b6a5f8f49db259d4a90dec428c1a006758494817 Mon Sep 17 00:00:00 2001 From: Jennifer Travinski Date: Tue, 26 Oct 2021 18:31:18 -0400 Subject: [PATCH 4/6] Added config for rke2-agent service 2.6 --- .../resources/k8s-tutorials/ha-rke2/_index.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/content/rancher/v2.6/en/installation/resources/k8s-tutorials/ha-rke2/_index.md b/content/rancher/v2.6/en/installation/resources/k8s-tutorials/ha-rke2/_index.md index 6a5e434f734..3980c5b52d5 100644 --- a/content/rancher/v2.6/en/installation/resources/k8s-tutorials/ha-rke2/_index.md +++ b/content/rancher/v2.6/en/installation/resources/k8s-tutorials/ha-rke2/_index.md @@ -26,7 +26,14 @@ If you do not specify a pre-shared secret, RKE2 will generate one and place it a To avoid certificate errors with the fixed registration address, you should launch the server with the tls-san parameter set. This option adds an additional hostname or IP as a Subject Alternative Name in the server's TLS cert, and it can be specified as a list if you would like to access via both the IP and the hostname. -Create the RKE2 config file at `/etc/rancher/rke2/config.yaml` using the following example: +First, you must configure the path to enable the rke2-agent service as follows: + +``` +mkdir -p /etc/rancher/rke2/ +vim /etc/rancher/rke2/config.yaml +``` + +Next, create the RKE2 config file at `/etc/rancher/rke2/config.yaml` using the following example: ``` token: my-shared-secret From e1ad1ac287a6840cd910114b0c3f8bc6dcbb86bb Mon Sep 17 00:00:00 2001 From: Jennifer Travinski Date: Wed, 27 Oct 2021 10:52:38 -0400 Subject: [PATCH 5/6] Updated per feedback for 2.5 --- .../en/installation/resources/k8s-tutorials/ha-rke2/_index.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/content/rancher/v2.5/en/installation/resources/k8s-tutorials/ha-rke2/_index.md b/content/rancher/v2.5/en/installation/resources/k8s-tutorials/ha-rke2/_index.md index 944cc4c2911..929b64fc580 100644 --- a/content/rancher/v2.5/en/installation/resources/k8s-tutorials/ha-rke2/_index.md +++ b/content/rancher/v2.5/en/installation/resources/k8s-tutorials/ha-rke2/_index.md @@ -29,11 +29,10 @@ If you do not specify a pre-shared secret, RKE2 will generate one and place it a To avoid certificate errors with the fixed registration address, you should launch the server with the tls-san parameter set. This option adds an additional hostname or IP as a Subject Alternative Name in the server's TLS cert, and it can be specified as a list if you would like to access via both the IP and the hostname. -First, you must configure the path to enable the rke2-agent service as follows: +First, you must create the directory where the RKE2 config file is going to be placed: ``` mkdir -p /etc/rancher/rke2/ -vim /etc/rancher/rke2/config.yaml ``` Next, create the RKE2 config file at `/etc/rancher/rke2/config.yaml` using the following example: From 04cc4d0e1ed8635427d1a56950985f72b667fffa Mon Sep 17 00:00:00 2001 From: Jennifer Travinski Date: Wed, 27 Oct 2021 10:54:01 -0400 Subject: [PATCH 6/6] Updated per feedback for 2.6 --- .../en/installation/resources/k8s-tutorials/ha-rke2/_index.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/content/rancher/v2.6/en/installation/resources/k8s-tutorials/ha-rke2/_index.md b/content/rancher/v2.6/en/installation/resources/k8s-tutorials/ha-rke2/_index.md index 3980c5b52d5..96524986b90 100644 --- a/content/rancher/v2.6/en/installation/resources/k8s-tutorials/ha-rke2/_index.md +++ b/content/rancher/v2.6/en/installation/resources/k8s-tutorials/ha-rke2/_index.md @@ -26,11 +26,10 @@ If you do not specify a pre-shared secret, RKE2 will generate one and place it a To avoid certificate errors with the fixed registration address, you should launch the server with the tls-san parameter set. This option adds an additional hostname or IP as a Subject Alternative Name in the server's TLS cert, and it can be specified as a list if you would like to access via both the IP and the hostname. -First, you must configure the path to enable the rke2-agent service as follows: +First, you must create the directory where the RKE2 config file is going to be placed: ``` mkdir -p /etc/rancher/rke2/ -vim /etc/rancher/rke2/config.yaml ``` Next, create the RKE2 config file at `/etc/rancher/rke2/config.yaml` using the following example: