From b48e5cd9498130375e7052f550c936e946cac3bc Mon Sep 17 00:00:00 2001 From: lvuch Date: Tue, 7 Aug 2018 14:35:34 -0700 Subject: [PATCH 01/18] add customers to main nav --- config.toml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/config.toml b/config.toml index 45086b9d898..9faca42468b 100644 --- a/config.toml +++ b/config.toml @@ -122,10 +122,16 @@ pre = "keyboard_arrow_down" #url = "https://rancher.com//customers/" #weight = "3" +[[menu.main]] +identifier = "customers" +name = "Customers" +url = "/customers/" +weight = "4" + [[menu.main]] identifier = "learn" name = "Learn" -weight = "4" +weight = "5" pre = "keyboard_arrow_down" [[menu.main]] From 6be569d231170f248876aa6a859ac9018ddffe8f Mon Sep 17 00:00:00 2001 From: lvuch Date: Wed, 5 Sep 2018 14:19:03 -0700 Subject: [PATCH 02/18] accordion, and yaml on one block --- .../installation/ha/kubernetes-rke/_index.md | 20 +++--- layouts/shortcodes/accordion.html | 6 +- src/sass/app.scss | 63 ------------------- 3 files changed, 13 insertions(+), 76 deletions(-) diff --git a/content/rancher/v2.x/en/installation/ha/kubernetes-rke/_index.md b/content/rancher/v2.x/en/installation/ha/kubernetes-rke/_index.md index bef2d2ab927..979f9dfed00 100644 --- a/content/rancher/v2.x/en/installation/ha/kubernetes-rke/_index.md +++ b/content/rancher/v2.x/en/installation/ha/kubernetes-rke/_index.md @@ -11,15 +11,15 @@ Using the sample below create the `rancher-cluster.yml` file. Replace the IP Add ```yaml nodes: -- address: 165.227.114.63 - user: ubuntu - role: [controlplane,worker,etcd] -- address: 165.227.116.167 - user: ubuntu - role: [controlplane,worker,etcd] -- address: 165.227.127.226 - user: ubuntu - role: [controlplane,worker,etcd] + - address: 165.227.114.63 + user: ubuntu + role: [controlplane,worker,etcd] + - address: 165.227.116.167 + user: ubuntu + role: [controlplane,worker,etcd] + - address: 165.227.127.226 + user: ubuntu + role: [controlplane,worker,etcd] ``` #### Common RKE nodes: options @@ -102,4 +102,4 @@ Save a copy of the `kube_config_rancher-cluster.yml` and `rancher-cluster.yml` f See the [Troubleshooting]({{< baseurl >}}/rancher/v2.x/en/installation/ha/kubernetes-rke/troubleshooting/) page. -### [Next: Initialize Helm]({{< baseurl >}}/rancher/v2.x/en/installation/ha/helm-init/) \ No newline at end of file +### [Next: Initialize Helm]({{< baseurl >}}/rancher/v2.x/en/installation/ha/helm-init/) diff --git a/layouts/shortcodes/accordion.html b/layouts/shortcodes/accordion.html index 600dbc68d4b..0e38ce3b217 100644 --- a/layouts/shortcodes/accordion.html +++ b/layouts/shortcodes/accordion.html @@ -1,7 +1,7 @@ -
- +
+ -
+
{{ .Inner }}
diff --git a/src/sass/app.scss b/src/sass/app.scss index f55845b9e5e..a75f2eff1a6 100644 --- a/src/sass/app.scss +++ b/src/sass/app.scss @@ -62,66 +62,3 @@ display: none; visibility: hidden; } - - -//accordion -.tab { - position: relative; - margin-bottom: 1px; - width: 100%; - overflow: hidden; - border: solid $border thin; - - input { - position: absolute; - opacity: 0; - z-index: -1; - } - label { - position: relative; - display: block; - padding: $spacer-xs; - background: lighten($bg-default,4%); - border: solid 1px $border; - font-size: 2rem; - cursor: pointer; - } - - .tab-content { - display: none; - overflow: hidden; - background: #fff; - -webkit-transition: max-height .35s; - -o-transition: max-height .35s; - transition: max-height .35s; - padding: $spacer-sm; - } - - /* :checked */ - input:checked~.tab-content { - display: block; - } - /* Icon */ - label::after { - position: absolute; - right: $spacer-xs; - top: $spacer-xs; - display: block; - text-align: center; - -webkit-transition: all .35s; - -o-transition: all .35s; - transition: all .35s; - } - input[type=checkbox]+label::after { - content: "+"; - } - input[type=radio]+label::after { - content: "\25BC"; - } - input[type=checkbox]:checked+label::after { - transform: rotate(90deg); - } - input[type=radio]:checked+label::after { - transform: rotateX(180deg); - } -} From 90f4106151fe46f8dfc2c06a0b47fc1846b494b4 Mon Sep 17 00:00:00 2001 From: lvuch Date: Wed, 5 Sep 2018 15:08:29 -0700 Subject: [PATCH 03/18] note format and search --- .../v2.x/en/installation/ha/helm-init/_index.md | 2 +- .../v2.x/en/installation/ha/helm-rancher/_index.md | 10 +++++----- .../ha/helm-rancher/chart-options/_index.md | 4 ++-- .../ha/helm-rancher/troubleshooting/_index.md | 2 +- src/js/app.js | 14 +++++++++++++- 5 files changed, 22 insertions(+), 10 deletions(-) diff --git a/content/rancher/v2.x/en/installation/ha/helm-init/_index.md b/content/rancher/v2.x/en/installation/ha/helm-init/_index.md index 245775e475c..f8f96f1f2e6 100644 --- a/content/rancher/v2.x/en/installation/ha/helm-init/_index.md +++ b/content/rancher/v2.x/en/installation/ha/helm-init/_index.md @@ -28,6 +28,6 @@ kubectl create clusterrolebinding tiller \ helm init --service-account tiller ``` -> NOTE: This `tiller` install has full cluster access, which should be acceptable if the cluster is dedicated to Rancher server. Check out the [helm docs](https://docs.helm.sh/using_helm/#role-based-access-control) for restricting `tiller` access to suit your security requirements. +> **NOTE:** This `tiller` install has full cluster access, which should be acceptable if the cluster is dedicated to Rancher server. Check out the [helm docs](https://docs.helm.sh/using_helm/#role-based-access-control) for restricting `tiller` access to suit your security requirements. ### [Next: Install Rancher]({{< baseurl >}}/rancher/v2.x/en/installation/ha//helm-rancher/) \ No newline at end of file diff --git a/content/rancher/v2.x/en/installation/ha/helm-rancher/_index.md b/content/rancher/v2.x/en/installation/ha/helm-rancher/_index.md index 57fd70024ae..e14ab73341d 100644 --- a/content/rancher/v2.x/en/installation/ha/helm-rancher/_index.md +++ b/content/rancher/v2.x/en/installation/ha/helm-rancher/_index.md @@ -33,9 +33,9 @@ Rancher server is designed to be "secure by default" and requires SSL/TLS config There are three options for the source of the certificate. -* `rancher` - (Default) Use Rancher generated CA/Certificates. -* `letsEncrypt` - Use [LetsEncrypt](https://letsencrypt.org/) to issue a cert. -* `secret` - Configure a Kubernetes Secret with your certificate files. +1. `rancher` - (Default) Use Rancher generated CA/Certificates. +2. `letsEncrypt` - Use [LetsEncrypt](https://letsencrypt.org/) to issue a cert. +3. `secret` - Configure a Kubernetes Secret with your certificate files. @@ -71,11 +71,11 @@ helm install rancher-stable/rancher \ Create Kubernetes Secrets from your own certificates for Rancher to use. -> NOTE: The common name for the cert will need to match the `hostname` option or the ingress controller will fail to provision the site for Rancher. +> **NOTE:** The common name for the cert will need to match the `hostname` option or the ingress controller will fail to provision the site for Rancher. Set `hostname` and `ingress.tls.source=secret` -> NOTE: If you are using a Private CA signed cert, add `--set privateCA=true` +> **NOTE:** If you are using a Private CA signed cert, add `--set privateCA=true` ``` helm install rancher-stable/rancher \ diff --git a/content/rancher/v2.x/en/installation/ha/helm-rancher/chart-options/_index.md b/content/rancher/v2.x/en/installation/ha/helm-rancher/chart-options/_index.md index f31c8c02a6c..8ab749ead03 100644 --- a/content/rancher/v2.x/en/installation/ha/helm-rancher/chart-options/_index.md +++ b/content/rancher/v2.x/en/installation/ha/helm-rancher/chart-options/_index.md @@ -74,11 +74,11 @@ Add the `rancherImage` to point to your private registry image and `imagePullSec If you wish to terminate the SSL/TLS on a load-balancer external to the Rancher cluster (ingress), use the `--tls=external` option and point your load balancer at port http 80 on all of the rancher cluster nodes. -> NOTE: If you are using a Private CA signed cert, add `--set privateCA=true` and see [Adding TLS Secrets - Private CA Signed - Additional Steps]({{< baseurl >}}/rancher/v2.x/en/installation/ha/helm-rancher/tls-secrets/#private-ca-signed---additional-steps) to add the CA cert for Rancher. +> **NOTE:** If you are using a Private CA signed cert, add `--set privateCA=true` and see [Adding TLS Secrets - Private CA Signed - Additional Steps]({{< baseurl >}}/rancher/v2.x/en/installation/ha/helm-rancher/tls-secrets/#private-ca-signed---additional-steps) to add the CA cert for Rancher. Your load balancer must support long lived websocket connections and will need to insert proxy headers so Rancher can route links correctly. -> NOTE: The `tls=external` option will expose the Rancher interface on http port 80. Clients that are allowed to connect directly to the Rancher cluster will not be encrypted. We recommend that you restrict direct access at the network level to just your load balancer. +> **NOTE:** The `tls=external` option will expose the Rancher interface on http port 80. Clients that are allowed to connect directly to the Rancher cluster will not be encrypted. We recommend that you restrict direct access at the network level to just your load balancer. #### Required headers diff --git a/content/rancher/v2.x/en/installation/ha/helm-rancher/troubleshooting/_index.md b/content/rancher/v2.x/en/installation/ha/helm-rancher/troubleshooting/_index.md index fd12a12e04f..7aeededc860 100644 --- a/content/rancher/v2.x/en/installation/ha/helm-rancher/troubleshooting/_index.md +++ b/content/rancher/v2.x/en/installation/ha/helm-rancher/troubleshooting/_index.md @@ -69,7 +69,7 @@ kubectl -n cattle-namespace logs -f rancher-784d94f59b-vgqzh Use your browser to check the certificate details. If it says the Common Name is "Kubernetes Ingress Controller Fake Certificate", something may have gone wrong with reading or issuing your SSL cert. -> Note: if you are using LetsEncrypt to issue certs it can sometimes take a few minuets to issue the cert. +> **NOTE:** if you are using LetsEncrypt to issue certs it can sometimes take a few minuets to issue the cert. #### cert-manager issued certs (Rancher Generated or LetsEncrypt) diff --git a/src/js/app.js b/src/js/app.js index d5780117d18..e7014892cbc 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -30,7 +30,19 @@ const bootstrapDocsSearch = function() { autofocus: true, loadingIndicator: true, container: '#search-box', - placeholder: 'Search Docs...', + placeholder: 'Search Blog, Events, etc...', + magnifier: false, + reset: true, + }) + ); + + + search.addWidget( + instantsearch.widgets.searchBox({ + autofocus: true, + loadingIndicator: true, + container: '#search-box-mobile', + placeholder: 'Search Blog, Events, etc...', magnifier: false, reset: true, }) From b917763cf301d941c986f77d04b2b7ee8742e60a Mon Sep 17 00:00:00 2001 From: lvuch Date: Wed, 5 Sep 2018 16:15:10 -0700 Subject: [PATCH 04/18] sitemap to robots --- layouts/robots.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/layouts/robots.txt b/layouts/robots.txt index 34b38b80170..769d069a8d7 100644 --- a/layouts/robots.txt +++ b/layouts/robots.txt @@ -1,2 +1,4 @@ User-agent: * -Disallow: {{ if ne (getenv "HUGO_ENV") "production" }}/{{ end }} \ No newline at end of file +Disallow: {{ if ne (getenv "HUGO_ENV") "production" }}/{{ end }} + +Sitemap: https://rancher.com/sitemap.xml From 9a2fe9bb204984cd46ac060bcf22b961216ec580 Mon Sep 17 00:00:00 2001 From: dnoland1 Date: Thu, 6 Sep 2018 22:35:45 -0700 Subject: [PATCH 05/18] Update _index.md Used https://github.com/rancher/rke/blob/v0.1.9/vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_defaults.go as a reference. --- content/rke/v0.1.x/en/config-options/_index.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/content/rke/v0.1.x/en/config-options/_index.md b/content/rke/v0.1.x/en/config-options/_index.md index 3d169c29e4d..b63c4471ed9 100644 --- a/content/rke/v0.1.x/en/config-options/_index.md +++ b/content/rke/v0.1.x/en/config-options/_index.md @@ -54,14 +54,16 @@ ignore_docker_version: true ### Kubernetes Version -You can select which version of Kubernetes to install for your cluster. These options are the Kubernetes versions made available in Rancher v2.x. The current default Kubernetes version used by RKE is `v1.10.3-rancher2-1`. If a version is defined in `kubernetes_version` and is not found in this list, the default is used. +You can select which version of Kubernetes to install for your cluster. These options are the Kubernetes versions made available in Rancher v2.x. The current default Kubernetes version used by RKE is `v1.11.1-rancher1-1`. If a version is defined in `kubernetes_version` and is not found in this list, the default is used. Kubernetes version| -----------------| + v1.11.1-rancher1-1| + v1.10.5-rancher1-2| v1.10.3-rancher2-1| v1.10.1-rancher2-1| v1.10.0-rancher1-1| - v1.9.7-rancher2-1| + v1.9.7-rancher2-2| v1.9.5-rancher1-1| v1.8.11-rancher2-1| v1.8.10-rancher1-1| @@ -74,7 +76,7 @@ There are two ways to select a Kubernetes version: - Using the configuration option `kubernetes_version` ```yaml -kubernetes_version: "v1.10.3-rancher2-1" +kubernetes_version: "v1.11.1-rancher1-1" ``` In case both are defined, the system images configuration will take precedence over `kubernetes_version`. From 430d1c8f4804acb4bc38da5258f74f9155d6397c Mon Sep 17 00:00:00 2001 From: Denise Date: Fri, 7 Sep 2018 12:22:06 -0700 Subject: [PATCH 06/18] Update _index.md --- content/rke/v0.1.x/en/config-options/_index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/content/rke/v0.1.x/en/config-options/_index.md b/content/rke/v0.1.x/en/config-options/_index.md index b63c4471ed9..2f24b34738b 100644 --- a/content/rke/v0.1.x/en/config-options/_index.md +++ b/content/rke/v0.1.x/en/config-options/_index.md @@ -64,6 +64,7 @@ You can select which version of Kubernetes to install for your cluster. These op v1.10.1-rancher2-1| v1.10.0-rancher1-1| v1.9.7-rancher2-2| + v1.9.7-rancher2-1| v1.9.5-rancher1-1| v1.8.11-rancher2-1| v1.8.10-rancher1-1| From 589544b1cb9ce4b411fc0b518b07899e172813e8 Mon Sep 17 00:00:00 2001 From: dnoland1 Date: Fri, 7 Sep 2018 13:55:10 -0700 Subject: [PATCH 07/18] Update _index.md Name of docker container appears to be `etcd-rolling-snapshots`, not `etcd-snapshot`. ``` # docker ps | grep snapshot 5ceb51ca3587 rancher/rke-tools:v0.1.13 "/opt/rke-tools/rk..." 8 minutes ago Up 8 minutes etcd-rolling-snapshots ``` --- content/rke/v0.1.x/en/etcd-snapshots/_index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/rke/v0.1.x/en/etcd-snapshots/_index.md b/content/rke/v0.1.x/en/etcd-snapshots/_index.md index 80b346fc933..cea49ba1d39 100644 --- a/content/rke/v0.1.x/en/etcd-snapshots/_index.md +++ b/content/rke/v0.1.x/en/etcd-snapshots/_index.md @@ -46,10 +46,10 @@ services: ``` -When a cluster is launched with the etcd snapshot service enabled, you can view the `etcd-snapshot` logs to confirm backups are being created automatically. +When a cluster is launched with the etcd snapshot service enabled, you can view the `etcd-rolling-snapshots` logs to confirm backups are being created automatically. ``` -$ docker logs etcd-snapshot +$ docker logs etcd-rolling-snapshots time="2018-05-04T18:39:16Z" level=info msg="Initializing Rolling Backups" creation=1m0s retention=24h0m0s time="2018-05-04T18:40:16Z" level=info msg="Created backup" name="2018-05-04T18:40:16Z_etcd" runtime=108.332814ms From fd83228c9f7f1922a9916dd0778c894168c454d2 Mon Sep 17 00:00:00 2001 From: steakfest Date: Wed, 5 Sep 2018 09:29:57 -0600 Subject: [PATCH 08/18] User should be "Standard User" The first couple references to the global permission "Standard User" just said "User" I'm just learning Rancher, but this seemed like a mistake to me. --- .../en/admin-settings/rbac/global-permissions/_index.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/rancher/v2.x/en/admin-settings/rbac/global-permissions/_index.md b/content/rancher/v2.x/en/admin-settings/rbac/global-permissions/_index.md index 038c3baf5d1..9ee7071f86e 100644 --- a/content/rancher/v2.x/en/admin-settings/rbac/global-permissions/_index.md +++ b/content/rancher/v2.x/en/admin-settings/rbac/global-permissions/_index.md @@ -3,13 +3,13 @@ title: Global Permissions weight: 1126 --- -Global Permissions define user authorization outside the scope of any particular cluster. Out-of-the-box, there are two default global permissions: `Administrator` and `User`. +Global Permissions define user authorization outside the scope of any particular cluster. Out-of-the-box, there are two default global permissions: `Administrator` and `Standard User`. - **Administrator:** These users have full control over the entire Rancher system and all clusters within it. -- **User:** +- **Standard User:** These users can create new clusters and use them. Standard users can also assign other users permissions to their clusters. @@ -73,4 +73,4 @@ You can change the default global permissions that are assigned to external user 1. If you want to remove a default permission, edit the permission and select **No** from **New User Default**. -**Result:** The default global permissions are configured based on your changes. Permissions assigned to new users display a check in the **New User Default** column. \ No newline at end of file +**Result:** The default global permissions are configured based on your changes. Permissions assigned to new users display a check in the **New User Default** column. From 3859604521485905f5247a3390cc53e0ba07af74 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Steenis Date: Mon, 10 Sep 2018 09:17:01 +0200 Subject: [PATCH 09/18] Make ports explicit in CNI FAQ --- .../rancher/v2.x/en/faq/networking/cni-providers/_index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/rancher/v2.x/en/faq/networking/cni-providers/_index.md b/content/rancher/v2.x/en/faq/networking/cni-providers/_index.md index 531303bafc3..39ca0ecd58a 100644 --- a/content/rancher/v2.x/en/faq/networking/cni-providers/_index.md +++ b/content/rancher/v2.x/en/faq/networking/cni-providers/_index.md @@ -53,7 +53,7 @@ Canal is a CNI provider that gives you the best of Flannel and Calico. It allows In Rancher, Canal is the default CNI provider combined with Flannel and VXLAN encapsulation. -Kubernetes workers should open UDP port `8472` (VXLAN) and `9099` (healthcheck). +Kubernetes workers should open UDP port `8472` (VXLAN) and TCP port `9099` (healthcheck). See [Port Requirements]({{< baseurl >}}/rancher/v2.x/en/installation/references/) for more details. ![Canal Diagram]({{< baseurl >}}/img/rancher/canal-diagram.png) @@ -67,7 +67,7 @@ Flannel is a simple and easy way to configure L3 network fabric designed for Kub Encapsulated traffic is unencrypted by default. Threfore, flannel provides an experimental backend for encryption, [IPSec](https://github.com/coreos/flannel/blob/master/Documentation/backends.md#ipsec), which makes use of [strongSwan](https://www.strongswan.org/) to establish encrypted IPSec tunnels between Kubernetes workers. -Kubernetes workers should open UDP port `8472` (VXLAN) and `9099` (healthcheck). +Kubernetes workers should open UDP port `8472` (VXLAN) and TCP port `9099` (healthcheck). See [Port Requirements]({{< baseurl >}}/rancher/v2.x/en/installation/references/) for more details. ![Flannel Diagram]({{< baseurl >}}/img/rancher/flannel-diagram.png) From 40a66fa7b969084a80ece0788c019092177072c1 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Steenis Date: Tue, 11 Sep 2018 18:06:24 +0200 Subject: [PATCH 10/18] Add notes on RancherOS and Docker version --- .../v2.x/en/installation/requirements/_index.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/content/rancher/v2.x/en/installation/requirements/_index.md b/content/rancher/v2.x/en/installation/requirements/_index.md index 930f75ce31a..b04d450859f 100644 --- a/content/rancher/v2.x/en/installation/requirements/_index.md +++ b/content/rancher/v2.x/en/installation/requirements/_index.md @@ -13,6 +13,10 @@ Rancher is supported on the following operating systems and their subsequent rel * Ubuntu 16.04 (64-bit) * Red Hat Enterprise Linux 7.5 (64-bit) * RancherOS 1.4 (64-bit) + +If you are using RancherOS, make sure you switch the Docker engine to a supported version using:
+`sudo ros engine switch docker-17.03.2-ce` + {{% /tab %}} {{% tab "Hardware" %}} Hardware requirements scale based on the size of your Rancher deployment. Provision each individual node according to the requirements. @@ -58,7 +62,11 @@ Supported Versions: * `1.13.1` * `17.03.2` +If you are using RancherOS, make sure you switch the Docker engine to a supported version using:
+`sudo ros engine switch docker-17.03.2-ce` + [Docker Documentation: Installation Instructions](https://docs.docker.com/) + {{% /tab %}} {{% tab "Ports" %}} @@ -72,4 +80,4 @@ When deploying Rancher in an HA cluster, certain ports on your nodes must be ope {{< requirements_ports_rke >}} {{< ports_aws_securitygroup_nodedriver >}} {{% /tab %}} -{{% /tabs %}} \ No newline at end of file +{{% /tabs %}} From 4f50f46bef96a1fd6c9171c3e702c9b8c4365a22 Mon Sep 17 00:00:00 2001 From: Jason Greathouse Date: Wed, 12 Sep 2018 11:26:23 -0500 Subject: [PATCH 11/18] Update RKE install instructions to rename binary to "rke". Update docs that reference platform specific binaries in the examples --- .../en/backups/backups/ha-backups/_index.md | 10 +--- .../ha/rke-add-on/layer-4-lb/_index.md | 41 +++------------ .../ha/rke-add-on/layer-7-lb/_index.md | 41 +++------------ .../upgrades/ha-server-upgrade/_index.md | 5 +- content/rke/v0.1.x/en/installation/_index.md | 52 +++++++++---------- 5 files changed, 43 insertions(+), 106 deletions(-) diff --git a/content/rancher/v2.x/en/backups/backups/ha-backups/_index.md b/content/rancher/v2.x/en/backups/backups/ha-backups/_index.md index 61c731d2d43..c9ef3595a95 100644 --- a/content/rancher/v2.x/en/backups/backups/ha-backups/_index.md +++ b/content/rancher/v2.x/en/backups/backups/ha-backups/_index.md @@ -64,10 +64,7 @@ To take recurring snapshots, enable the `etcd-snapshot` service, which is a serv 6. Run one of the following commands: ``` - # MacOS - ./rke_darwin-amd64 up --config rancher-cluster.yml - # Linux - ./rke_linux-amd64 up --config rancher-cluster.yml + rke up --config rancher-cluster.yml ``` @@ -84,10 +81,7 @@ When you're about to upgrade Rancher or restore it to a previous snapshot, you s 2. Enter the following command. Replace `` with any name that you want to use for the snapshot (e.g. `upgrade.db`). ``` - # MacOS - ./rke_darwin-amd64 etcd snapshot-save --name --config rancher-cluster.yml - # Linux - ./rke_linux-amd64 etcd snapshot-save --name --config rancher-cluster.yml + rke etcd snapshot-save --name --config rancher-cluster.yml ``` **Result:** RKE takes a snapshot of `etcd` running on each `etcd` node. The file is saved to `/opt/rke/etcd-snapshots`. diff --git a/content/rancher/v2.x/en/installation/ha/rke-add-on/layer-4-lb/_index.md b/content/rancher/v2.x/en/installation/ha/rke-add-on/layer-4-lb/_index.md index bb6f251614d..babaced624b 100644 --- a/content/rancher/v2.x/en/installation/ha/rke-add-on/layer-4-lb/_index.md +++ b/content/rancher/v2.x/en/installation/ha/rke-add-on/layer-4-lb/_index.md @@ -23,7 +23,7 @@ Installation of Rancher in a high-availability configuration involves multiple p - [1. Provision Linux Hosts](#1-provision-linux-hosts) - [2. Configure Load Balancer](#2-configure-load-balancer) - [3. Configure DNS](#3-configure-dns) -- [4. Download RKE](#4-download-rke) +- [4. Install RKE](#4-install-rke) - [5. Download RKE Config File Template](#5-download-rke-config-file-template) - [6. Configure Nodes](#6-configure-nodes) - [7. Configure Certificates](#7-configure-certificates) @@ -139,40 +139,16 @@ Choose a fully qualified domain name (FQDN) that you want to use to access Ranch
-## 4. Download RKE +## 4. Install RKE -RKE is a fast, versatile Kubernetes installer that you can use to install Kubernetes on your Linux hosts. We will be using RKE to setup our cluster and run Rancher. +RKE (Rancher Kubernetes Engine) is a fast, versatile Kubernetes installer that you can use to install Kubernetes on your Linux hosts. We will use RKE to setup our cluster and run Rancher. -1. From your workstation, open a web browser and navigate to our [RKE Releases](https://github.com/rancher/rke/releases/latest) page. Download the latest RKE installer applicable to your Operating System: +1. Follow the [RKE Install]({{< baseurl >}}/rke/v0.1.x/en/installation) instructions. - - **MacOS**: `rke_darwin-amd64` - - **Linux**: `rke_linux-amd64` - - **Windows**: `rke_windows-amd64.exe` - -2. Make the RKE binary that you just downloaded executable. Open Terminal, change directory to the location of the RKE binary, and then run one of the commands below. - - >**Using Windows?** - >The file is already an executable. Skip to [Download Config File Template](#5-download-rke-config-file-template). +2. Confirm that RKE is now executable by running the following command: ``` - # MacOS - $ chmod +x rke_darwin-amd64 - # Linux - $ chmod +x rke_linux-amd64 - ``` - -3. Confirm that RKE is now executable by running the following command: - - ``` - # MacOS - $ ./rke_darwin-amd64 --version - # Linux - $ ./rke_linux-amd64 --version - ``` - - **Step Result:** You receive output similar to what follows: - ``` - rke version v + rke --version ``` ## 5. Download RKE Config File Template @@ -387,10 +363,7 @@ With all configuration in place, use RKE to launch Rancher. You can complete thi 3. Enter one of the `rke up` commands listen below. ``` -# MacOS -./rke_darwin-amd64 up --config rancher-cluster.yml -# Linux -./rke_linux-amd64 up --config rancher-cluster.yml +rke up --config rancher-cluster.yml ``` **Step Result:** The output should be similar to the snippet below: diff --git a/content/rancher/v2.x/en/installation/ha/rke-add-on/layer-7-lb/_index.md b/content/rancher/v2.x/en/installation/ha/rke-add-on/layer-7-lb/_index.md index 256a2543e46..d9eae55f92b 100644 --- a/content/rancher/v2.x/en/installation/ha/rke-add-on/layer-7-lb/_index.md +++ b/content/rancher/v2.x/en/installation/ha/rke-add-on/layer-7-lb/_index.md @@ -23,7 +23,7 @@ Installation of Rancher in a high-availability configuration involves multiple p - [1. Provision Linux Hosts](#1-provision-linux-hosts) - [2. Configure Load Balancer](#2-configure-load-balancer) - [3. Configure DNS](#3-configure-dns) -- [4. Download RKE](#4-download-rke) +- [4. Install RKE](#4-install-rke) - [5. Download RKE Config File Template](#5-download-rke-config-file-template) - [6. Configure Nodes](#6-configure-nodes) - [7. Configure Certificates](#7-configure-certificates) @@ -87,40 +87,16 @@ Choose a fully qualified domain name (FQDN) that you want to use to access Ranch
-## 4. Download RKE +## 4. Install RKE -RKE is a fast, versatile Kubernetes installer that you can use to install Kubernetes on your Linux hosts. We will be using RKE to setup our cluster and run Rancher. +RKE (Rancher Kubernetes Engine) is a fast, versatile Kubernetes installer that you can use to install Kubernetes on your Linux hosts. We will use RKE to setup our cluster and run Rancher. -1. From your workstation, open a web browser and navigate to our [RKE Releases](https://github.com/rancher/rke/releases/latest) page. Download the latest RKE installer applicable to your Operating System: +1. Follow the [RKE Install]({{< baseurl >}}/rke/v0.1.x/en/installation) instructions. - - **MacOS**: `rke_darwin-amd64` - - **Linux**: `rke_linux-amd64` - - **Windows**: `rke_windows-amd64.exe` - -2. Make the RKE binary that you just downloaded executable. Open Terminal, change directory to the location of the RKE binary, and then run one of the commands below. - - >**Using Windows?** - >The file is already an executable. Skip to [Download RKE Config File Template](#5-download-rke-config-file-template). +2. Confirm that RKE is now executable by running the following command: ``` - # MacOS - $ chmod +x rke_darwin-amd64 - # Linux - $ chmod +x rke_linux-amd64 - ``` - -3. Confirm that RKE is now executable by running the following command: - - ``` - # MacOS - $ ./rke_darwin-amd64 --version - # Linux - $ ./rke_linux-amd64 --version - ``` - - **Step Result:** You receive output similar to what follows: - ``` - rke version v + rke --version ``` ## 5. Download RKE Config File Template @@ -275,10 +251,7 @@ With all configuration in place, use RKE to launch Rancher. You can complete thi 3. Enter one of the `rke up` commands listen below. ``` - # MacOS - ./rke_darwin-amd64 up --config rancher-cluster.yml - # Linux - ./rke_linux-amd64 up --config rancher-cluster.yml + rke up --config rancher-cluster.yml ``` **Step Result:** The output should be similar to the snippet below: diff --git a/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade/_index.md b/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade/_index.md index 18d9414f8ee..2d98fbf9917 100644 --- a/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade/_index.md +++ b/content/rancher/v2.x/en/upgrades/upgrades/ha-server-upgrade/_index.md @@ -28,10 +28,7 @@ This document is for upgrading Rancher HA installed with the RKE Add-On yaml. Se 1. Enter the following command. Replace `` with any name that you want to use for the snapshot (e.g. `upgrade.db`). ``` - # MacOS - ./rke_darwin-amd64 etcd snapshot-save --name --config rancher-cluster.yml - # Linux - ./rke_linux-amd64 etcd snapshot-save --name --config rancher-cluster.yml + rke etcd snapshot-save --name --config rancher-cluster.yml ``` **Result:** RKE takes a snapshot of `etcd` running on each `etcd` node. The file is saved to `/opt/rke/etcd-snapshots`. diff --git a/content/rke/v0.1.x/en/installation/_index.md b/content/rke/v0.1.x/en/installation/_index.md index 4ee201aea49..dc7eed18d51 100644 --- a/content/rke/v0.1.x/en/installation/_index.md +++ b/content/rke/v0.1.x/en/installation/_index.md @@ -19,25 +19,30 @@ RKE is a fast, versatile Kubernetes installer that you can use to install Kubern - **Linux**: `rke_linux-amd64` - **Windows**: `rke_windows-amd64.exe` -2. Make the RKE binary that you just downloaded executable. Open Terminal, change directory to the location of the RKE binary, and then run one of the commands below. +2. Copy the RKE binary to a folder in your `$PATH` and rename it `rke` (or `rke.exe` for Windows) + + ``` + # MacOS + $ mv rke_darwin-amd64 rke + # Linux + $ mv rke_linux-amd64 rke + # Windows PowerShell + > mv rke_windows-amd64.exe rke.exe + ``` + +3. Make the RKE binary that you just downloaded executable. Open Terminal, change directory to the location of the RKE binary, and then run one of the commands below. >**Using Windows?** >The file is already an executable. Skip to [Prepare the Nodes for the Kubernetes Cluster](#prepare-the-nodes-for-the-kubernetes-cluster). ``` - # MacOS - $ chmod +x rke_darwin-amd64 - # Linux - $ chmod +x rke_linux-amd64 + $ chmod +x rke ``` -3. Confirm that RKE is now executable by running the following command: +4. Confirm that RKE is now executable by running the following command: ``` - # MacOS - $ ./rke_darwin-amd64 --version - # Linux - $ ./rke_linux-amd64 --version + $ rke --version ``` ## Prepare the Nodes for the Kubernetes cluster @@ -60,14 +65,15 @@ There are two easy ways to create a `cluster.yml`: To create a new `cluster.yml`, run `rke config` and this command prompts you for all the information needed to build your cluster. Review [our cluster configuration options]({{< baseurl >}}/rke/v0.1.x/en/config-options/) to understand what each question means. ``` -./rke_darwin-amd64 config +rke config ``` After answering the list of questions, there is a `cluster.yml` created in the directory where you launched the `rke config` command. After the `cluster.yml` is created, you can edit the file to make any changes. #### Creating a Basic `cluster.yml` + ``` -$ rke config --name cluster.yml +rke config --name cluster.yml ``` After answering the list of questions, there is a `cluster.yml` created in the directory where you launched the `rke config` command. @@ -77,7 +83,7 @@ After answering the list of questions, there is a `cluster.yml` created in the d If you want an empty `cluster.yml` template, you can use the `--empty` flag so that a template is produced, but there are no values in the template. ``` -$ rke config --empty --name cluster.yml +rke config --empty --name cluster.yml ``` #### Printing the `cluster.yml` @@ -85,7 +91,7 @@ $ rke config --empty --name cluster.yml Instead of creating a file, you can print the generated configuration to stdout using the `--print` flag. ``` -$ rke config --print +rke config --print ``` ### High Availability @@ -99,16 +105,8 @@ To create an HA cluster, specify more than one host with role `controlplane`. After you've created your `cluster.yml`, you can deploy your cluster with a simple command. This command assumes the `cluster.yml` file is in the same directory as where you are running the command. ``` -# MacOS -$ ./rke_darwin-amd64 up -# Linux -$ ./rke_linux-amd64 up -``` +rke up -There will be log statements as the Kubernetes cluster is created. - -``` -$ ./rke_darwin-amd64 up INFO[0000] Building Kubernetes cluster INFO[0000] [dialer] Setup tunnel for host [10.0.0.1] INFO[0000] [network] Deploying port listener containers @@ -123,9 +121,11 @@ The last line should read `Finished building Kubernetes cluster successfully` to In order to start interacting with your Kubernetes cluster, you will use a different binary called `kubectl`. You will need to [install kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) on your local machine. You can connect to the RKE created cluster by using the `kube_config_cluster.yml` that was generated when you deployed Kubernetes. +Confirm that kubectl is working by checking the version of your Kubernetes cluster + ``` -# Confirm that kubectl is working by checking the version of your Kubernetes cluster -$ kubectl --kubeconfig kube_config_cluster.yml version +kubectl --kubeconfig kube_config_cluster.yml version + Client Version: version.Info{Major:"1", Minor:"10", GitVersion:"v1.10.0", GitCommit:"fc32d2f3698e36b93322a3465f63a14e9f0eaead", GitTreeState:"clean", BuildDate:"2018-03-27T00:13:02Z", GoVersion:"go1.9.4", Compiler:"gc", Platform:"darwin/amd64"} Server Version: version.Info{Major:"1", Minor:"8+", GitVersion:"v1.8.9-rancher1", GitCommit:"68595e18f25e24125244e9966b1e5468a98c1cd4", GitTreeState:"clean", BuildDate:"2018-03-13T04:37:53Z", GoVersion:"go1.8.3", Compiler:"gc", Platform:"linux/amd64"} ``` @@ -133,7 +133,7 @@ Server Version: version.Info{Major:"1", Minor:"8+", GitVersion:"v1.8.9-rancher1" The client and server version are reported, indicating that you have a local `kubectl` client and are able to request the server version from the newly built cluster. Now, you can issue [any kubectl command](https://kubernetes.io/docs/reference/kubectl/kubectl/) to your cluster, like requesting the nodes that are in the cluster. ``` -$ kubectl --kubeconfig kube_config_cluster.yml get nodes +kubectl --kubeconfig kube_config_cluster.yml get nodes NAME STATUS ROLES AGE VERSION 10.0.0.1 Ready controlplane,etcd,worker 35m v1.10.3-rancher1 ``` From 75bb86b29e7de0b372c01f653e27ed7d16ea99af Mon Sep 17 00:00:00 2001 From: Jason Greathouse Date: Wed, 12 Sep 2018 15:22:10 -0500 Subject: [PATCH 12/18] fix some wording around the rke commands. --- .../v2.x/en/backups/backups/ha-backups/_index.md | 2 +- content/rke/v0.1.x/en/installation/_index.md | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/content/rancher/v2.x/en/backups/backups/ha-backups/_index.md b/content/rancher/v2.x/en/backups/backups/ha-backups/_index.md index c9ef3595a95..0437530f6bd 100644 --- a/content/rancher/v2.x/en/backups/backups/ha-backups/_index.md +++ b/content/rancher/v2.x/en/backups/backups/ha-backups/_index.md @@ -61,7 +61,7 @@ To take recurring snapshots, enable the `etcd-snapshot` service, which is a serv 5. Open **Terminal** and change directory to the location of the RKE binary. Your `rancher-cluster.yml` file must reside in the same directory. -6. Run one of the following commands: +6. Run the following command: ``` rke up --config rancher-cluster.yml diff --git a/content/rke/v0.1.x/en/installation/_index.md b/content/rke/v0.1.x/en/installation/_index.md index dc7eed18d51..bead2e1cab9 100644 --- a/content/rke/v0.1.x/en/installation/_index.md +++ b/content/rke/v0.1.x/en/installation/_index.md @@ -62,25 +62,15 @@ There are two easy ways to create a `cluster.yml`: ### Using `rke config` -To create a new `cluster.yml`, run `rke config` and this command prompts you for all the information needed to build your cluster. Review [our cluster configuration options]({{< baseurl >}}/rke/v0.1.x/en/config-options/) to understand what each question means. - -``` -rke config -``` - -After answering the list of questions, there is a `cluster.yml` created in the directory where you launched the `rke config` command. After the `cluster.yml` is created, you can edit the file to make any changes. - -#### Creating a Basic `cluster.yml` +Run `rke config` to create a new `cluster.yml` in the current directory. This command will prompt you for all the information needed to build a cluster. See [cluster configuration options]({{< baseurl >}}/rke/v0.1.x/en/config-options/) for details on the various options. ``` rke config --name cluster.yml ``` -After answering the list of questions, there is a `cluster.yml` created in the directory where you launched the `rke config` command. - #### Creating an Empty `cluster.yml` -If you want an empty `cluster.yml` template, you can use the `--empty` flag so that a template is produced, but there are no values in the template. +You can create an empty template `cluster.yml` file by specifying the `--empty` flag. ``` rke config --empty --name cluster.yml From 43391c3bfdf6a82ca1b9a6eb4b6024b28ee3d14e Mon Sep 17 00:00:00 2001 From: lvuch Date: Thu, 13 Sep 2018 09:38:18 -0700 Subject: [PATCH 13/18] search and list pages --- config.toml | 6 +- .../installation/ha/kubernetes-rke/_index.md | 18 ++--- layouts/_default/list.html | 6 +- src/js/app.js | 80 ++++++++++++------- 4 files changed, 70 insertions(+), 40 deletions(-) diff --git a/config.toml b/config.toml index 58b122e7836..81f25129024 100644 --- a/config.toml +++ b/config.toml @@ -8,7 +8,11 @@ pluralizeListTitles = false enableRobotsTXT = true pygmentsCodeFences = true -pygmentsCodeFencesGuessSyntax = true + +PygmentsStyle = "native" + +#pygmentsCodeFencesGuessSyntax = true + [permalinks] inside-pages = "/:filename/" diff --git a/content/rancher/v2.x/en/installation/ha/kubernetes-rke/_index.md b/content/rancher/v2.x/en/installation/ha/kubernetes-rke/_index.md index 979f9dfed00..9df59191d0d 100644 --- a/content/rancher/v2.x/en/installation/ha/kubernetes-rke/_index.md +++ b/content/rancher/v2.x/en/installation/ha/kubernetes-rke/_index.md @@ -11,15 +11,15 @@ Using the sample below create the `rancher-cluster.yml` file. Replace the IP Add ```yaml nodes: - - address: 165.227.114.63 - user: ubuntu - role: [controlplane,worker,etcd] - - address: 165.227.116.167 - user: ubuntu - role: [controlplane,worker,etcd] - - address: 165.227.127.226 - user: ubuntu - role: [controlplane,worker,etcd] + - address: 165.227.114.63 + user: ubuntu + role: [controlplane,worker,etcd] + - address: 165.227.116.167 + user: ubuntu + role: [controlplane,worker,etcd] + - address: 165.227.127.226 + user: ubuntu + role: [controlplane,worker,etcd] ``` #### Common RKE nodes: options diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 817bfdccd56..c0006865931 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -10,18 +10,18 @@
-