From 37b0503ffb7ee80bbd22b3a7cc40e3c2e00c8fc4 Mon Sep 17 00:00:00 2001
From: Ola Aunronning <olaa@yahooinc.com>
Date: Tue, 13 Jun 2023 12:52:33 +0200
Subject: DataplaneProxyConfig does not contain endpoints

---
 .../java/com/yahoo/vespa/model/container/DataplaneProxy.java   |  8 +-------
 .../yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 10 +---------
 2 files changed, 2 insertions(+), 16 deletions(-)

(limited to 'config-model/src')

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/DataplaneProxy.java b/config-model/src/main/java/com/yahoo/vespa/model/container/DataplaneProxy.java
index 3349aee9f2a..fe7d9581e46 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/DataplaneProxy.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/DataplaneProxy.java
@@ -10,16 +10,12 @@ public class DataplaneProxy extends SimpleComponent implements DataplaneProxyCon
     private final Integer port;
     private final String serverCertificate;
     private final String serverKey;
-    private final String mTlsEndpoint;
-    private final String tokenEndpoint;
 
-    public DataplaneProxy(Integer port, String serverCertificate, String serverKey, String mTlsEndpoint, String tokenEndpoint) {
+    public DataplaneProxy(Integer port, String serverCertificate, String serverKey) {
         super(DataplaneProxyConfigurator.class.getName());
         this.port = port;
         this.serverCertificate = serverCertificate;
         this.serverKey = serverKey;
-        this.mTlsEndpoint = mTlsEndpoint;
-        this.tokenEndpoint = tokenEndpoint;
     }
 
     @Override
@@ -27,8 +23,6 @@ public class DataplaneProxy extends SimpleComponent implements DataplaneProxyCon
         builder.port(port);
         builder.serverCertificate(serverCertificate);
         builder.serverKey(serverKey);
-        builder.mTlsEndpoint(mTlsEndpoint);
-        builder.tokenEndpoint(tokenEndpoint);
     }
 
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index f795dc4bd93..9fda25bcb00 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -602,19 +602,11 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
 
                 cluster.addSimpleComponent(DataplaneProxyCredentials.class);
                 cluster.addSimpleComponent(DataplaneProxyService.class);
-                var mTlsEndpoint = cluster.endpoints()
-                        .stream()
-                        .filter(endpoint -> endpoint.scope().equals(ApplicationClusterEndpoint.Scope.zone))
-                        .findFirst()
-                        .map(endpoint -> endpoint.dnsName().value())
-                        .orElseThrow();
 
                 var dataplaneProxy = new DataplaneProxy(
                         getDataplanePort(deployState),
                         endpointCertificateSecrets.certificate(),
-                        endpointCertificateSecrets.key(),
-                        mTlsEndpoint,
-                        "token." + mTlsEndpoint);
+                        endpointCertificateSecrets.key());
                 cluster.addComponent(dataplaneProxy);
             }
             connectorFactory = authorizeClient
-- 
cgit v1.2.3