+ + + + {{ .Content }} {{ range (.Paginator 5).Pages }} diff --git a/layouts/partials/page-nav.html b/layouts/partials/page-nav.html new file mode 100644 index 00000000000..566e9c70ba3 --- /dev/null +++ b/layouts/partials/page-nav.html @@ -0,0 +1,20 @@ +
+
    + {{ template "page-nav" . }} +
+
+{{ define "page-nav" }} + {{ range .Sections}} +
  • {{ .Title }} + {{if gt (len .Sections) 0}} + +
      + {{ range .Pages }} +
    • {{ .Title }}
      • + {{ end }} + {{ template "page-nav" . }} +
    + {{end}} +
    • + {{ end }} +{{ end }} From b232e2127e18818403aca57d3b3fd0d84dc0b3b4 Mon Sep 17 00:00:00 2001 From: Vincent Fiduccia Date: Wed, 11 Jul 2018 15:50:15 -0700 Subject: [PATCH 098/170] Update _index.md --- content/rancher/v2.x/en/_index.md | 36 ------------------------------- 1 file changed, 36 deletions(-) diff --git a/content/rancher/v2.x/en/_index.md b/content/rancher/v2.x/en/_index.md index 4cd79299258..e35e6d789a9 100644 --- a/content/rancher/v2.x/en/_index.md +++ b/content/rancher/v2.x/en/_index.md @@ -15,39 +15,3 @@ However, for version 2.0, most of Rancher is redesigned to work on Kubernetes. R - Multi-cluster management - Rancher Kubernetes Engine (RKE) - Integration with cloud Kubernetes services, such as GKE, EKS, and AKS. - - From 0831cf5b71e573d2671241b19fc60b7d10920676 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Wed, 11 Jul 2018 16:29:20 -0700 Subject: [PATCH 099/170] corrected links --- .../rancher/v2.x/en/tasks/clusters/adding-storage/_index.md | 2 +- .../adding-storage/provisioning-storage/nfs/_index.md | 4 ++-- .../rancher/v2.x/en/tasks/projects/add-a-secret/_index.md | 2 +- .../rancher/v2.x/en/tasks/projects/add-configmaps/_index.md | 2 +- .../rancher/v2.x/en/tasks/projects/add-registries/_index.md | 2 +- .../v2.x/en/tasks/projects/add-ssl-certificates/_index.md | 2 +- .../tasks/workloads/add-persistent-volume-claim/_index.md | 2 +- .../v2.x/en/tasks/workloads/deploy-workloads/_index.md | 6 +++--- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/content/rancher/v2.x/en/tasks/clusters/adding-storage/_index.md b/content/rancher/v2.x/en/tasks/clusters/adding-storage/_index.md index c539e017cb4..97934cd41c0 100644 --- a/content/rancher/v2.x/en/tasks/clusters/adding-storage/_index.md +++ b/content/rancher/v2.x/en/tasks/clusters/adding-storage/_index.md @@ -6,7 +6,7 @@ draft: true >**Prerequisites:** > ->- Working with storage requires the `Manage Volumes` [role](../../../concepts/global-configuration/users-permissions-roles/#project-role-reference). +>- Working with storage requires the `Manage Volumes` [role]({{< baseurl >}}/rancher/v2.x/en/concepts/global-configuration/users-permissions-roles/#project-role-reference). >- You must have a storage medium provisioned. For more information, see [Provisioning Storage](provisioning-storage). ## Adding a Persistent Volume diff --git a/content/rancher/v2.x/en/tasks/clusters/adding-storage/provisioning-storage/nfs/_index.md b/content/rancher/v2.x/en/tasks/clusters/adding-storage/provisioning-storage/nfs/_index.md index a7f19ee1b8b..c99aa6bd39d 100644 --- a/content/rancher/v2.x/en/tasks/clusters/adding-storage/provisioning-storage/nfs/_index.md +++ b/content/rancher/v2.x/en/tasks/clusters/adding-storage/provisioning-storage/nfs/_index.md @@ -8,7 +8,7 @@ Before you can use the NFS storage volume plug-in with Rancher deployments, you >**Note:** > ->- If you already have an NFS share, you don't need to provision a new NFS server to use the NFS volume plugin within Rancher. Instead, skip the rest of this procedure and complete [Adding Storage](../..). +>- If you already have an NFS share, you don't need to provision a new NFS server to use the NFS volume plugin within Rancher. Instead, skip the rest of this procedure and complete [adding storage]({{< baseurl >}}/rancher/v2.x/en/tasks/clusters/adding-storage/). > >- This procedure demonstrates how to setup an NFS server using Ubuntu, although you should be able to use these instructions for other Linux distros (e.g. Debian, RHEL, Arch Linux, etc.). For official instruction on how to create an NFS server using another Linux distro, consult the distro's documentation. @@ -64,4 +64,4 @@ Before you can use the NFS storage volume plug-in with Rancher deployments, you ## What's Next? -Within Rancher, add the NFS server as a [storage volume](../../#adding-a-persistent-volume) and/or [storage class](../../#adding-storage-classes). After adding the server, you can use it for storage for your deployments. +Within Rancher, add the NFS server as a [storage volume]({{< baseurl >}}/rancher/v2.x/en/tasks/clusters/adding-storage/#adding-a-persistent-volume) and/or [storage class]({{< baseurl >}}/rancher/v2.x/en/tasks/clusters/adding-storage/#adding-storage-classes). After adding the server, you can use it for storage for your deployments. diff --git a/content/rancher/v2.x/en/tasks/projects/add-a-secret/_index.md b/content/rancher/v2.x/en/tasks/projects/add-a-secret/_index.md index 3f09f4cc029..9230b1f586d 100644 --- a/content/rancher/v2.x/en/tasks/projects/add-a-secret/_index.md +++ b/content/rancher/v2.x/en/tasks/projects/add-a-secret/_index.md @@ -32,4 +32,4 @@ When creating a secret, you can make it available for any deployment within a pr Now that you have a secret added to the project or namespace, you can add it to a workload that you deploy. -For more information on adding secret to a workload, see [Deploying Workloads](../../workloads/deploy-workloads). +For more information on adding secret to a workload, see [Deploying Workloads]({{< baseurl >}}/rancher/v2.x/en/tasks/workloads/deploy-workloads/). diff --git a/content/rancher/v2.x/en/tasks/projects/add-configmaps/_index.md b/content/rancher/v2.x/en/tasks/projects/add-configmaps/_index.md index 75bb0a2b077..87a0a8177e3 100644 --- a/content/rancher/v2.x/en/tasks/projects/add-configmaps/_index.md +++ b/content/rancher/v2.x/en/tasks/projects/add-configmaps/_index.md @@ -37,4 +37,4 @@ Now that you have a ConfigMap added to a namespace, you can add it to a workload - Application environment variables. - Specifying parameters for a Volume mounted to the workload. -For more information on adding ConfigMaps to a workload, see [Deploying Workloads](../../workloads/deploy-workloads). \ No newline at end of file +For more information on adding ConfigMaps to a workload, see [Deploying Workloads]({{< baseurl >}}/rancher/v2.x/en/tasks/workloads/deploy-workloads/). \ No newline at end of file diff --git a/content/rancher/v2.x/en/tasks/projects/add-registries/_index.md b/content/rancher/v2.x/en/tasks/projects/add-registries/_index.md index 35506db9e92..1ecc50ba43e 100644 --- a/content/rancher/v2.x/en/tasks/projects/add-registries/_index.md +++ b/content/rancher/v2.x/en/tasks/projects/add-registries/_index.md @@ -30,4 +30,4 @@ Registries are secrets containing credentials used to authenticate with [private Now that you have a registry added to the project or namespace, you can add it to a workload that's deploying an image from your private registry. -For more information on adding a registry to a workload, see [Deploying Workloads](../../workloads/deploy-workloads). +For more information on adding a registry to a workload, see [Deploying Workloads]({{< baseurl >}}/rancher/v2.x/en/tasks/workloads/deploy-workloads/). diff --git a/content/rancher/v2.x/en/tasks/projects/add-ssl-certificates/_index.md b/content/rancher/v2.x/en/tasks/projects/add-ssl-certificates/_index.md index 176ed533568..674e2e0d6db 100644 --- a/content/rancher/v2.x/en/tasks/projects/add-ssl-certificates/_index.md +++ b/content/rancher/v2.x/en/tasks/projects/add-ssl-certificates/_index.md @@ -39,4 +39,4 @@ Add SSL certificates to either projects, namespaces, or both. A project scoped c ## What's Next? -Now you can add the certificate when launching an ingress within the current project or namespace. For more information, see [Adding Ingress](../../workloads/add-ingress/). +Now you can add the certificate when launching an ingress within the current project or namespace. For more information, see [Adding Ingress]({{< baseurl >}}/rancher/v2.x/en/tasks/workloads/add-ingress/). diff --git a/content/rancher/v2.x/en/tasks/workloads/add-persistent-volume-claim/_index.md b/content/rancher/v2.x/en/tasks/workloads/add-persistent-volume-claim/_index.md index f137af0958b..93ef3081f8b 100644 --- a/content/rancher/v2.x/en/tasks/workloads/add-persistent-volume-claim/_index.md +++ b/content/rancher/v2.x/en/tasks/workloads/add-persistent-volume-claim/_index.md @@ -10,7 +10,7 @@ _Persistent Volume Claims_ (or PVCs) are objects that request storage resources - Each Rancher project contains a list of PVCs that you've created, available from the **Volumes** tab. You can reuse these PVCs when creating deployments in the future. >**Prerequisite:** -> You must have a pre-provisioned [persistent volume](../../clusters/adding-storage/#adding-a-persistent-volume) available for use, or you must have a [storage class created](../../clusters/adding-storage/adding-storage-classes) that dynamically creates a volume upon request from the workload. +> You must have a pre-provisioned [persistent volume]({{< baseurl >}}/rancher/v2.x/en/tasks/clusters/adding-storage/#adding-a-persistent-volume) available for use, or you must have a [storage class created]({{< baseurl >}}/rancher/v2.x/en/tasks/clusters/adding-storage/#adding-storage-classes) that dynamically creates a volume upon request from the workload. 1. From the **Global** view, open the project containing a workload that you want to add a PVC to. diff --git a/content/rancher/v2.x/en/tasks/workloads/deploy-workloads/_index.md b/content/rancher/v2.x/en/tasks/workloads/deploy-workloads/_index.md index 1193f98e31f..0b39a6824ec 100644 --- a/content/rancher/v2.x/en/tasks/workloads/deploy-workloads/_index.md +++ b/content/rancher/v2.x/en/tasks/workloads/deploy-workloads/_index.md @@ -23,13 +23,13 @@ Deploy a workload to run an application in one or more containers. - **Environment Variables** - Use this section to either specify environment variables for your workload to consume on the fly, or to pull them from another source, such as a secret or [ConfigMap](../../projects/add-configmaps). + Use this section to either specify environment variables for your workload to consume on the fly, or to pull them from another source, such as a secret or [ConfigMap]({{< baseurl >}}/rancher/v2.x/en/tasks/projects/add-configmaps/). - **Node Scheduling** - **Health Check** - **Volumes** - Use this section to add storage for your workload. You can manually specify the volume that you want to add, use a persistent volume claim to dynamically create a volume for the workload, or read data for a volume to use from a file such as a [ConfigMap](../../projects/add-configmaps). + Use this section to add storage for your workload. You can manually specify the volume that you want to add, use a persistent volume claim to dynamically create a volume for the workload, or read data for a volume to use from a file such as a [ConfigMap]({{< baseurl >}}/rancher/v2.x/en/tasks/projects/add-configmaps/). - **Scaling/Upgrade Policy** @@ -39,7 +39,7 @@ Deploy a workload to run an application in one or more containers. > >- In [Amazon AWS](https://aws.amazon.com/), the nodes must be in the same Availability Zone and possess IAM permissions to attach/unattach volumes. > - >- The cluster must be using the [AWS cloud provider](https://kubernetes.io/docs/concepts/cluster-administration/cloud-providers/#aws) option. For more information on enabling this option see [Creating an Amazon EC2 Cluster](../../clusters/creating-a-cluster/create-cluster-amazon-ec2/) or [Creating a Custom Cluster](../../clusters/creating-a-cluster/create-cluster-custom/). + >- The cluster must be using the [AWS cloud provider](https://kubernetes.io/docs/concepts/cluster-administration/cloud-providers/#aws) option. For more information on enabling this option see [Creating an Amazon EC2 Cluster]({{< baseurl >}}/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-amazon-ec2/) or [Creating a Custom Cluster]({{< baseurl >}}/rancher/v2.x/en/tasks/clusters/creating-a-cluster/create-cluster-custom/). 1. Click **Show Advanced Options** and configure: From c7a074d7e7801e005172b025f8ce465e6c56e908 Mon Sep 17 00:00:00 2001 From: Ramiro Batista da Luz Date: Thu, 12 Jul 2018 11:46:30 -0300 Subject: [PATCH 100/170] Update _index.md --- content/rancher/v2.x/en/concepts/workloads/_index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/rancher/v2.x/en/concepts/workloads/_index.md b/content/rancher/v2.x/en/concepts/workloads/_index.md index dcf7ed4300c..395bcd0b63e 100644 --- a/content/rancher/v2.x/en/concepts/workloads/_index.md +++ b/content/rancher/v2.x/en/concepts/workloads/_index.md @@ -27,7 +27,7 @@ Kubernetes divides workloads into different types. The most popular types suppor - [DaemonSets](https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/) - _Daemonsets_ ensures that every node in the cluster runs a copy of pod. For use cases where where you're collecting logs or monitoring node performance, this daemon-like workload works best. + _Daemonsets_ ensures that every node in the cluster runs a copy of pod. For use cases where you're collecting logs or monitoring node performance, this daemon-like workload works best. - [Jobs](https://kubernetes.io/docs/concepts/workloads/controllers/jobs-run-to-completion/) @@ -60,4 +60,4 @@ There are several types of services available in Rancher. The descriptions below - **LoadBalancer** - >Exposes the service externally using a cloud provider’s load balancer. `NodePort` and `ClusterIP` services, to which the external load balancer will route, are automatically created. \ No newline at end of file + >Exposes the service externally using a cloud provider’s load balancer. `NodePort` and `ClusterIP` services, to which the external load balancer will route, are automatically created. From 06daab11b5233d10b7bfc07cbf871d96c233b4c2 Mon Sep 17 00:00:00 2001 From: vadym-serdiuk Date: Thu, 12 Jul 2018 10:19:05 +0300 Subject: [PATCH 101/170] Update _index.md There is a mistake in the rke command making snapshot. the config file should be from the rke, not from the kube. --- content/rancher/v2.x/en/upgrades/ha-server-upgrade/_index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/rancher/v2.x/en/upgrades/ha-server-upgrade/_index.md b/content/rancher/v2.x/en/upgrades/ha-server-upgrade/_index.md index 84e5ed2aa93..0eeb03fd682 100644 --- a/content/rancher/v2.x/en/upgrades/ha-server-upgrade/_index.md +++ b/content/rancher/v2.x/en/upgrades/ha-server-upgrade/_index.md @@ -19,9 +19,9 @@ To upgrade Rancher 2.x running in a high availability configuration, run an upgr ``` # MacOS - ./rke_darwin-amd64 etcd snapshot-save --name --config kube_config_rancher-cluster.yml + ./rke_darwin-amd64 etcd snapshot-save --name --config rancher-cluster.yml # Linux - ./rke_linux-amd64 etcd snapshot-save --name --config kube_config_rancher-cluster.yml + ./rke_linux-amd64 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`. From 3f140c72e457fd0b105786495c8e532f9813bc05 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Mon, 9 Jul 2018 17:42:19 -0700 Subject: [PATCH 102/170] adding links --- .../global-configuration/authentication/_index.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/content/rancher/v2.x/en/concepts/global-configuration/authentication/_index.md b/content/rancher/v2.x/en/concepts/global-configuration/authentication/_index.md index 94840b7de1f..6346c947042 100644 --- a/content/rancher/v2.x/en/concepts/global-configuration/authentication/_index.md +++ b/content/rancher/v2.x/en/concepts/global-configuration/authentication/_index.md @@ -22,9 +22,13 @@ However, Rancher also provides local authentication. In most cases, you should use an external authentication service over local, as external authentication allows user management from a central location. However, you may want a few local authentication users for managing Rancher under rare circumstances, such as if Active Directory is down. +<<<<<<< HEAD For more information on how to configure external authentication or local authentication, see [Authentication](../../../tasks/global-configuration/authentication/). ### External Authentication Configuration and Principal Users +======= +## External Authentication Configuration and Principal Users +>>>>>>> adding links Configuration of external authentication requires: @@ -55,3 +59,10 @@ Configuration of external authentication affects how principal users are managed 6. The external principal and the local principal share the same access rights. +<<<<<<< HEAD +======= + +## Related Links + +- [Configuring Authentication]({{< baseurl >}}/rancher/v2.x/en/tasks/global-configuration/authentication) +>>>>>>> adding links From 5c7366cb7c58c40be7c185a16929a3fce4503243 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Tue, 10 Jul 2018 12:02:25 -0700 Subject: [PATCH 103/170] updating relative links with absolute links --- .../clusters/cloud-providers/_index.md | 10 ++++++++++ .../authentication/_index.md | 9 --------- .../node-drivers/_index.md | 3 +++ .../node-templates/_index.md | 3 +++ .../pod-security-policies/_index.md | 10 ++++++++++ .../users-permissions-roles/_index.md | 5 +++++ .../v2.x/en/concepts/load-balancing/_index.md | 19 +++++++++++++++++++ .../v2.x/en/concepts/logging/_index.md | 5 +++++ .../v2.x/en/concepts/projects/_index.md | 4 ++++ .../v2.x/en/concepts/resources/_index.md | 11 +++++++++-- .../en/concepts/service-discovery/_index.md | 11 +++++++++++ .../en/concepts/volumes-and-storage/_index.md | 13 ++++++++++++- .../v2.x/en/concepts/workloads/_index.md | 10 ++++++++++ .../workloads/add-a-dns-record/_index.md | 9 ++++++++- 14 files changed, 109 insertions(+), 13 deletions(-) diff --git a/content/rancher/v2.x/en/concepts/clusters/cloud-providers/_index.md b/content/rancher/v2.x/en/concepts/clusters/cloud-providers/_index.md index 0385ddc78c0..9df6c2b579d 100644 --- a/content/rancher/v2.x/en/concepts/clusters/cloud-providers/_index.md +++ b/content/rancher/v2.x/en/concepts/clusters/cloud-providers/_index.md @@ -156,3 +156,13 @@ Last thing you will need to do, is assign the appropriate permissions to your Ap Custom Azure Network Security Group needed to allow Azure Load Balancers to work. If you provision hosts using Rancher Machine Azure driver, you will need to edit them manually to assign them to this Network Security Group. You should already assign custom hosts to this Network Security Group during provisioning. Only hosts expected to be Load Balancer backends need to be in this group. + +## Related Links + +### External Links + +- [Cloud Providers](https://kubernetes.io/docs/concepts/cluster-administration/cloud-providers/) + +### Tutorials + +- [Creating a Cluster]({{< baseurl >}}/rancher/v2.x/en/tasks/clusters/creating-a-cluster/) diff --git a/content/rancher/v2.x/en/concepts/global-configuration/authentication/_index.md b/content/rancher/v2.x/en/concepts/global-configuration/authentication/_index.md index 6346c947042..07e4d8f5946 100644 --- a/content/rancher/v2.x/en/concepts/global-configuration/authentication/_index.md +++ b/content/rancher/v2.x/en/concepts/global-configuration/authentication/_index.md @@ -22,13 +22,7 @@ However, Rancher also provides local authentication. In most cases, you should use an external authentication service over local, as external authentication allows user management from a central location. However, you may want a few local authentication users for managing Rancher under rare circumstances, such as if Active Directory is down. -<<<<<<< HEAD -For more information on how to configure external authentication or local authentication, see [Authentication](../../../tasks/global-configuration/authentication/). - -### External Authentication Configuration and Principal Users -======= ## External Authentication Configuration and Principal Users ->>>>>>> adding links Configuration of external authentication requires: @@ -59,10 +53,7 @@ Configuration of external authentication affects how principal users are managed 6. The external principal and the local principal share the same access rights. -<<<<<<< HEAD -======= ## Related Links - [Configuring Authentication]({{< baseurl >}}/rancher/v2.x/en/tasks/global-configuration/authentication) ->>>>>>> adding links diff --git a/content/rancher/v2.x/en/concepts/global-configuration/node-drivers/_index.md b/content/rancher/v2.x/en/concepts/global-configuration/node-drivers/_index.md index 943c9c0d4da..8c48bd59139 100644 --- a/content/rancher/v2.x/en/concepts/global-configuration/node-drivers/_index.md +++ b/content/rancher/v2.x/en/concepts/global-configuration/node-drivers/_index.md @@ -8,3 +8,6 @@ Out-of-the-box, Rancher provides support for creating clusters using many popula For more information on creating node drivers, see [https://github.com/rancher/ui-driver-skel](https://github.com/rancher/ui-driver-skel). +## Related Links + +- [Configuring Node Drivers]({{< baseurl >}}/rancher/v2.x/en/tasks/global-configuration/node-drivers) diff --git a/content/rancher/v2.x/en/concepts/global-configuration/node-templates/_index.md b/content/rancher/v2.x/en/concepts/global-configuration/node-templates/_index.md index 31d32312ba3..92929f1fc35 100644 --- a/content/rancher/v2.x/en/concepts/global-configuration/node-templates/_index.md +++ b/content/rancher/v2.x/en/concepts/global-configuration/node-templates/_index.md @@ -7,3 +7,6 @@ You can create new clusters within Rancher using _node templates_. A node templa After you add a node template to Rancher, its stored by the system so that you can use it when creating another cluster later. Node templates are bound to your login. After you add a template, you can remove them from your user profile. +## Related Links + +- [Creating a Cluster]({{< baseurl >}}/rancher/v2.x/en/tasks/clusters/creating-a-cluster) diff --git a/content/rancher/v2.x/en/concepts/global-configuration/pod-security-policies/_index.md b/content/rancher/v2.x/en/concepts/global-configuration/pod-security-policies/_index.md index 7e635fa3235..5fde2ac6d4f 100644 --- a/content/rancher/v2.x/en/concepts/global-configuration/pod-security-policies/_index.md +++ b/content/rancher/v2.x/en/concepts/global-configuration/pod-security-policies/_index.md @@ -17,3 +17,13 @@ Read more about Pod Security Policies in the [Kubernetes Documentation](https:// >**Best Practice:** >Set Pod Security at the cluster level. + +## Related Links + +### External Links + +- [Pod Security Policies](https://kubernetes.io/docs/concepts/policy/pod-security-policy/) + +### Tutorials + +- [Creating Pod Security Policies]({{< baseurl >}}/rancher/v2.x/en/tasks/clusters/adding-a-pod-security-policy) diff --git a/content/rancher/v2.x/en/concepts/global-configuration/users-permissions-roles/_index.md b/content/rancher/v2.x/en/concepts/global-configuration/users-permissions-roles/_index.md index 22847e402a1..0fb2e031d1a 100644 --- a/content/rancher/v2.x/en/concepts/global-configuration/users-permissions-roles/_index.md +++ b/content/rancher/v2.x/en/concepts/global-configuration/users-permissions-roles/_index.md @@ -195,3 +195,8 @@ Roles can be locked by the following users: - Any user assigned the `Administrator` global permission. - Any user assigned the `Custom Users` permission, along with the `Manage Roles` role. +## Related Links + +- [Adding Project Members]({{< baseurl >}}/rancher/v2.x/en/tasks/projects/add-project-members) +- [Adding Project Members]({{< baseurl >}}/rancher/v2.x/en/tasks/clusters/adding-managing-cluster-members) +- [Roles]({{< baseurl >}}/rancher/v2.x/en/tasks/global-configuration/roles) diff --git a/content/rancher/v2.x/en/concepts/load-balancing/_index.md b/content/rancher/v2.x/en/concepts/load-balancing/_index.md index c6f9837225f..f78cdbb88b0 100644 --- a/content/rancher/v2.x/en/concepts/load-balancing/_index.md +++ b/content/rancher/v2.x/en/concepts/load-balancing/_index.md @@ -50,3 +50,22 @@ Other layer-7 load balancers, such as the Google Load Balancer or Nginx Ingress 2. Ask Rancher to generate an xip.io host name for your ingress rule. Rancher will take one of your exposed IPs, say a.b.c.d, and generate a host name ..a.b.c.d.xip.io. The benefit of using xip.io is that you obtain a working entrypoint URL immediately after you create the ingress rule. Setting up your own domain name, on the other hand, requires you to configure DNS servers and wait for DNS to propagate. + +## Related Links + +### External Load Balancers + +#### External Links + +- [Create an External Load Balancer](https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/) + +#### Tutorials + +- [High Availability Installation with External Load Balancer (HTTPS/Layer 7)]({{< baseurl >}}/rancher/v2.x/en/installation/ha-server-install-external-lb) +- [High Availability Installation with External Load Balancer (TCP/Layer 4)]({{< baseurl >}}/rancher/v2.x/en/installation/ha-server-install) +- [Single Node Installation with External Load Balancer]({{< baseurl >}}/rancher/v2.x/en/installation/single-node-install-external-lb) + +### Ingress Controller + +- [Ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/#what-is-ingress) + diff --git a/content/rancher/v2.x/en/concepts/logging/_index.md b/content/rancher/v2.x/en/concepts/logging/_index.md index 47a2b80bb2d..f9643648f0d 100644 --- a/content/rancher/v2.x/en/concepts/logging/_index.md +++ b/content/rancher/v2.x/en/concepts/logging/_index.md @@ -3,3 +3,8 @@ title: Logging weight: 2325 draft: true --- + + +## Related Links + +[Configuring Logging]({{< baseurl >}}/rancher/v2.x/en/tasks/logging/) diff --git a/content/rancher/v2.x/en/concepts/projects/_index.md b/content/rancher/v2.x/en/concepts/projects/_index.md index 7451e4babc7..6da433268a0 100644 --- a/content/rancher/v2.x/en/concepts/projects/_index.md +++ b/content/rancher/v2.x/en/concepts/projects/_index.md @@ -21,3 +21,7 @@ Rancher extends Kubernetes to allow the application of [Pod Security Policies](h Kubernetes resources belong to specific namespaces. Rancher 2.0 relies on namespaces to isolate resources among users and apps. When the user deploys an app from the catalog, for example, he can choose to deploy that app into its own namespace, so that resource names in one app will not conflict with resource names in another. Namespaces must be globally unique. It is often difficult for users to pick unique namespace names. Rancher therefore encourages the pattern where users work with projects, and the system generates unique namespace names automatically. For more information, see the [Kubernetes Namespaces Documentation](https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/). + +## Related Links + +- [Project Tutorials]({{< baseurl >}}/rancher/v2.x/en/tasks/projects) diff --git a/content/rancher/v2.x/en/concepts/resources/_index.md b/content/rancher/v2.x/en/concepts/resources/_index.md index d33cb1443f6..e43ebac1f7f 100644 --- a/content/rancher/v2.x/en/concepts/resources/_index.md +++ b/content/rancher/v2.x/en/concepts/resources/_index.md @@ -10,7 +10,7 @@ Within the context of a Rancher project or namespace, _resources_ are files and - [Secrets](#secrets) - [Registries](#registries) -Rancher extends the application of the Kubernetes namespace resources listed above to [projects](../projects), which are Rancher-specific constructs. In the hierarchy of Rancher objects, projects contain namespaces. Therefore, any resources available within a project are available for all namespaces within that project. +Rancher extends the application of the Kubernetes namespace resources listed above to [projects]({{< baseurl >}}/rancher/v2.x/en/projects), which are Rancher-specific constructs. In the hierarchy of Rancher objects, projects contain namespaces. Therefore, any resources available within a project are available for all namespaces within that project. Within Kubernetes, certificates, registries, and secrets are all considered [secrets](https://kubernetes.io/docs/concepts/configuration/secret/). Therefore, within a single project or namespace, these resources must have unique names to avoid conflicts. Although secrets are primarily used to carry sensitive information, they have other uses as well. Read on below. @@ -37,4 +37,11 @@ When configuring a workload, you'll be able to choose which secrets to include. Registries are secrets containing credentials used to authenticate with [private registries](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/). Deployments use these secrets to authenticate with a private registry and then pull a Docker image hosted on it. ->**Note:** Currently, credentials are pulled automatically only if the workload is created in the Rancher UI and not kubectl. \ No newline at end of file +>**Note:** Currently, credentials are pulled automatically only if the workload is created in the Rancher UI and not kubectl. + +## Related Links + +- [Adding SSL Certificates]({{< baseurl >}}/rancher/v2.x/en/tasks/projects/add-ssl-certificates) +- [Adding ConfigMaps]({{< baseurl >}}/rancher/v2.x/en/tasks/projects/add-configmaps) +- [Adding Secrets]({{< baseurl >}}/rancher/v2.x/en/tasks/projects/add-a-secret) +- [Adding Registries]({{< baseurl >}}/rancher/v2.x/en/tasks/projects/add-registries) diff --git a/content/rancher/v2.x/en/concepts/service-discovery/_index.md b/content/rancher/v2.x/en/concepts/service-discovery/_index.md index d850867a4db..b3dff86b4b8 100644 --- a/content/rancher/v2.x/en/concepts/service-discovery/_index.md +++ b/content/rancher/v2.x/en/concepts/service-discovery/_index.md @@ -3,3 +3,14 @@ title: Service Discovery weight: 2200 draft: true --- + +## Related Links + +### Tutorials + +- [Adding a DNS Record]({{< baseurl >}}/rancher/v2.x/en/tasks/workloads/add-a-dns-record) + +### External Links + +- [Services](https://kubernetes.io/docs/concepts/services-networking/service/) +- [Adding entries to Pod /etc/hosts with HostAliases](https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/) diff --git a/content/rancher/v2.x/en/concepts/volumes-and-storage/_index.md b/content/rancher/v2.x/en/concepts/volumes-and-storage/_index.md index a44e9f588e9..a7cb44d3c05 100644 --- a/content/rancher/v2.x/en/concepts/volumes-and-storage/_index.md +++ b/content/rancher/v2.x/en/concepts/volumes-and-storage/_index.md @@ -45,4 +45,15 @@ In addition to customizing each provisioner's options for the storage class, you Finally, you can define custom `MountOptions` for the persistent volume created. -`parameters` are specific to each cloud storage provisioner. For full information about the storage classes provisioner parameters, refer to the official [Kubernetes documentation](https://kubernetes.io/docs/concepts/storage/storage-classes/#parameters). \ No newline at end of file +`parameters` are specific to each cloud storage provisioner. For full information about the storage classes provisioner parameters, refer to the official [Kubernetes documentation](https://kubernetes.io/docs/concepts/storage/storage-classes/#parameters). + +## Related Links + +### External Docs + +- [Storage](https://kubernetes.io/docs/concepts/storage/) + +### Tutorials + +- [Adding Storage]({{< baseurl >}}/rancher/v2.x/en/tasks/clusters/adding-storage/provisioning-storage) +- [Adding Persistent Volume Claims]({{< baseurl >}}/rancher/v2.x/en/tasks/workloads/add-persistent-volume-claim) diff --git a/content/rancher/v2.x/en/concepts/workloads/_index.md b/content/rancher/v2.x/en/concepts/workloads/_index.md index 395bcd0b63e..9499ee46152 100644 --- a/content/rancher/v2.x/en/concepts/workloads/_index.md +++ b/content/rancher/v2.x/en/concepts/workloads/_index.md @@ -61,3 +61,13 @@ There are several types of services available in Rancher. The descriptions below - **LoadBalancer** >Exposes the service externally using a cloud provider’s load balancer. `NodePort` and `ClusterIP` services, to which the external load balancer will route, are automatically created. + +## Related Links + +### External Links + +- [Services](https://kubernetes.io/docs/concepts/services-networking/service/) + +### Tutorials + +- [Workloads]({{< baseurl >}}/rancher/v2.x/en/tasks/workloads/) diff --git a/content/rancher/v2.x/en/tasks/workloads/add-a-dns-record/_index.md b/content/rancher/v2.x/en/tasks/workloads/add-a-dns-record/_index.md index a20ca192b1f..a0e7096093e 100644 --- a/content/rancher/v2.x/en/tasks/workloads/add-a-dns-record/_index.md +++ b/content/rancher/v2.x/en/tasks/workloads/add-a-dns-record/_index.md @@ -42,4 +42,11 @@ However, you also have the option of creating additional Service Discovery recor **Result:** A new DNS record is created. - You can view the record by from the project's **Service Discovery** tab. -- When you visit the new DNS name for the new record that you created (`..svc.cluster.local`), it resolves the chosen namespace. \ No newline at end of file +- When you visit the new DNS name for the new record that you created (`..svc.cluster.local`), it resolves the chosen namespace. +### Tutorials + +- [Service Discovery]({{< baseurl >}}/rancher/v2.x/en/concepts/service-discovery) + +### External Links + +- [Adding entries to Pod /etc/hosts with HostAliases](https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/) From c4e9d99fe05bab2bb03763d598e0d374b813769d Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Thu, 5 Jul 2018 16:47:48 -0700 Subject: [PATCH 104/170] added prereq stating to copy etcd snapshot to all your etcd nodes --- .../v2.x/en/tasks/workloads/add-a-dns-record/_index.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/content/rancher/v2.x/en/tasks/workloads/add-a-dns-record/_index.md b/content/rancher/v2.x/en/tasks/workloads/add-a-dns-record/_index.md index a0e7096093e..aaba2afdc6f 100644 --- a/content/rancher/v2.x/en/tasks/workloads/add-a-dns-record/_index.md +++ b/content/rancher/v2.x/en/tasks/workloads/add-a-dns-record/_index.md @@ -2,6 +2,7 @@ title: Adding a DNS Record weight: 75 --- + For every workload created, a complementing Service Discovery entry is created. This Service Discovery entry enables DNS resolution for the workload's pods using the following naming convention: `..svc.cluster.local`. @@ -43,6 +44,9 @@ However, you also have the option of creating additional Service Discovery recor - You can view the record by from the project's **Service Discovery** tab. - When you visit the new DNS name for the new record that you created (`..svc.cluster.local`), it resolves the chosen namespace. + +## Related Links + ### Tutorials - [Service Discovery]({{< baseurl >}}/rancher/v2.x/en/concepts/service-discovery) From 3ba0541af46c954422c2efd7f4023f946d2ccc97 Mon Sep 17 00:00:00 2001 From: Denise Schannon Date: Mon, 9 Jul 2018 19:16:34 -0700 Subject: [PATCH 105/170] nginx references --- .../ha-server-install-external-lb/nginx/_index.md | 4 ++++ .../en/config-options/add-ons/ingress-controllers/_index.md | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/content/rancher/v2.x/en/installation/ha-server-install-external-lb/nginx/_index.md b/content/rancher/v2.x/en/installation/ha-server-install-external-lb/nginx/_index.md index 796e0ab9437..b9aa4cb7951 100644 --- a/content/rancher/v2.x/en/installation/ha-server-install-external-lb/nginx/_index.md +++ b/content/rancher/v2.x/en/installation/ha-server-install-external-lb/nginx/_index.md @@ -12,8 +12,12 @@ For help installing NGINX, refer to their [install documentation](https://www.ng After installing NGINX, you need to create the NGINX config file, `/etc/nginx/conf.d/rancher.conf`, with the IP addresses for your Linux nodes, chosen FQDN and location of the certificate file and certificate key file. +<<<<<<< HEAD >**Note:** The configuration example in this procedure includes the minimum configurations needed to use to use Nginx as a Layer 7 load balancer with Rancher. For full documentation on all Nginx Layer 7 configuration options available, see the [Nginx HTTP Load Balancer Documentation](https://docs.nginx.com/nginx/admin-guide/load-balancer/http-load-balancer/). +======= +>**Note:** The example configuration below does not include all available Nginx options and may not be suitable for your production environment. For full configuration documentation, see [NGINX Load Balancing - HTTP Load Balancer](https://docs.nginx.com/nginx/admin-guide/load-balancer/http-load-balancer/). +>>>>>>> nginx references 1. Copy and paste the code sample below into your favorite text editor. Save it as `/etc/nginx/conf.d/rancher.conf`. diff --git a/content/rke/v0.1.x/en/config-options/add-ons/ingress-controllers/_index.md b/content/rke/v0.1.x/en/config-options/add-ons/ingress-controllers/_index.md index bcd3ed5ee3a..90c01a4b789 100644 --- a/content/rke/v0.1.x/en/config-options/add-ons/ingress-controllers/_index.md +++ b/content/rke/v0.1.x/en/config-options/add-ons/ingress-controllers/_index.md @@ -39,7 +39,11 @@ ingress: ``` ## Configuring NGINX Ingress Controller +<<<<<<< HEAD For the configuration of nginx, there are configuration options available in Kubernetes. There are a [list of options for the NGINX config map](https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/configmap.md) , [command line extra_args](https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/cli-arguments.md) and [annotations](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/annotations/). +======= +For the configuration of nginx, there are some configuration options. There are a [list of options](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/configmap/) for the nginx config map and [command line extra_args](https://kubernetes.github.io/ingress-nginx/user-guide/cli-arguments/). +>>>>>>> nginx references ```yaml ingress: From fe12a1d10c5e59f60b423aae5cb26ecb89101cb2 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Tue, 10 Jul 2018 10:15:35 -0700 Subject: [PATCH 106/170] undrafting, adding weight --- .../rancher/v2.x/en/tasks/workloads/add-a-sidecar/_index.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/content/rancher/v2.x/en/tasks/workloads/add-a-sidecar/_index.md b/content/rancher/v2.x/en/tasks/workloads/add-a-sidecar/_index.md index a044732e71f..a683cf64bc7 100644 --- a/content/rancher/v2.x/en/tasks/workloads/add-a-sidecar/_index.md +++ b/content/rancher/v2.x/en/tasks/workloads/add-a-sidecar/_index.md @@ -1,6 +1,10 @@ --- title: Adding a Sidecar +<<<<<<< HEAD weight: 200 +======= +weight: +>>>>>>> undrafting, adding weight --- A _sidecar_ is a container that extends or enhances the main container in a pod. The main container and the sidecar share a pod, and therefore share the same network space and storage. You can add sidecars to existing workloads by using the **Add a Sidecar** option. From 30c406d43f8d05471cae66ffef1503c8a7a66163 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Wed, 11 Jul 2018 16:48:23 -0700 Subject: [PATCH 107/170] fixed link and conflict --- content/rancher/v2.x/en/concepts/resources/_index.md | 2 +- .../ha-server-install-external-lb/nginx/_index.md | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/content/rancher/v2.x/en/concepts/resources/_index.md b/content/rancher/v2.x/en/concepts/resources/_index.md index e43ebac1f7f..70411d7e264 100644 --- a/content/rancher/v2.x/en/concepts/resources/_index.md +++ b/content/rancher/v2.x/en/concepts/resources/_index.md @@ -10,7 +10,7 @@ Within the context of a Rancher project or namespace, _resources_ are files and - [Secrets](#secrets) - [Registries](#registries) -Rancher extends the application of the Kubernetes namespace resources listed above to [projects]({{< baseurl >}}/rancher/v2.x/en/projects), which are Rancher-specific constructs. In the hierarchy of Rancher objects, projects contain namespaces. Therefore, any resources available within a project are available for all namespaces within that project. +Rancher extends the application of the Kubernetes namespace resources listed above to [projects]({{< baseurl >}}/rancher/v2.x/en/concepts/projects/), which are Rancher-specific constructs. In the hierarchy of Rancher objects, projects contain namespaces. Therefore, any resources available within a project are available for all namespaces within that project. Within Kubernetes, certificates, registries, and secrets are all considered [secrets](https://kubernetes.io/docs/concepts/configuration/secret/). Therefore, within a single project or namespace, these resources must have unique names to avoid conflicts. Although secrets are primarily used to carry sensitive information, they have other uses as well. Read on below. diff --git a/content/rancher/v2.x/en/installation/ha-server-install-external-lb/nginx/_index.md b/content/rancher/v2.x/en/installation/ha-server-install-external-lb/nginx/_index.md index b9aa4cb7951..dbfba4ffe81 100644 --- a/content/rancher/v2.x/en/installation/ha-server-install-external-lb/nginx/_index.md +++ b/content/rancher/v2.x/en/installation/ha-server-install-external-lb/nginx/_index.md @@ -12,12 +12,7 @@ For help installing NGINX, refer to their [install documentation](https://www.ng After installing NGINX, you need to create the NGINX config file, `/etc/nginx/conf.d/rancher.conf`, with the IP addresses for your Linux nodes, chosen FQDN and location of the certificate file and certificate key file. -<<<<<<< HEAD ->**Note:** The configuration example in this procedure includes the minimum configurations needed to use -to use Nginx as a Layer 7 load balancer with Rancher. For full documentation on all Nginx Layer 7 configuration options available, see the [Nginx HTTP Load Balancer Documentation](https://docs.nginx.com/nginx/admin-guide/load-balancer/http-load-balancer/). -======= >**Note:** The example configuration below does not include all available Nginx options and may not be suitable for your production environment. For full configuration documentation, see [NGINX Load Balancing - HTTP Load Balancer](https://docs.nginx.com/nginx/admin-guide/load-balancer/http-load-balancer/). ->>>>>>> nginx references 1. Copy and paste the code sample below into your favorite text editor. Save it as `/etc/nginx/conf.d/rancher.conf`. From 86c1df4d954faf00a27a02f81f5cbae364545da1 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Thu, 12 Jul 2018 13:03:50 -0700 Subject: [PATCH 108/170] removed git conflict resolution text --- .../rancher/v2.x/en/tasks/workloads/add-a-sidecar/_index.md | 4 ---- .../en/config-options/add-ons/ingress-controllers/_index.md | 4 ---- 2 files changed, 8 deletions(-) diff --git a/content/rancher/v2.x/en/tasks/workloads/add-a-sidecar/_index.md b/content/rancher/v2.x/en/tasks/workloads/add-a-sidecar/_index.md index a683cf64bc7..a044732e71f 100644 --- a/content/rancher/v2.x/en/tasks/workloads/add-a-sidecar/_index.md +++ b/content/rancher/v2.x/en/tasks/workloads/add-a-sidecar/_index.md @@ -1,10 +1,6 @@ --- title: Adding a Sidecar -<<<<<<< HEAD weight: 200 -======= -weight: ->>>>>>> undrafting, adding weight --- A _sidecar_ is a container that extends or enhances the main container in a pod. The main container and the sidecar share a pod, and therefore share the same network space and storage. You can add sidecars to existing workloads by using the **Add a Sidecar** option. diff --git a/content/rke/v0.1.x/en/config-options/add-ons/ingress-controllers/_index.md b/content/rke/v0.1.x/en/config-options/add-ons/ingress-controllers/_index.md index 90c01a4b789..bcd3ed5ee3a 100644 --- a/content/rke/v0.1.x/en/config-options/add-ons/ingress-controllers/_index.md +++ b/content/rke/v0.1.x/en/config-options/add-ons/ingress-controllers/_index.md @@ -39,11 +39,7 @@ ingress: ``` ## Configuring NGINX Ingress Controller -<<<<<<< HEAD For the configuration of nginx, there are configuration options available in Kubernetes. There are a [list of options for the NGINX config map](https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/configmap.md) , [command line extra_args](https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/cli-arguments.md) and [annotations](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/annotations/). -======= -For the configuration of nginx, there are some configuration options. There are a [list of options](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/configmap/) for the nginx config map and [command line extra_args](https://kubernetes.github.io/ingress-nginx/user-guide/cli-arguments/). ->>>>>>> nginx references ```yaml ingress: From 026be6f787eb034bd0fe5811f71c636c940882dc Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Thu, 12 Jul 2018 14:34:30 -0700 Subject: [PATCH 109/170] undrafting storage docs --- content/rancher/v2.x/en/tasks/clusters/adding-storage/_index.md | 1 - .../tasks/clusters/adding-storage/provisioning-storage/_index.md | 1 - .../clusters/adding-storage/provisioning-storage/nfs/_index.md | 1 - 3 files changed, 3 deletions(-) diff --git a/content/rancher/v2.x/en/tasks/clusters/adding-storage/_index.md b/content/rancher/v2.x/en/tasks/clusters/adding-storage/_index.md index 97934cd41c0..261f51e54e0 100644 --- a/content/rancher/v2.x/en/tasks/clusters/adding-storage/_index.md +++ b/content/rancher/v2.x/en/tasks/clusters/adding-storage/_index.md @@ -1,7 +1,6 @@ --- title: Adding Storage weight: 3500 -draft: true --- >**Prerequisites:** diff --git a/content/rancher/v2.x/en/tasks/clusters/adding-storage/provisioning-storage/_index.md b/content/rancher/v2.x/en/tasks/clusters/adding-storage/provisioning-storage/_index.md index 8aaf0b17de0..e29fc390d43 100644 --- a/content/rancher/v2.x/en/tasks/clusters/adding-storage/provisioning-storage/_index.md +++ b/content/rancher/v2.x/en/tasks/clusters/adding-storage/provisioning-storage/_index.md @@ -1,7 +1,6 @@ --- title: Provisioning Storage weight: 3500 -draft: true --- Rancher supports persistent storage with a variety of volume plugins. However, before you use any of these plugins to bind persistent storage to your workloads, you have to configure the storage itself, whether its a cloud-based solution from a service-provider or an on-prem solution that you manage yourself. diff --git a/content/rancher/v2.x/en/tasks/clusters/adding-storage/provisioning-storage/nfs/_index.md b/content/rancher/v2.x/en/tasks/clusters/adding-storage/provisioning-storage/nfs/_index.md index c99aa6bd39d..ec4a49d4cf1 100644 --- a/content/rancher/v2.x/en/tasks/clusters/adding-storage/provisioning-storage/nfs/_index.md +++ b/content/rancher/v2.x/en/tasks/clusters/adding-storage/provisioning-storage/nfs/_index.md @@ -1,7 +1,6 @@ --- title: Provisioning NFS Storage weight: 3500 -draft: true --- Before you can use the NFS storage volume plug-in with Rancher deployments, you need to provision an NFS server. From 98a4d605f935b37a51bf90b93c155780d004e333 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Thu, 12 Jul 2018 14:34:30 -0700 Subject: [PATCH 110/170] undrafting storage docs --- content/rancher/v2.x/en/tasks/clusters/adding-storage/_index.md | 1 - .../tasks/clusters/adding-storage/provisioning-storage/_index.md | 1 - .../clusters/adding-storage/provisioning-storage/nfs/_index.md | 1 - 3 files changed, 3 deletions(-) diff --git a/content/rancher/v2.x/en/tasks/clusters/adding-storage/_index.md b/content/rancher/v2.x/en/tasks/clusters/adding-storage/_index.md index 97934cd41c0..261f51e54e0 100644 --- a/content/rancher/v2.x/en/tasks/clusters/adding-storage/_index.md +++ b/content/rancher/v2.x/en/tasks/clusters/adding-storage/_index.md @@ -1,7 +1,6 @@ --- title: Adding Storage weight: 3500 -draft: true --- >**Prerequisites:** diff --git a/content/rancher/v2.x/en/tasks/clusters/adding-storage/provisioning-storage/_index.md b/content/rancher/v2.x/en/tasks/clusters/adding-storage/provisioning-storage/_index.md index 8aaf0b17de0..e29fc390d43 100644 --- a/content/rancher/v2.x/en/tasks/clusters/adding-storage/provisioning-storage/_index.md +++ b/content/rancher/v2.x/en/tasks/clusters/adding-storage/provisioning-storage/_index.md @@ -1,7 +1,6 @@ --- title: Provisioning Storage weight: 3500 -draft: true --- Rancher supports persistent storage with a variety of volume plugins. However, before you use any of these plugins to bind persistent storage to your workloads, you have to configure the storage itself, whether its a cloud-based solution from a service-provider or an on-prem solution that you manage yourself. diff --git a/content/rancher/v2.x/en/tasks/clusters/adding-storage/provisioning-storage/nfs/_index.md b/content/rancher/v2.x/en/tasks/clusters/adding-storage/provisioning-storage/nfs/_index.md index c99aa6bd39d..ec4a49d4cf1 100644 --- a/content/rancher/v2.x/en/tasks/clusters/adding-storage/provisioning-storage/nfs/_index.md +++ b/content/rancher/v2.x/en/tasks/clusters/adding-storage/provisioning-storage/nfs/_index.md @@ -1,7 +1,6 @@ --- title: Provisioning NFS Storage weight: 3500 -draft: true --- Before you can use the NFS storage volume plug-in with Rancher deployments, you need to provision an NFS server. From 5f750affcdea4f2ee63fa73c053b7b8446016aae Mon Sep 17 00:00:00 2001 From: Vincent Fiduccia Date: Thu, 12 Jul 2018 15:03:23 -0700 Subject: [PATCH 111/170] Better leader check --- Dockerfile.algolia | 3 --- gulpfile.babel.js | 50 +++++++++++++++++++++++++--------------------- package.json | 1 + 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/Dockerfile.algolia b/Dockerfile.algolia index 9212eafcc24..3107ac79636 100644 --- a/Dockerfile.algolia +++ b/Dockerfile.algolia @@ -3,9 +3,6 @@ FROM rancher/docs:build VOLUME /usr/share/nginx/html/docs WORKDIR /run -ADD https://github.com/rancher/giddyup/releases/download/v0.19.0/giddyup /usr/bin/giddyup -RUN chmod +x /usr/bin/giddyup - COPY gulpfile.babel.js /run/ ENTRYPOINT ["gulp"] diff --git a/gulpfile.babel.js b/gulpfile.babel.js index 1bad647a806..8d9afd90d9f 100644 --- a/gulpfile.babel.js +++ b/gulpfile.babel.js @@ -17,6 +17,7 @@ const fs = require('fs'); const $ = gulpLoadPlugins(); const browserSync = require('browser-sync').create(); +const request = require('request'); const isProduction = process.env.NODE_ENV === 'production'; process.on('SIGINT', (err) => { @@ -29,10 +30,6 @@ process.on('uncaughtException', (err) => { process.exit(1); }); -console.log('&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&') -console.log(process.env) -console.log('&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&') - // -- gulp.task('dev', ['build-dev'], () => { gulp.start('init-watch'); @@ -194,26 +191,33 @@ gulp.task('publish:search-index', (cb) => { env: env }; + request.get({url: 'http://rancher-metadata/2015-07-25/self/service/containers/0', timeout: 2000}, function(err, res, first) { + if ( err ) { + return cb(err); + } - console.log('Waiting'); - setTimeout(() => { - console.log('Done'); - exec('giddyup leader check', opts, function(err, stdout, stderr) { - console.log('Error:', err); - console.log('Stdout:', stdout); - console.log('Stderr:', stderr); - }).on('close', code => { - if (code === 0) { - console.log('Publishing to algolia', process.env.ALGOLIA_INDEX_NAME); - atomicalgolia(process.env.ALGOLIA_INDEX_NAME, process.env.ALGOLIA_INDEX_FILE, {verbose: true}, (err, result) => { - console.log(result); - cb(err); - }); - } else { - console.log('I am not the leader (' + code + ')'); - cb(new Error('Not the leader')); + request.get({url: 'http://rancher-metadata/2015-07-25/self/container/name', timeout: 2000}, function(err, res, me) { + if ( err ) { + return cb(err); } - }); - }, 10000); + console.log('First:', first); + console.log('Me:', me); + + if ( !first || !me ) { + return cb(new Error('Unable to determine who is the leader (' + first + ', ' + me+ ')')); + } + + if ( first !== me ) { + console.log('I am not the leader'); + return cb(); + } + + console.log('Publishing to algolia', process.env.ALGOLIA_INDEX_NAME); + atomicalgolia(process.env.ALGOLIA_INDEX_NAME, process.env.ALGOLIA_INDEX_FILE, {verbose: true}, (err, result) => { + console.log(result); + cb(err); + }); + }); + }); }); diff --git a/package.json b/package.json index 6ef83f75291..7347d0ea7ed 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,7 @@ "moment": "^2.20.1", "node-sass-tilde-importer": "^1.0.0", "rancher-website-theme": "https://github.com/rancherlabs/website-theme.git", + "request": "^2.87.0", "run-sequence": "^2.0.0", "vinyl-buffer": "^1.0.1", "vinyl-source-stream": "^2.0.0" From 6c8b08e410d72f53588f0226d25240c42fb8532f Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Thu, 12 Jul 2018 15:36:53 -0700 Subject: [PATCH 112/170] undrafting cluster resources --- content/rancher/v2.x/en/tasks/projects/add-a-secret/_index.md | 3 +-- .../rancher/v2.x/en/tasks/projects/add-configmaps/_index.md | 1 - .../rancher/v2.x/en/tasks/projects/add-registries/_index.md | 1 - .../v2.x/en/tasks/projects/add-ssl-certificates/_index.md | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/content/rancher/v2.x/en/tasks/projects/add-a-secret/_index.md b/content/rancher/v2.x/en/tasks/projects/add-a-secret/_index.md index 9230b1f586d..c95c8ccb660 100644 --- a/content/rancher/v2.x/en/tasks/projects/add-a-secret/_index.md +++ b/content/rancher/v2.x/en/tasks/projects/add-a-secret/_index.md @@ -1,10 +1,10 @@ --- title: Adding a Secret weight: -draft: true --- [Secrets](https://kubernetes.io/docs/concepts/configuration/secret/#overview-of-secrets) store sensitive data like passwords, tokens, or keys. They may contain one or more key value pairs. + When creating a secret, you can make it available for any deployment within a project, or you can limit it to a single namespace. 1. From the **Global** view, select the project containing the namespace(s) where you want to add a secret. @@ -25,7 +25,6 @@ When creating a secret, you can make it available for any deployment within a pr 1. Click **Save**. - **Result:** Your secret is added to the project or namespace, depending on the scope you chose. You can view the secret in the Rancher UI from the **Resources > Secrets** view. ## What's Next? diff --git a/content/rancher/v2.x/en/tasks/projects/add-configmaps/_index.md b/content/rancher/v2.x/en/tasks/projects/add-configmaps/_index.md index 87a0a8177e3..87476fd20c7 100644 --- a/content/rancher/v2.x/en/tasks/projects/add-configmaps/_index.md +++ b/content/rancher/v2.x/en/tasks/projects/add-configmaps/_index.md @@ -1,7 +1,6 @@ --- title: Adding ConfigMaps weight: -draft: true --- ConfigMaps store general configuration information for an application, such as configuration files, command-line arguments, environment variables, etc. ConfigMaps accept key value pairs in common string formats, like config files or JSON blobs. Add ConfigMaps to your Rancher workspaces so that you can add them to your workloads later. For more information on ConfigMaps, see the official [Kubernetes Documentation: Using ConfigMap](https://kubernetes-v1-4.github.io/docs/user-guide/configmap/). diff --git a/content/rancher/v2.x/en/tasks/projects/add-registries/_index.md b/content/rancher/v2.x/en/tasks/projects/add-registries/_index.md index 1ecc50ba43e..ab5a9f56bde 100644 --- a/content/rancher/v2.x/en/tasks/projects/add-registries/_index.md +++ b/content/rancher/v2.x/en/tasks/projects/add-registries/_index.md @@ -1,7 +1,6 @@ --- title: Adding Registries weight: -draft: true --- Registries are secrets containing credentials used to authenticate with [private registries](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/). Deployments use these secrets to authenticate with a private registry and then pull a Docker image hosted on it. diff --git a/content/rancher/v2.x/en/tasks/projects/add-ssl-certificates/_index.md b/content/rancher/v2.x/en/tasks/projects/add-ssl-certificates/_index.md index 674e2e0d6db..a9dfeaac88d 100644 --- a/content/rancher/v2.x/en/tasks/projects/add-ssl-certificates/_index.md +++ b/content/rancher/v2.x/en/tasks/projects/add-ssl-certificates/_index.md @@ -1,7 +1,6 @@ --- title: Adding SSL Certificates weight: -draft: true --- When you create an ingress within Rancher/Kubernetes, you must provide it with a TLS private key and certificate, which are used to encrypt and decrypt communications that come through the ingress. You can make certificates available for ingress use by navigating to its project or namespace, and then uploading the certificate. From 989d77c6c1bd4ce63c7b8a38312b95bd1c569bbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=28=E2=95=AF=C2=B0=E2=96=A1=C2=B0=EF=BC=89=E2=95=AF?= =?UTF-8?q?=EF=B8=B5=20u=E1=B4=89=C7=9DssnH=20=C9=90=C9=9F=C9=90=CA=87soW?= Date: Sat, 14 Jul 2018 19:34:47 +0200 Subject: [PATCH 113/170] Fix "Creating an API Key" url The current URL gives `404 Not Found` due to pointing to a markdown file `_index.md` which should be removed. --- content/rancher/v2.x/en/concepts/cli-configuration/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/rancher/v2.x/en/concepts/cli-configuration/_index.md b/content/rancher/v2.x/en/concepts/cli-configuration/_index.md index 03bd293e61c..a9ef6bd74b2 100644 --- a/content/rancher/v2.x/en/concepts/cli-configuration/_index.md +++ b/content/rancher/v2.x/en/concepts/cli-configuration/_index.md @@ -14,7 +14,7 @@ The binary can be downloaded directly from the UI. The link can be found in the After you download the Rancher CLI, you need to make a few configurations. Rancher CLI requires: - Your [Rancher Server URL]({{< baseurl >}}/rancher/v2.x/en/tasks/global-configuration/server-url), which is used to connect to Rancher Server. -- An API Bearer Token, which is used to authenticate with Rancher. For more information about obtaining a Bearer Token, see [Creating an API Key]({{< baseurl >}}/rancher/v2.x/en/tasks/user-settings/api-keys/_index.md). +- An API Bearer Token, which is used to authenticate with Rancher. For more information about obtaining a Bearer Token, see [Creating an API Key]({{< baseurl >}}/rancher/v2.x/en/tasks/user-settings/api-keys). ### CLI Authentication From 5496188d2d9f33a761559a018a3b8f837144601b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=28=E2=95=AF=C2=B0=E2=96=A1=C2=B0=EF=BC=89=E2=95=AF?= =?UTF-8?q?=EF=B8=B5=20u=E1=B4=89=C7=9DssnH=20=C9=90=C9=9F=C9=90=CA=87soW?= Date: Sat, 14 Jul 2018 19:04:01 +0200 Subject: [PATCH 114/170] Use https protocol for docker hub url It would be better to set the protocol to https by default. --- content/rancher/v2.x/en/overview/architecture/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/rancher/v2.x/en/overview/architecture/_index.md b/content/rancher/v2.x/en/overview/architecture/_index.md index c449c034b36..ec69826b483 100644 --- a/content/rancher/v2.x/en/overview/architecture/_index.md +++ b/content/rancher/v2.x/en/overview/architecture/_index.md @@ -7,7 +7,7 @@ This section explains how Rancher interacts with the two fundamental technologie ## Docker -Docker is the container packaging and runtime standard. Developers build container images from Dockerfiles and distribute container images from Docker registries. [Docker Hub](http://hub.docker.com) is the most popular public registry. Many organizations also setup private Docker registries. Docker is primarily used to manage containers on individual nodes. +Docker is the container packaging and runtime standard. Developers build container images from Dockerfiles and distribute container images from Docker registries. [Docker Hub](https://hub.docker.com) is the most popular public registry. Many organizations also setup private Docker registries. Docker is primarily used to manage containers on individual nodes. >**Note:** Although Rancher 1.6 supported Docker Swarm clustering technology, it is no longer supported in Rancher 2.0 due to the success of Kubernetes. From 6c56097ffa95de99debc3cfe20e61de328d660c0 Mon Sep 17 00:00:00 2001 From: Denise Date: Mon, 16 Jul 2018 10:27:18 -0700 Subject: [PATCH 115/170] Update _index.md --- content/rancher/v2.x/en/concepts/cli-configuration/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/rancher/v2.x/en/concepts/cli-configuration/_index.md b/content/rancher/v2.x/en/concepts/cli-configuration/_index.md index a9ef6bd74b2..9d9bea0d8af 100644 --- a/content/rancher/v2.x/en/concepts/cli-configuration/_index.md +++ b/content/rancher/v2.x/en/concepts/cli-configuration/_index.md @@ -14,7 +14,7 @@ The binary can be downloaded directly from the UI. The link can be found in the After you download the Rancher CLI, you need to make a few configurations. Rancher CLI requires: - Your [Rancher Server URL]({{< baseurl >}}/rancher/v2.x/en/tasks/global-configuration/server-url), which is used to connect to Rancher Server. -- An API Bearer Token, which is used to authenticate with Rancher. For more information about obtaining a Bearer Token, see [Creating an API Key]({{< baseurl >}}/rancher/v2.x/en/tasks/user-settings/api-keys). +- An API Bearer Token, which is used to authenticate with Rancher. For more information about obtaining a Bearer Token, see [Creating an API Key]({{< baseurl >}}/rancher/v2.x/en/tasks/user-settings/api-keys/). ### CLI Authentication From d4353f636b37cba787fa480a99deb4953bdd455e Mon Sep 17 00:00:00 2001 From: Sebastiaan van Steenis Date: Sun, 15 Jul 2018 22:12:43 +0200 Subject: [PATCH 116/170] Fix headers and add ingress to generic TS --- .../generic-troubleshooting/_index.md | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/content/rancher/v2.x/en/installation/troubleshooting-ha/generic-troubleshooting/_index.md b/content/rancher/v2.x/en/installation/troubleshooting-ha/generic-troubleshooting/_index.md index d1b696dfe42..f68ffb9906a 100644 --- a/content/rancher/v2.x/en/installation/troubleshooting-ha/generic-troubleshooting/_index.md +++ b/content/rancher/v2.x/en/installation/troubleshooting-ha/generic-troubleshooting/_index.md @@ -5,11 +5,11 @@ weight: 5 Below are steps that you can follow to determine what is wrong in your cluster. -* Double check if all the required ports are opened in your (host) firewall +### Double check if all the required ports are opened in your (host) firewall Double check if all the [required ports]({{< baseurl >}}/rancher/v2.x/en/installation/references/) are opened in your (host) firewall. -* All nodes should be present and in **Ready** state +### All nodes should be present and in **Ready** state To check, run the command: @@ -19,7 +19,7 @@ kubectl --kubeconfig kube_config_rancher-cluster.yml get nodes If a node is not shown in this output or a node is not in **Ready** state, you can check the logging of the `kubelet` container. Login to the node and run `docker logs kubelet`. -* All pods/jobs should be in **Running**/**Completed** state +### All pods/jobs should be in **Running**/**Completed** state To check, run the command: @@ -29,13 +29,13 @@ kubectl --kubeconfig kube_config_rancher-cluster.yml get pods --all-namespaces If a pod is not in **Running** state, you can dig into the root cause by running: -

    Describe pod

    +#### Describe pod ``` kubectl --kubeconfig kube_config_rancher-cluster.yml describe pod POD_NAME -n NAMESPACE ``` -

    Pod container logs

    +#### Pod container logs