public/rancher-docs
1
0
Fork 0
mirror of https://github.com/rancher/rancher-docs.git synced 2026-05-17 10:25:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove merge conflict error

Browse Source
This commit is contained in:
Catherine Luse
2020-10-05 20:57:02 -07:00
parent a2d5176209
commit d9381b52b2
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/k3s/latest/en/networking/_index.md
-14
View File
@@ -73,24 +73,10 @@ If the label is used, the service load balancer only runs on the labeled nodes.
### Disabling the Service LB
<<<<<<< HEAD
To disable it, start each server with the `--disable traefik` option.
=======
To disable the embedded LB, run the server with the `--disable servicelb` option.
>>>>>>> 6d1d47358a30f3687e515ee9a5b4ce1c3afd9a33
This is necessary if you wish to run a different LB, such as MetalLB.
# Nodes Without a Hostname
<<<<<<< HEAD
To disable the embedded load balancer, run the server with the `--disable servicelb` option. This is necessary if you wish to run a different load balancer, such as MetalLB.
Nodes Without a Hostname
------------------------
Some cloud providers, such as Linode, will create machines with "localhost" as the hostname and others may not have a hostname set at all. This can cause problems with domain name resolution. You can run K3s with the `--node-name` flag or `K3S_NODE_NAME` environment variable and this will pass the node name to resolve this issue.
=======
Some cloud providers, such as Linode, will create machines with "localhost" as the hostname and others may not have a hostname set at all. This can cause problems with domain name resolution. You can run K3s with the `--node-name` flag or `K3S_NODE_NAME` environment variable and this will pass the node name to resolve this issue.
>>>>>>> 6d1d47358a30f3687e515ee9a5b4ce1c3afd9a33