diff options
| author | Jon Bratseth <bratseth@oath.com> | 2018-03-15 14:24:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-15 14:24:28 +0100 |
| commit | 4918830114bf733477d675532438030a20822c98 (patch) | |
| tree | e41d88f4f9bf3fba7194f99ba2b729da6038251d /controller-server | |
| parent | a74c2fe5b286940ac497b3f3d57857d6cdb1d5e7 (diff) | |
| parent | 33b5ae95f8f415d8a358cfeedfc50cd1812d46d1 (diff) | |
Merge pull request #5346 from vespa-engine/jvenstad/ignore-aws-in-system-version-for-now
Ignore AWS prod zone for now
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java index eb932d42e79..df737512604 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java @@ -8,6 +8,7 @@ import com.yahoo.component.Vtag; import com.yahoo.vespa.hosted.controller.Application; import com.yahoo.vespa.hosted.controller.Controller; import com.yahoo.vespa.hosted.controller.api.integration.github.GitSha; +import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneId; import com.yahoo.vespa.hosted.controller.application.ApplicationList; import com.yahoo.vespa.hosted.controller.application.Deployment; import com.yahoo.vespa.hosted.controller.application.JobList; @@ -118,6 +119,8 @@ public class VersionStatus { private static ListMap<Version, String> findConfigServerVersions(Controller controller) { List<URI> configServers = controller.zoneRegistry().zones() .controllerManaged() + // TODO jvenstad: Remove this when AWS is automatically upgraded. + .not().among(ZoneId.from("prod.aws-us-east-1a")) .ids().stream() .flatMap(zoneId -> controller.zoneRegistry().getConfigServerUris(zoneId).stream()) .collect(Collectors.toList()); |