diff options
| author | Martin Polden <mpolden@mpolden.no> | 2022-09-05 11:41:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-05 11:41:07 +0200 |
| commit | 8702571fbdd28c75bb96ce3d388dff3d4917bd91 (patch) | |
| tree | 0194bb25e08c06d88c74868698fe2b097c89291d /node-admin | |
| parent | a811c1aac1f31e367932975c747305d00cc573be (diff) | |
| parent | 03e1df4c936fd34490294834885a5d5f78787bad (diff) | |
Merge pull request #23892 from vespa-engine/hakonhall/disallow-gcp-endpoints-in-global-routing
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 |