Update no_proxy values to include .kubeflow (#113)

* Update no_proxy values to include .kubeflow
* fix kserve and knative order

README.md

@@ -151,7 +151,7 @@ and `knative-serving` charms to function behind proxy.
 
 1. Set the `http-proxy`, `https-proxy`, and `no-proxy` configs in `kserve-controller` charm
 ```
-juju config kserve-controller http-proxy=<proxy_address>:<proxy_port> https-proxy=<proxy_address>:<proxy_port> no-proxy=<cluster cidr>,<service cluster ip range>,127.0.0.1,localhost,<nodes internal ip(s)>/24,<cluster hostname>,.svc,.local
+juju config kserve-controller http-proxy=<proxy_address>:<proxy_port> https-proxy=<proxy_address>:<proxy_port> no-proxy=<cluster cidr>,<service cluster ip range>,127.0.0.1,localhost,<nodes internal ip(s)>/24,<cluster hostname>,.svc,.local,.kubeflow
 ```
 
 2. Set the `http-proxy`, `https-proxy`, and `no-proxy` configs in `knative-serving` charm
@@ -161,21 +161,21 @@ juju config knative-serving http-proxy=<proxy_address>:<proxy_port> https-proxy=
 
 For Example:
 ```
-juju config knative-serving http-proxy=http://10.0.13.50:3128/ https-proxy=http://10.0.13.50:3128/ no-proxy=10.1.0.0/16,10.152.183.0/24,127.0.0.1,localhost,10.0.2.0/24,ip-10-0-2-157,.svc,.local
+juju config kserve-controller http-proxy=http://10.0.13.50:3128/ https-proxy=http://10.0.13.50:3128/ no-proxy=10.1.0.0/16,10.152.183.0/24,127.0.0.1,localhost,10.0.2.0/24,ip-10-0-2-157,.svc,.local,.kubeflow
 
-juju config kserve-controller http-proxy=http://10.0.13.50:3128/ https-proxy=http://10.0.13.50:3128/ no-proxy=10.1.0.0/16,10.152.183.0/24,127.0.0.1,localhost,10.0.2.0/24,ip-10-0-2-157,.svc,.local
+juju config knative-serving http-proxy=http://10.0.13.50:3128/ https-proxy=http://10.0.13.50:3128/ no-proxy=10.1.0.0/16,10.152.183.0/24,127.0.0.1,localhost,10.0.2.0/24,ip-10-0-2-157,.svc,.local
 ```
 
 #### Running using Notebook
 
 ##### Prerequistes
 
-Edit the PodDefault `tests/proxy-poddefault.yaml` to replace the placeholders for:
+Edit the [PodDefault](tests/proxy-poddefault.yaml.j2) to replace the placeholders for:
 
 * `http_proxy` and `https_proxy` - The address and port of your proxy server, format should be `<proxy_address>:<proxy_port>`
 * `no_proxy` - A comma separated list of items that should not be proxied. It is recommended to include the following:
 
-`<cluster cidr>,<service cluster ip range>,127.0.0.1,localhost,<nodes internal ip(s)>/24,<cluster hostname>,.svc,.local`
+`<cluster cidr>,<service cluster ip range>,127.0.0.1,localhost,<nodes internal ip(s)>/24,<cluster hostname>,.svc,.local,.kubeflow`
 
 where,
 
@@ -202,6 +202,8 @@ where,
 
   * `localhost` and `127.0.0.1` are recommended to avoid proxying requests to `localhost`
 
+  * `.kubeflow`: is needed in the `no-proxy` values to allow communication with the minio service.
+
 
 To run the tests behind proxy using Notebook:
 1. Login to the Dashboard and Create a Profile
@@ -232,7 +234,7 @@ To run the tests behind proxy using Notebook:
 You can pass the `--proxy` flag and set the values for proxies to the tox command and this should automatically apply the required changes to run behind proxy.
 
 ```bash
-tox -e kubeflow-<local|remote> -- --proxy http_proxy="http_proxy:port" https_proxy="https_proxy:port" no_proxy="<cluster cidr>,<service cluster ip range>,127.0.0.1,localhost,<nodes internal ip(s)>/24,<cluster hostname>,.svc,.local"
+tox -e kubeflow-<local|remote> -- --proxy http_proxy="http_proxy:port" https_proxy="https_proxy:port" no_proxy="<cluster cidr>,<service cluster ip range>,127.0.0.1,localhost,<nodes internal ip(s)>/24,<cluster hostname>,.svc,.local,.kubeflow"
 ```
 
 #### Developer Notes

tests/notebooks/kfp_v2/kfp-v2-integration.ipynb

@@ -81,8 +81,7 @@
     "if os.environ.get('HTTP_PROXY') and os.environ.get('HTTPS_PROXY') and os.environ.get('NO_PROXY'):\n",
     "    HTTP_PROXY = os.environ['HTTP_PROXY']\n",
     "    HTTPS_PROXY = os.environ['HTTPS_PROXY']\n",
-    "    # add `.kubeflow` to NO_PROXY needed for pipelines\n",
-    "    NO_PROXY = os.environ['NO_PROXY']+\",.kubeflow\""
+    "    NO_PROXY = os.environ['NO_PROXY']"
    ]
   },
   {

tests/proxy-poddefault.yaml.j2

@@ -37,9 +37,9 @@ spec:
   - name: https_proxy
     value: <https_proxy_address>:<proxy_port>
   - name: NO_PROXY
-    value: <cluster cidr>,<service cluster ip range>,127.0.0.1,localhost,<nodes internal ip(s)>/24,<cluster hostname>,.svc,.local
+    value: <cluster cidr>,<service cluster ip range>,127.0.0.1,localhost,<nodes internal ip(s)>/24,<cluster hostname>,.svc,.local,.kubeflow
   - name: no_proxy
-    value: <cluster cidr>,<service cluster ip range>,127.0.0.1,localhost,<nodes internal ip(s)>/24,<cluster hostname>,.svc,.local
+    value: <cluster cidr>,<service cluster ip range>,127.0.0.1,localhost,<nodes internal ip(s)>/24,<cluster hostname>,.svc,.local,.kubeflow
   selector:
     matchLabels:
       notebook-proxy: "true"