Remove ATHENS_DOMAIN environmental variable

3 files changed, 2 insertions, 19 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java
index d8ba6e645a2..aa463a721d9 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java
@@ -115,7 +115,6 @@ public class DockerOperationsImpl implements DockerOperations {
                     .withNetworkMode(DockerImpl.DOCKER_CUSTOM_MACVLAN_NETWORK_NAME)
                     .withIpAddress(nodeInetAddress)
                     .withEnvironment("CONFIG_SERVER_ADDRESS", configServers)
-                    .withEnvironment("ATHENS_DOMAIN", environment.getAthensDomain())
                     .withUlimit("nofile", 262_144, 262_144)
                     .withUlimit("nproc", 32_768, 409_600)
                     .withUlimit("core", -1, -1)
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/Environment.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/Environment.java
index 37e92f66c55..03433ba64a8 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/Environment.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/Environment.java
@@ -35,7 +35,6 @@ public class Environment {
     private static final String ENVIRONMENT = "ENVIRONMENT";
     private static final String REGION = "REGION";
     private static final String LOGSTASH_NODES = "LOGSTASH_NODES";
-    private static final String ATHENS_DOMAIN = "ATHENS_DOMAIN";
     private static final String RUNNING_LOCALLY = "RUNNING_LOCALLY";
     private static final String COREDUMP_FEED_ENDPOINT = "COREDUMP_FEED_ENDPOINT";
 
@@ -46,7 +45,6 @@ public class Environment {
     private final InetAddressResolver inetAddressResolver;
     private final PathResolver pathResolver;
     private final List<String> logstashNodes;
-    private final String athensDomain;
     private final String feedEndpoint;
     private final boolean isRunningLocally;
 
@@ -62,7 +60,6 @@ public class Environment {
              new InetAddressResolver(),
              new PathResolver(),
              getLogstashNodesFromEnvironment(),
-             getEnvironmentVariable(ATHENS_DOMAIN),
              getEnvironmentVariable(COREDUMP_FEED_ENDPOINT),
              Optional.ofNullable(System.getenv(RUNNING_LOCALLY)).map(Boolean::valueOf).orElse(false));
     }
@@ -74,7 +71,6 @@ public class Environment {
                        InetAddressResolver inetAddressResolver,
                        PathResolver pathResolver,
                        List<String> logstashNodes,
-                       String athensDomain,
                        String feedEndpoint,
                        boolean isRunningLocally) {
         this.configServerHosts = configServerHosts;
@@ -84,7 +80,6 @@ public class Environment {
         this.inetAddressResolver = inetAddressResolver;
         this.pathResolver = pathResolver;
         this.logstashNodes = logstashNodes;
-        this.athensDomain = athensDomain;
         this.feedEndpoint = feedEndpoint;
         this.isRunningLocally = isRunningLocally;
     }
@@ -200,11 +195,7 @@ public class Environment {
     public List<String> getLogstashNodes() {
         return logstashNodes;
     }
-
-    public String getAthensDomain() {
-        return athensDomain;
-    }
-
+    
     public static class Builder {
         private Set<String> configServerHosts = Collections.emptySet();
         private String environment;
@@ -213,7 +204,6 @@ public class Environment {
         private InetAddressResolver inetAddressResolver;
         private PathResolver pathResolver;
         private List<String> logstashNodes = Collections.emptyList();
-        private String athensDomain;
         private String feedEndpoint;
         private boolean isRunningLocally = false;
 
@@ -252,11 +242,6 @@ public class Environment {
             return this;
         }
 
-        public Builder athensDomain(String athensDomain) {
-            this.athensDomain = athensDomain;
-            return this;
-        }
-
         public Builder feedEndpoint(String feedEndpoint) {
             this.feedEndpoint = feedEndpoint;
             return this;
@@ -269,7 +254,7 @@ public class Environment {
 
         public Environment build() {
             return new Environment(configServerHosts, environment, region, parentHostHostname, inetAddressResolver,
-                                   pathResolver, logstashNodes, athensDomain, feedEndpoint, isRunningLocally);
+                                   pathResolver, logstashNodes, feedEndpoint, isRunningLocally);
         }
     }
 }
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java
index f6792d7fd30..8d20f4acb5d 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java
@@ -96,7 +96,6 @@ public class LocalZoneUtils {
                 .withEnvironment("ENVIRONMENT", environment.getEnvironment())
                 .withEnvironment("REGION", environment.getRegion())
                 .withEnvironment("CONFIG_SERVER_ADDRESS", CONFIG_SERVER_HOSTNAME)
-                .withEnvironment("ATHENS_DOMAIN", "fake.env")
                 .withEnvironment("COREDUMP_FEED_ENDPOINT", "http://feed-endpoint.hostname.tld/feed")
                 .withEnvironment("RUNNING_LOCALLY", "true")
                 .withUlimit("nofile", 262_144, 262_144)