Skip to content
This repository was archived by the owner on Mar 3, 2023. It is now read-only.

Commit 06b5acc

Browse files
Shawn Zhongjoshfischer1108
Shawn Zhong
authored andcommitted
Update Kubernetes proxy URLs (#3405)
1 parent 4bca2e5 commit 06b5acc

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

deploy/kubernetes/general/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ $ kubectl proxy -p 8001
7575
2. Verify we can access the API server:
7676

7777
```shell
78-
$ curl http://localhost:8001/api/v1/proxy/namespaces/default/services/heron-apiserver:9000/api/v1/version
78+
$ curl http://localhost:8001/api/v1/namespaces/default/services/heron-apiserver:9000/proxy/api/v1/version
7979
{
8080
"heron.build.git.revision" : "bf9fe93f76b895825d8852e010dffd5342e1f860",
8181
"heron.build.git.status" : "Clean",
@@ -90,7 +90,7 @@ $ curl http://localhost:8001/api/v1/proxy/namespaces/default/services/heron-apis
9090
3. Set service_url:
9191
```shell
9292
$ heron config kubernetes \
93-
set service_url http://localhost:8001/api/v1/proxy/namespaces/default/services/heron-apiserver:9000 \
93+
set service_url http://localhost:8001/api/v1/namespaces/default/services/heron-apiserver:9000/proxy \
9494
org.apache.heron.examples.api.AckingTopology acking
9595
```
9696

@@ -102,5 +102,5 @@ org.apache.heron.examples.api.AckingTopology acking
102102

103103
5. View heron ui:
104104
```
105-
http://localhost:8001/api/v1/proxy/namespaces/default/services/heron-ui:8889
105+
http://localhost:8001/api/v1/namespaces/default/services/heron-ui:8889/proxy
106106
```

deploy/kubernetes/minikube/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ $ kubectl proxy -p 8001
7474
2. Verify we can access the API server:
7575

7676
```shell
77-
$ curl http://localhost:8001/api/v1/proxy/namespaces/default/services/heron-apiserver:9000/api/v1/version
77+
$ curl http://localhost:8001/api/v1/namespaces/default/services/heron-apiserver:9000/proxy/api/v1/version
7878
{
7979
"heron.build.git.revision" : "bf9fe93f76b895825d8852e010dffd5342e1f860",
8080
"heron.build.git.status" : "Clean",
@@ -89,7 +89,7 @@ $ curl http://localhost:8001/api/v1/proxy/namespaces/default/services/heron-apis
8989
3. Set service_url:
9090
```shell
9191
$ heron config kubernetes \
92-
set service_url http://localhost:8001/api/v1/proxy/namespaces/default/services/heron-apiserver:9000 \
92+
set service_url http://localhost:8001/api/v1/namespaces/default/services/heron-apiserver:9000/proxy \
9393
```
9494

9595
4. Submit an example topology:
@@ -100,5 +100,5 @@ org.apache.heron.examples.api.AckingTopology acking
100100

101101
5. View heron ui:
102102
```
103-
http://localhost:8001/api/v1/proxy/namespaces/default/services/heron-ui:8889
103+
http://localhost:8001/api/v1/namespaces/default/services/heron-ui:8889/proxy
104104
```

heron/schedulers/src/java/org/apache/heron/scheduler/kubernetes/KubernetesConstants.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ private KubernetesConstants() {
8484
}
8585

8686
public static final String JOB_LINK =
87-
"/api/v1/proxy/namespaces/kube-system/services/kubernetes-dashboard/#/pod";
87+
"/api/v1/namespaces/kube-system/services/kubernetes-dashboard/proxy/#/pod";
8888

8989

9090
public static final Pattern VALID_POD_NAME_REGEX =

website/content/docs/operators/deployment/schedulers/kubernetes.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ Success! You can now manage Heron topologies on your GKE Kubernetes installation
321321

322322
```bash
323323
$ heron submit kubernetes \
324-
--service-url=http://localhost:8001/api/v1/proxy/namespaces/default/services/heron-apiserver:9000 \
324+
--service-url=http://localhost:8001/api/v1/namespaces/default/services/heron-apiserver:9000/proxy \
325325
~/.heron/examples/heron-api-examples.jar \
326326
org.apache.heron.examples.api.AckingTopology acking
327327
```
@@ -445,7 +445,7 @@ That would enable you to manage topologies without setting the `--service-url` f
445445

446446
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.
447447

448-
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.
448+
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.
449449

450450
## Heron on Kubernetes configuration
451451

website2/docs/schedulers-k8s-by-hand.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ Success! You can now manage Heron topologies on your GKE Kubernetes installation
319319

320320
```bash
321321
$ heron submit kubernetes \
322-
--service-url=http://localhost:8001/api/v1/proxy/namespaces/default/services/heron-apiserver:9000 \
322+
--service-url=http://localhost:8001/api/v1/namespaces/default/services/heron-apiserver:9000/proxy \
323323
~/.heron/examples/heron-api-examples.jar \
324324
org.apache.heron.examples.api.AckingTopology acking
325325
```
@@ -443,7 +443,7 @@ That would enable you to manage topologies without setting the `--service-url` f
443443

444444
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.
445445

446-
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.
446+
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.
447447

448448
## Heron on Kubernetes configuration
449449

website2/website/versioned_docs/version-0.20.0-incubating/schedulers-k8s-by-hand.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ Success! You can now manage Heron topologies on your GKE Kubernetes installation
320320

321321
```bash
322322
$ heron submit kubernetes \
323-
--service-url=http://localhost:8001/api/v1/proxy/namespaces/default/services/heron-apiserver:9000 \
323+
--service-url=http://localhost:8001/api/v1/namespaces/default/services/heron-apiserver:9000/proxy \
324324
~/.heron/examples/heron-api-examples.jar \
325325
org.apache.heron.examples.api.AckingTopology acking
326326
```
@@ -444,7 +444,7 @@ That would enable you to manage topologies without setting the `--service-url` f
444444

445445
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.
446446

447-
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.
447+
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.
448448

449449
## Heron on Kubernetes configuration
450450

0 commit comments

Comments
 (0)