Add port for token connector to nginx config

2 files changed, 8 insertions, 4 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..13aa65909bd 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
@@ -7,20 +7,23 @@ import com.yahoo.vespa.model.container.component.SimpleComponent;
 
 public class DataplaneProxy extends SimpleComponent implements DataplaneProxyConfig.Producer {
 
-    private final Integer port;
+    private final int mtlsPort;
+    private final int tokenPort;
     private final String serverCertificate;
     private final String serverKey;
 
-    public DataplaneProxy(Integer port, String serverCertificate, String serverKey) {
+    public DataplaneProxy(int mtlsPort, int tokenPort, String serverCertificate, String serverKey) {
         super(DataplaneProxyConfigurator.class.getName());
-        this.port = port;
+        this.mtlsPort = mtlsPort;
+        this.tokenPort = tokenPort;
         this.serverCertificate = serverCertificate;
         this.serverKey = serverKey;
     }
 
     @Override
     public void getConfig(DataplaneProxyConfig.Builder builder) {
-        builder.port(port);
+        builder.mtlsPort(mtlsPort);
+        builder.tokenPort(tokenPort);
         builder.serverCertificate(serverCertificate);
         builder.serverKey(serverKey);
     }
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 a4a373a89a0..1036a615bb5 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
@@ -647,6 +647,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         cluster.addSimpleComponent(DataplaneProxyService.class);
         var dataplaneProxy = new DataplaneProxy(
                 getMtlsDataplanePort(state),
+                tokenPort,
                 endpointCert.certificate(),
                 endpointCert.key());
         cluster.addComponent(dataplaneProxy);