public/rancher-docs
1
0
Fork 0
mirror of https://github.com/rancher/rancher-docs.git synced 2026-04-15 10:55:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed git conflict resolution text

Browse Source
This commit is contained in:
Mark Bishop
2018-07-12 13:03:50 -07:00
parent 30c406d43f
commit 86c1df4d95
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
content/rancher/v2.x/en/tasks/workloads/add-a-sidecar/_index.md
View File

@@ -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.

4
content/rke/v0.1.x/en/config-options/add-ons/ingress-controllers/_index.md
View File

@@ -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: