diff options
| author | Håkon Hallingstad <hakon@yahooinc.com> | 2022-09-01 15:47:45 +0200 |
|---|---|---|
| committer | Håkon Hallingstad <hakon@yahooinc.com> | 2022-09-01 15:47:45 +0200 |
| commit | fa2d3e1f0a0bae315bf89769dae04d037d715b99 (patch) | |
| tree | f886d2fab63f02a31d2946942506a9d511457b8f /node-admin | |
| parent | 20633e83f7c64cde7d46579406b3c86a330d5718 (diff) | |
Disallow GCP endpoints in global routing
Diffstat (limited to 'node-admin')
2 files changed, 3 insertions, 2 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImpl.java index b526c573c05..d942e5c9e80 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImpl.java @@ -2,6 +2,7 @@ package com.yahoo.vespa.hosted.node.admin.maintenance.servicedump; import com.yahoo.config.provision.ApplicationId; +import com.yahoo.config.provision.CloudName; import com.yahoo.text.Lowercase; import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeAttributes; import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeRepository; @@ -61,7 +62,7 @@ public class VespaServiceDumperImpl implements VespaServiceDumper { @Override public void processServiceDumpRequest(NodeAgentContext context) { - if (context.zone().getCloudName().value().equals("gcp")) return; + if (context.zone().getCloudName().equals(CloudName.GCP)) return; Instant startedAt = clock.instant(); NodeSpec nodeSpec = context.node(); diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContextImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContextImpl.java index 47c96103ab5..ed2de691eb0 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContextImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentContextImpl.java @@ -262,7 +262,7 @@ public class NodeAgentContextImpl implements NodeAgentContext { @Override public CloudName getCloudName() { - return CloudName.defaultName(); + return CloudName.DEFAULT; } @Override |