diff options
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/DataplaneProxy.java | 4 | ||||
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 3 |
2 files changed, 5 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 3f95ec693c7..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 @@ -2,7 +2,7 @@ package com.yahoo.vespa.model.container; import com.yahoo.cloud.config.DataplaneProxyConfig; -import com.yahoo.jdisc.http.server.jetty.DataplaneProxyCredentials; +import com.yahoo.container.jdisc.DataplaneProxyConfigurator; import com.yahoo.vespa.model.container.component.SimpleComponent; public class DataplaneProxy extends SimpleComponent implements DataplaneProxyConfig.Producer { @@ -12,7 +12,7 @@ public class DataplaneProxy extends SimpleComponent implements DataplaneProxyCon private final String serverKey; public DataplaneProxy(Integer port, String serverCertificate, String serverKey) { - super(DataplaneProxyCredentials.class.getName()); + super(DataplaneProxyConfigurator.class.getName()); this.port = port; this.serverCertificate = serverCertificate; this.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 d438cd06fb6..57303d6c9b3 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 @@ -36,6 +36,7 @@ import com.yahoo.config.provision.Zone; import com.yahoo.config.provision.ZoneEndpoint; import com.yahoo.config.provision.zone.ZoneId; import com.yahoo.container.bundle.BundleInstantiationSpecification; +import com.yahoo.container.jdisc.DataplaneProxyService; import com.yahoo.container.logging.AccessLog; import com.yahoo.container.logging.FileConnectionLog; import com.yahoo.io.IOUtils; @@ -599,6 +600,8 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { cluster.getHttp().getFilterChains().add(tokenChain); + cluster.addSimpleComponent(DataplaneProxyCredentials.class); + cluster.addSimpleComponent(DataplaneProxyService.class); var dataplaneProxy = new DataplaneProxy( getDataplanePort(deployState), endpointCertificateSecrets.certificate(), |