diff --git a/content/k3s/latest/en/advanced/_index.md b/content/k3s/latest/en/advanced/_index.md index a066e71f759..6a8325cb456 100644 --- a/content/k3s/latest/en/advanced/_index.md +++ b/content/k3s/latest/en/advanced/_index.md @@ -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 +``` diff --git a/content/rancher/v2.5/en/deploy-across-clusters/fleet/_index.md b/content/rancher/v2.5/en/deploy-across-clusters/fleet/_index.md index 891a4fffe14..bee613fe34a 100644 --- a/content/rancher/v2.5/en/deploy-across-clusters/fleet/_index.md +++ b/content/rancher/v2.5/en/deploy-across-clusters/fleet/_index.md @@ -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) \ No newline at end of file diff --git a/content/rancher/v2.5/en/deploy-across-clusters/fleet/proxy/_index.md b/content/rancher/v2.5/en/deploy-across-clusters/fleet/proxy/_index.md index 148d0ae5cd7..518f6b51465 100644 --- a/content/rancher/v2.5/en/deploy-across-clusters/fleet/proxy/_index.md +++ b/content/rancher/v2.5/en/deploy-across-clusters/fleet/proxy/_index.md @@ -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 with your private proxy IP. | Variable Name | Value | |------------------|--------| -| `HTTP_PROXY` | http://PROXY_IP:8888 | -| `HTTPS_PROXY` | http://PROXY_IP:8888 +| `HTTP_PROXY` | http://:8888 | +| `HTTPS_PROXY` | http://: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 diff --git a/content/rancher/v2.5/en/project-admin/resource-quotas/quotas-for-projects/_index.md b/content/rancher/v2.5/en/project-admin/resource-quotas/quotas-for-projects/_index.md index 48fd35226c5..63a18ba0f49 100644 --- a/content/rancher/v2.5/en/project-admin/resource-quotas/quotas-for-projects/_index.md +++ b/content/rancher/v2.5/en/project-admin/resource-quotas/quotas-for-projects/_index.md @@ -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. Rancher: Resource Quotas Propagating to Each Namespace -![Rancher Resource Quota Implementation]({{}}/img/rancher/rancher-resource-quota.svg) +![Rancher Resource Quota Implementation]({{}}/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. diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 19e03742357..00fc9a68fe6 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -25,29 +25,24 @@ {{ $product := index $path 1 }} {{ $version := index $path 2 }} {{ $productVersion := printf "%s/%s" $product $version}} - {{ if in .Dir "rancher/v2.x" }} + {{ if in .Dir "/v2.x" }}
We are transitioning to versioned documentation. The v2.x docs will no longer be maintained. For Rancher v2.5 docs, go here. For Rancher v2.0-v2.4 docs, go here.
{{end}} - {{ if in .Dir "rancher/v2.5/en/pipelines" }} + {{ if in .Dir "/pipelines" }}
As of Rancher v2.5, Git-based deployment pipelines are now recommended to be handled with Rancher Continuous Delivery powered by Fleet, available in Cluster Explorer.
{{end}} - {{ if in .Dir "rancher/v2.x/en/pipelines" }} -
- As of Rancher v2.5, Git-based deployment pipelines are now recommended to be handled with Rancher Continuous Delivery powered by Fleet, available in Cluster Explorer. -
- {{end}} - {{ if in .Dir "rancher/v2.5/en/deploy-across-clusters/multi-cluster-apps" }} + {{ if in .Dir "/multi-cluster-apps" }}
As of Rancher v2.5, multi-cluster apps are deprecated. We now recommend using Fleet for deploying apps across clusters. It is available in Cluster Explorer.
{{end}} - {{ if in .Dir "rancher/v2.x/en/deploy-across-clusters/multi-cluster-apps" }} -
- As of Rancher v2.5, multi-cluster apps are deprecated. We now recommend using Fleet for deploying apps across clusters. It is available in Cluster Explorer. + {{ if in .Dir "os/v1.x" }} +
+ RancherOS 1.x is currently in a maintain-only-as-essential mode. It is no longer being actively maintained at a code level other than addressing critical or security fixes. For more information about the support status of RancherOS, see this page.
{{end}} diff --git a/pull_request_template.md b/pull_request_template.md new file mode 100644 index 00000000000..5c99ddf9f89 --- /dev/null +++ b/pull_request_template.md @@ -0,0 +1,10 @@ +When contributing to docs, please don't update the content in the v2.x folder. +It's better to update the versioned docs, for example, the v2.5 or v2.6 docs. + +This content in v2.x was separated into versioned documentation during the v2.5.8 +release. The content relevant to Rancher versions before v2.5 went into the v2.0-v2.4 +folder, while the content related to Rancher v2.5 went into the v2.5 folder. + +We are trying to get the 2.x content to be removed from Google search results. The only +reason we haven't deleted it is because Google search results would lead to 404 +errors if we deleted it. diff --git a/static/img/rancher/rancher-resource-quota.png b/static/img/rancher/rancher-resource-quota.png new file mode 100644 index 00000000000..8986ca15b52 Binary files /dev/null and b/static/img/rancher/rancher-resource-quota.png differ diff --git a/static/img/rancher/rancher-resource-quota.svg b/static/img/rancher/rancher-resource-quota.svg deleted file mode 100644 index 80b3d4203e8..00000000000 --- a/static/img/rancher/rancher-resource-quota.svg +++ /dev/null @@ -1,2 +0,0 @@ - -
Rancher Cluster
[Not supported by viewer]
Rancher Project
[Not supported by viewer]
Namespace 2
[Not supported by viewer]
Namespace Resource Quota
[Not supported by viewer]
Namespace 1
[Not supported by viewer]
Namespace
Resource 
Quota
[Not supported by viewer]
Project
Resource Quota:
[Not supported by viewer]
Project Limit:

CPU Limit: 2000 milli CPUs
Memory Limit: 2048 MiB
[Not supported by viewer]
Namespace 3
[Not supported by viewer]
Namespace Resource Quota
[Not supported by viewer]
Namespace 4
[Not supported by viewer]
Namespace Resource Quota
[Not supported by viewer]
Namespace
Default Limit:

CPU Limit: 500 milli CPUs
Memory Limit 1024 MiB

[Not supported by viewer]
Rancher Admin creates Project Resource Quota. 
Resource quota propagates to namespaces.
Rancher Admin creates Project Resource Quota. <br>Resource quota propagates to namespaces.<br> \ No newline at end of file