From 3f140c72e457fd0b105786495c8e532f9813bc05 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Mon, 9 Jul 2018 17:42:19 -0700 Subject: [PATCH 1/7] 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 2/7] 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 3/7] 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 4/7] 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 5/7] 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 6/7] 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 7/7] 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: