diff options
4 files changed, 2 insertions, 28 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 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 diff --git a/configdefinitions/src/vespa/dataplane-proxy.def b/configdefinitions/src/vespa/dataplane-proxy.def index 27f88583081..9ce3e4b4b7b 100644 --- a/configdefinitions/src/vespa/dataplane-proxy.def +++ b/configdefinitions/src/vespa/dataplane-proxy.def @@ -7,9 +7,3 @@ port int # Server certificate and key to be used when creating server socket serverCertificate string serverKey string - -# The mTLS endpoint SNI header to route to Jdisc using L4 -mTlsEndpoint string - -# The endpoint SNI header supporting token authentication -tokenEndpoint string diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/DataplaneProxyService.java b/container-disc/src/main/java/com/yahoo/container/jdisc/DataplaneProxyService.java index 230d017c584..83e793dace2 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/DataplaneProxyService.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/DataplaneProxyService.java @@ -51,8 +51,6 @@ public class DataplaneProxyService extends AbstractComponent { credentialsProvider.keyFile(), serverCertificateFile, serverKeyFile, - URI.create(config.mTlsEndpoint()), - URI.create(config.tokenEndpoint()), config.port(), PREFIX )); @@ -141,8 +139,6 @@ public class DataplaneProxyService extends AbstractComponent { Path clientKey, Path serverCert, Path serverKey, - URI mTlsEndpoint, - URI tokenEndpoint, int vespaPort, String prefix) { @@ -152,8 +148,6 @@ public class DataplaneProxyService extends AbstractComponent { nginxTemplate = replace(nginxTemplate, "client_key", clientKey.toString()); nginxTemplate = replace(nginxTemplate, "server_cert", serverCert.toString()); nginxTemplate = replace(nginxTemplate, "server_key", serverKey.toString()); - nginxTemplate = replace(nginxTemplate, "mtls_endpoint", mTlsEndpoint.getHost()); - nginxTemplate = replace(nginxTemplate, "token_endpoint", tokenEndpoint.getHost()); nginxTemplate = replace(nginxTemplate, "vespa_port", Integer.toString(vespaPort)); nginxTemplate = replace(nginxTemplate, "prefix", prefix); |