Merge pull request #2970 from rancher/master

Merge master to staging
This commit is contained in:
Catherine Luse
2021-01-13 10:31:38 -07:00
committed by GitHub
@@ -145,7 +145,7 @@ Add your IP exceptions to the `noProxy` list. Make sure you add the Pod cluster
```plain
--set proxy="http://<username>:<password>@<proxy_url>:<proxy_port>/"
--set noProxy="127.0.0.0/8\,10.0.0.0/8\,172.16.0.0/12\,192.168.0.0/16,.svc,.cluster.local"
--set noProxy="127.0.0.0/8\,10.0.0.0/8\,172.16.0.0/12\,192.168.0.0/16\,.svc\,.cluster.local"
```
### Additional Trusted CAs