diff options
| author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-06-19 14:18:52 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-06-19 14:18:58 +0200 |
| commit | 9b42079b07311b7cb59c56e847f4aaf45f83dfa3 (patch) | |
| tree | 1dc2711f75161168146814a8c03990b91c1529f0 /config-model | |
| parent | 3c83b091d243740cfcb344d135e7f50ddafd5df3 (diff) | |
Only setup token infrastructure if enabled in services.xml
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 4 |
1 files changed, 2 insertions, 2 deletions
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 70a57563919..00feb0a1c76 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 @@ -624,8 +624,8 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { .map(clientAuth -> clientAuth == AccessControl.ClientAuthentication.need) .orElse(false); - // TODO (mortent): Implement token support in model - boolean enableTokenSupport = deployState.featureFlags().enableDataplaneProxy(); + boolean enableTokenSupport = deployState.featureFlags().enableDataplaneProxy() + && cluster.getClients().stream().anyMatch(c -> !c.tokens().isEmpty()); // Set up component to generate proxy cert if token support is enabled if (enableTokenSupport) { |