diff options
author | jonmv <venstad@gmail.com> | 2023-01-26 08:52:18 +0100 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2023-01-26 08:52:18 +0100 |
commit | 26b90b0ad94528d450a07a65f4e7ee456c3aae33 (patch) | |
tree | a6de1eec0efce419534f635628ca4cf4e4153427 /node-repository | |
parent | d01b7d1cc323149e65698c41c92a18437470b972 (diff) |
Let controller read whether zone endpoints are public
Diffstat (limited to 'node-repository')
3 files changed, 9 insertions, 4 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LoadBalancersResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LoadBalancersResponse.java index 15a799c06d8..bf5b735c4a0 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LoadBalancersResponse.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LoadBalancersResponse.java @@ -89,6 +89,7 @@ public class LoadBalancersResponse extends SlimeJsonResponse { } } instance.serviceId().ifPresent(serviceId -> lbObject.setString("serviceId", serviceId.value())); + lbObject.setBool("public", instance.settings().isPublicEndpoint()); }); lb.instance() .map(LoadBalancerInstance::cloudAccount) diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/load-balancers-single.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/load-balancers-single.json index a9a728bab15..f6d9c1f079c 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/load-balancers-single.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/load-balancers-single.json @@ -28,7 +28,8 @@ "ipAddress": "127.0.14.1", "port": 4443 } - ] + ], + "public": true } ] } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/load-balancers.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/load-balancers.json index becca98a913..eef381e8df7 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/load-balancers.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/load-balancers.json @@ -37,7 +37,8 @@ } ] }, - "serviceId": "service" + "serviceId": "service", + "public": false }, { "id": "cfg:cfg:cfg:configservers", @@ -56,7 +57,8 @@ "ports": [ 4443 ], - "reals": [] + "reals": [], + "public": true }, { "id": "tenant4:application4:instance4:id4", @@ -86,7 +88,8 @@ "ipAddress": "127.0.14.1", "port": 4443 } - ] + ], + "public": true } ] } |