public/rancher-docs
1
0
Fork 0
mirror of https://github.com/rancher/rancher-docs.git synced 2026-09-26 04:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflict

Browse Source
This commit is contained in:
Catherine Luse
2021-06-18 13:13:19 -07:00
parent d2d490cebd 92336cbb7c
commit f1fa8b1869
8 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/k3s/latest/en/advanced/_index.md
+6
View File
@@ -388,3 +388,9 @@ It is recommended to turn off firewalld:
```
systemctl disable firewalld --now
```
If enabled, it is required to disable nm-cloud-setup and reboot the node:
```
systemctl disable nm-cloud-setup.service nm-cloud-setup.timer
reboot
```
content/rancher/v2.5/en/deploy-across-clusters/fleet/_index.md
+5
View File
@@ -44,3 +44,8 @@ For details on using Fleet behind a proxy, see [this page.](./proxy)
# Documentation
The Fleet documentation is at [https://fleet.rancher.io/.](https://fleet.rancher.io/)
### Using Fleet Behind a Proxy
For details on using Fleet with a proxy, see [this page.](./proxy)
content/rancher/v2.5/en/deploy-across-clusters/fleet/proxy/_index.md
+3 -3
View File
@@ -19,12 +19,12 @@ For private nodes or private clusters, the environment variables need to be set
# Required Environment Variables
When adding Fleet agent environment variables for the proxy, replace PROXY_IP with your private proxy IP.
When adding Fleet agent environment variables for the proxy, replace <PROXY_IP> with your private proxy IP.
| Variable Name | Value |
|------------------|--------|
| `HTTP_PROXY` | http://PROXY_IP:8888 |
| `HTTPS_PROXY` | http://PROXY_IP:8888
| `HTTP_PROXY` | http://<PROXY_IP>:8888 |
| `HTTPS_PROXY` | http://<PROXY_IP>:8888
| `NO_PROXY` | 127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16,.svc,.cluster.local |
# Setting Environment Variables in the Rancher UI
content/rancher/v2.5/en/project-admin/resource-quotas/quotas-for-projects/_index.md
+1 -1
View File
@@ -28,7 +28,7 @@ The resource quota includes two limits, which you set while creating or editing
In the following diagram, a Rancher administrator wants to apply a resource quota that sets the same CPU and memory limit for every namespace in their project (`Namespace 1-4`). However, in Rancher, the administrator can set a resource quota for the project (`Project Resource Quota`) rather than individual namespaces. This quota includes resource limits for both the entire project (`Project Limit`) and individual namespaces (`Namespace Default Limit`). Rancher then propagates the `Namespace Default Limit` quotas to each namespace (`Namespace Resource Quota`) when created.
<sup>Rancher: Resource Quotas Propagating to Each Namespace</sup>
![Rancher Resource Quota Implementation]({{<baseurl>}}/img/rancher/rancher-resource-quota.svg)
![Rancher Resource Quota Implementation]({{<baseurl>}}/img/rancher/rancher-resource-quota.png)
Let's highlight some more nuanced functionality. If a quota is deleted at the project level, it will also be removed from all namespaces contained within that project, despite any overrides that may exist. Further, updating an existing namespace default limit for a quota at the project level will not result in that value being propagated to existing namespaces in the project; the updated value will only be applied to newly created namespaces in that project. To update a namespace default limit for existing namespaces you can delete and subsequently recreate the quota at the project level with the new default value. This will result in the new default value being applied to all existing namespaces in the project.