Revert "Include application-level endpoints and scope in deploy"

3 files changed, 8 insertions, 17 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java
index ad98197fa93..1f1f8577a32 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java
@@ -64,13 +64,13 @@ public class DeploymentData {
         this.zone = requireNonNull(zone);
         this.applicationPackage = requireNonNull(applicationPackage);
         this.platform = requireNonNull(platform);
-        this.containerEndpoints = Set.copyOf(requireNonNull(containerEndpoints));
+        this.containerEndpoints = requireNonNull(containerEndpoints);
         this.endpointCertificateMetadata = requireNonNull(endpointCertificateMetadata);
         this.dockerImageRepo = requireNonNull(dockerImageRepo);
         this.athenzDomain = athenzDomain;
         this.quota = quota;
-        this.tenantSecretStores = List.copyOf(requireNonNull(tenantSecretStores));
-        this.operatorCertificates = List.copyOf(requireNonNull(operatorCertificates));
+        this.tenantSecretStores = tenantSecretStores;
+        this.operatorCertificates = operatorCertificates;
         this.dryRun = dryRun;
     }
 
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ContainerEndpoint.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ContainerEndpoint.java
index bac34e73dc5..3e9169a83aa 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ContainerEndpoint.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ContainerEndpoint.java
@@ -12,12 +12,10 @@ import java.util.Objects;
 public class ContainerEndpoint {
 
     private final String clusterId;
-    private final String scope;
     private final List<String> names;
 
-    public ContainerEndpoint(String clusterId, String scope, List<String> names) {
+    public ContainerEndpoint(String clusterId, List<String> names) {
         this.clusterId = nonEmpty(clusterId, "message must be non-empty");
-        this.scope = Objects.requireNonNull(scope, "scope must be non-null");
         this.names = List.copyOf(Objects.requireNonNull(names, "names must be non-null"));
     }
 
@@ -26,11 +24,6 @@ public class ContainerEndpoint {
         return clusterId;
     }
 
-    /** The scope of this endpoint */
-    public String scope() {
-        return scope;
-    }
-
     /**
      * All valid DNS names for this endpoint. This can contain both proper DNS names and synthetic identifiers used for
      * routing, such as a Host header value that is not necessarily a proper DNS name.
@@ -44,17 +37,18 @@ public class ContainerEndpoint {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         ContainerEndpoint that = (ContainerEndpoint) o;
-        return clusterId.equals(that.clusterId) && scope.equals(that.scope) && names.equals(that.names);
+        return clusterId.equals(that.clusterId) &&
+               names.equals(that.names);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(clusterId, scope, names);
+        return Objects.hash(clusterId, names);
     }
 
     @Override
     public String toString() {
-        return "container endpoint for " + clusterId + ": " + names + " [scope=" + scope + "]";
+        return "container endpoint for " + clusterId + " " + names;
     }
 
     private static String nonEmpty(String s, String message) {
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java
index 893b7a1b1dc..852570b9ed4 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java
@@ -42,9 +42,6 @@ public interface ZoneRegistry {
     /** Returns the URI for the config server VIP in the given zone */
     URI getConfigServerVipUri(ZoneId zoneId);
 
-    /** Returns the VIP hostname for the shared routing layer in given zone, if any */
-    Optional<String> getVipHostname(ZoneId zoneId);
-
     /** Returns the time to live for deployments in the given zone, or empty if this is infinite */
     Optional<Duration> getDeploymentTimeToLive(ZoneId zoneId);