Update Kubernetes proxy URLs (#3405)
diff --git a/deploy/kubernetes/general/README.md b/deploy/kubernetes/general/README.md
index 9dfc070..2a7a2d0 100644
--- a/deploy/kubernetes/general/README.md
+++ b/deploy/kubernetes/general/README.md
@@ -75,7 +75,7 @@
2. Verify we can access the API server:
```shell
-$ curl http://localhost:8001/api/v1/proxy/namespaces/default/services/heron-apiserver:9000/api/v1/version
+$ curl http://localhost:8001/api/v1/namespaces/default/services/heron-apiserver:9000/proxy/api/v1/version
{
"heron.build.git.revision" : "bf9fe93f76b895825d8852e010dffd5342e1f860",
"heron.build.git.status" : "Clean",
@@ -90,7 +90,7 @@
3. Set service_url:
```shell
$ heron config kubernetes \
-set service_url http://localhost:8001/api/v1/proxy/namespaces/default/services/heron-apiserver:9000 \
+set service_url http://localhost:8001/api/v1/namespaces/default/services/heron-apiserver:9000/proxy \
org.apache.heron.examples.api.AckingTopology acking
```
@@ -102,5 +102,5 @@
5. View heron ui:
```
-http://localhost:8001/api/v1/proxy/namespaces/default/services/heron-ui:8889
+http://localhost:8001/api/v1/namespaces/default/services/heron-ui:8889/proxy
```
diff --git a/deploy/kubernetes/minikube/README.md b/deploy/kubernetes/minikube/README.md
index 025ef20..40e8448 100644
--- a/deploy/kubernetes/minikube/README.md
+++ b/deploy/kubernetes/minikube/README.md
@@ -74,7 +74,7 @@
2. Verify we can access the API server:
```shell
-$ curl http://localhost:8001/api/v1/proxy/namespaces/default/services/heron-apiserver:9000/api/v1/version
+$ curl http://localhost:8001/api/v1/namespaces/default/services/heron-apiserver:9000/proxy/api/v1/version
{
"heron.build.git.revision" : "bf9fe93f76b895825d8852e010dffd5342e1f860",
"heron.build.git.status" : "Clean",
@@ -89,7 +89,7 @@
3. Set service_url:
```shell
$ heron config kubernetes \
-set service_url http://localhost:8001/api/v1/proxy/namespaces/default/services/heron-apiserver:9000 \
+set service_url http://localhost:8001/api/v1/namespaces/default/services/heron-apiserver:9000/proxy \
```
4. Submit an example topology:
@@ -100,5 +100,5 @@
5. View heron ui:
```
-http://localhost:8001/api/v1/proxy/namespaces/default/services/heron-ui:8889
+http://localhost:8001/api/v1/namespaces/default/services/heron-ui:8889/proxy
```
diff --git a/heron/schedulers/src/java/org/apache/heron/scheduler/kubernetes/KubernetesConstants.java b/heron/schedulers/src/java/org/apache/heron/scheduler/kubernetes/KubernetesConstants.java
index cc6adca..d1a3b8b 100644
--- a/heron/schedulers/src/java/org/apache/heron/scheduler/kubernetes/KubernetesConstants.java
+++ b/heron/schedulers/src/java/org/apache/heron/scheduler/kubernetes/KubernetesConstants.java
@@ -84,7 +84,7 @@
}
public static final String JOB_LINK =
- "/api/v1/proxy/namespaces/kube-system/services/kubernetes-dashboard/#/pod";
+ "/api/v1/namespaces/kube-system/services/kubernetes-dashboard/proxy/#/pod";
public static final Pattern VALID_POD_NAME_REGEX =
diff --git a/website/content/docs/operators/deployment/schedulers/kubernetes.md b/website/content/docs/operators/deployment/schedulers/kubernetes.md
index 4f264b3..bde1dd9 100644
--- a/website/content/docs/operators/deployment/schedulers/kubernetes.md
+++ b/website/content/docs/operators/deployment/schedulers/kubernetes.md
@@ -321,7 +321,7 @@
```bash
$ heron submit kubernetes \
- --service-url=http://localhost:8001/api/v1/proxy/namespaces/default/services/heron-apiserver:9000 \
+ --service-url=http://localhost:8001/api/v1/namespaces/default/services/heron-apiserver:9000/proxy \
~/.heron/examples/heron-api-examples.jar \
org.apache.heron.examples.api.AckingTopology acking
```
@@ -445,7 +445,7 @@
The [Heron UI](../../../heron-ui) is an in-browser dashboard that you can use to monitor your Heron [topologies](../../../../concepts/topologies). It should already be running in your GKE cluster.
-You can access [Heron UI](../../../heron-ui) in your browser by navigating to http://localhost:8001/api/v1/proxy/namespaces/default/services/heron-ui:8889.
+You can access [Heron UI](../../../heron-ui) in your browser by navigating to http://localhost:8001/api/v1/namespaces/default/services/heron-ui:8889/proxy.
## Heron on Kubernetes configuration
diff --git a/website2/docs/schedulers-k8s-by-hand.md b/website2/docs/schedulers-k8s-by-hand.md
index ed7c4bb..149353d 100644
--- a/website2/docs/schedulers-k8s-by-hand.md
+++ b/website2/docs/schedulers-k8s-by-hand.md
@@ -319,7 +319,7 @@
```bash
$ heron submit kubernetes \
- --service-url=http://localhost:8001/api/v1/proxy/namespaces/default/services/heron-apiserver:9000 \
+ --service-url=http://localhost:8001/api/v1/namespaces/default/services/heron-apiserver:9000/proxy \
~/.heron/examples/heron-api-examples.jar \
org.apache.heron.examples.api.AckingTopology acking
```
@@ -443,7 +443,7 @@
The [Heron UI](user-manuals-heron-ui) is an in-browser dashboard that you can use to monitor your Heron [topologies](heron-topology-concepts). It should already be running in your GKE cluster.
-You can access [Heron UI](user-manuals-heron-ui) in your browser by navigating to http://localhost:8001/api/v1/proxy/namespaces/default/services/heron-ui:8889.
+You can access [Heron UI](user-manuals-heron-ui) in your browser by navigating to http://localhost:8001/api/v1/namespaces/default/services/heron-ui:8889/proxy.
## Heron on Kubernetes configuration
diff --git a/website2/website/versioned_docs/version-0.20.0-incubating/schedulers-k8s-by-hand.md b/website2/website/versioned_docs/version-0.20.0-incubating/schedulers-k8s-by-hand.md
index 095a1c3..6a6ed16 100644
--- a/website2/website/versioned_docs/version-0.20.0-incubating/schedulers-k8s-by-hand.md
+++ b/website2/website/versioned_docs/version-0.20.0-incubating/schedulers-k8s-by-hand.md
@@ -320,7 +320,7 @@
```bash
$ heron submit kubernetes \
- --service-url=http://localhost:8001/api/v1/proxy/namespaces/default/services/heron-apiserver:9000 \
+ --service-url=http://localhost:8001/api/v1/namespaces/default/services/heron-apiserver:9000/proxy \
~/.heron/examples/heron-api-examples.jar \
org.apache.heron.examples.api.AckingTopology acking
```
@@ -444,7 +444,7 @@
The [Heron UI](user-manuals-heron-ui) is an in-browser dashboard that you can use to monitor your Heron [topologies](heron-topology-concepts). It should already be running in your GKE cluster.
-You can access [Heron UI](user-manuals-heron-ui) in your browser by navigating to http://localhost:8001/api/v1/proxy/namespaces/default/services/heron-ui:8889.
+You can access [Heron UI](user-manuals-heron-ui) in your browser by navigating to http://localhost:8001/api/v1/namespaces/default/services/heron-ui:8889/proxy.
## Heron on Kubernetes configuration
