Merge pull request #27375 from vespa-engine/olaa/dppc-endpoint

Add endpoints to dataplane proxy config

2 files changed, 17 insertions, 2 deletions

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 fe7d9581e46..3349aee9f2a 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,12 +10,16 @@ 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) {
+    public DataplaneProxy(Integer port, String serverCertificate, String serverKey, String mTlsEndpoint, String tokenEndpoint) {
         super(DataplaneProxyConfigurator.class.getName());
         this.port = port;
         this.serverCertificate = serverCertificate;
         this.serverKey = serverKey;
+        this.mTlsEndpoint = mTlsEndpoint;
+        this.tokenEndpoint = tokenEndpoint;
     }
 
     @Override
@@ -23,6 +27,8 @@ 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 bcebf1a9fdd..f795dc4bd93 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,10 +602,19 @@ 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());
+                        endpointCertificateSecrets.key(),
+                        mTlsEndpoint,
+                        "token." + mTlsEndpoint);
                 cluster.addComponent(dataplaneProxy);
             }
             connectorFactory = authorizeClient