diff options
| author | Håkon Hallingstad <hakon@yahooinc.com> | 2022-01-04 11:23:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-04 11:23:08 +0100 |
| commit | ef82c54cde78e05a49a3087d9353dbb955cdb150 (patch) | |
| tree | 4d680b77b1b1e520f5761bb5e0280553b8637520 /configserver | |
| parent | 56eef3bbb24202d32f5eee5a70597b589c2bb675 (diff) | |
| parent | 0646515bf772065e2992152aeb7a0a808f18df62 (diff) | |
Merge pull request #20641 from vespa-engine/hakonhall/add-infrastructureapplication-in-application-model
Add InfrastructureApplication in application-model [run-systemtest]
Diffstat (limited to 'configserver')
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java index 69098ea0030..02ca4ce14c4 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java @@ -33,6 +33,7 @@ import com.yahoo.path.Path; import com.yahoo.slime.Slime; import com.yahoo.transaction.NestedTransaction; import com.yahoo.transaction.Transaction; +import com.yahoo.vespa.applicationmodel.InfrastructureApplication; import com.yahoo.vespa.config.server.application.Application; import com.yahoo.vespa.config.server.application.ApplicationCuratorDatabase; import com.yahoo.vespa.config.server.application.ApplicationReindexing; @@ -57,8 +58,8 @@ import com.yahoo.vespa.config.server.http.LogRetriever; import com.yahoo.vespa.config.server.http.SecretStoreValidator; import com.yahoo.vespa.config.server.http.SimpleHttpFetcher; import com.yahoo.vespa.config.server.http.TesterClient; -import com.yahoo.vespa.config.server.http.v2.response.DeploymentMetricsResponse; import com.yahoo.vespa.config.server.http.v2.PrepareResult; +import com.yahoo.vespa.config.server.http.v2.response.DeploymentMetricsResponse; import com.yahoo.vespa.config.server.http.v2.response.ProtonMetricsResponse; import com.yahoo.vespa.config.server.metrics.DeploymentMetricsRetriever; import com.yahoo.vespa.config.server.metrics.ProtonMetricsRetriever; @@ -1123,7 +1124,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye // most applications under hosted-vespa are not known to the model and it's OK for a user to get // logs for any host if they are authorized for the hosted-vespa tenant. if (hostname.isPresent() && HOSTED_VESPA_TENANT.equals(applicationId.tenant())) { - int port = List.of("zone-config-servers", "controller").contains(applicationId.application().value()) ? 19071 : 8080; + int port = List.of(InfrastructureApplication.CONFIG_SERVER.id(), InfrastructureApplication.CONTROLLER.id()).contains(applicationId) ? 19071 : 8080; return "http://" + hostname.get() + ":" + port + "/logs"; } |