summaryrefslogtreecommitdiffstats
path: root/controller-api
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2020-01-23 15:26:14 +0100
committerGitHub <noreply@github.com>2020-01-23 15:26:14 +0100
commit367976005aa5d501772aac4b364d380594c1f006 (patch)
tree5ec0573319193cbbdef59a219b751a642eed3c57 /controller-api
parent618298e6306a086d38002e2379d5e3cf01cf27b0 (diff)
parentfd801a574e9c452ad09a5198106f2a1517094def (diff)
Merge pull request #11903 from vespa-engine/mpolden/routing-control-api
Implement /routing/v1/ API
Diffstat (limited to 'controller-api')
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java1
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java3
2 files changed, 3 insertions, 1 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java
index f8f63df40a9..600a5cebc62 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java
@@ -65,6 +65,7 @@ public interface ConfigServer {
* @param endpoint The endpoint to modify
* @param status The new status with metadata
*/
+ // TODO(mpolden): Implement a zone-variant of this
void setGlobalRotationStatus(DeploymentId deployment, String endpoint, EndpointStatus status);
/**
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java
index bdc1c6e9794..998af030b6b 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java
@@ -30,7 +30,8 @@ enum PathGroup {
"/orchestrator/v1/{*}",
"/os/v1/{*}",
"/provision/v2/{*}",
- "/zone/v2/{*}"),
+ "/zone/v2/{*}",
+ "/routing/v1/{*}"),
/** Paths used for creating and reading user resources. */
user(Optional.of("/api"),