feat: possible to deploy with only token#36868
Open
BrageHK wants to merge 4 commits into
Open
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Enables hosted/public cloud container deployments to be configured with only token-based clients (no client certificate authority), by relaxing model validation and mTLS connector setup when token clients are present.
Changes:
- Relaxed
<clients>validation to allow deployments without any certificate-based client as long as there is at least one token client withwritepermission. - Updated mTLS connector configuration in public cloud to not require
security/clients.pemwhen token clients exist. - Added a unit test covering successful token-only client configuration and connector output.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | Allows token-only deployments by adjusting client validation and public-cloud mTLS connector CA requirements. |
| config-model/src/test/java/com/yahoo/vespa/model/container/xml/CloudTokenDataPlaneFilterTest.java | Adds coverage for token-only client deployments and asserts expected connector/filter config behavior. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| assertEquals(List.of("read", "write"), tokenClient.permissions()); | ||
| assertFalse(tokenClient.tokens().isEmpty()); | ||
| } | ||
|
|
| .anyMatch(client -> client.permissions().contains(WRITE)); | ||
|
|
||
| if (!atLeastOneClientWithCertificate && !atLeastOneClientWithWriteToken) | ||
| throw new IllegalArgumentException("At least one client must require a certificate or a write token"); |
| assertTrue(connectorCfg.ssl().caCertificate().isEmpty(), | ||
| "Token-only: mTLS connector must not have a CA certificate configured"); | ||
|
|
||
| assertNotNull(connectorConfig(8444)); |
Contributor
johansolbakken
left a comment
johansolbakken
left a comment
There was a problem hiding this comment.
Generally looks fine to me. But could not get it to compile yet. See comments:
| "Takes effect at redeployment", | ||
| TENANT_ID, APPLICATION, INSTANCE_ID); | ||
|
|
||
| public static final UnboundedBooleanFlag TOKEN_AUTH_FOR_DEPLOY = defineFeatureFlag( |
Contributor
There was a problem hiding this comment.
Probably meant UnboundBooleanFlag
| public static final UnboundedBooleanFlag TOKEN_AUTH_FOR_DEPLOY = defineFeatureFlag( | ||
| "token-auth-for-deploy", | ||
| List.of("bragehk"), "2026-05-19", "2026-09-01" | ||
| false, |
Contributor
There was a problem hiding this comment.
The default value should be the second parameter.
| @ModelFeatureFlag(owners = {"hmusum"}) default String unknownConfigDefinition() { return "warn"; } | ||
| @ModelFeatureFlag(owners = {"havardpe"}) default boolean sortBlueprintsByCost() { return false; } | ||
| @ModelFeatureFlag(owners = {"olaa"}) default boolean logserverOtelCol() { return false; } | ||
| @ModelFeatureFlag(owners = {"bragehk"}) default boolean tokenAuthForDeploy() { return false; } |
Contributor
There was a problem hiding this comment.
Since this is public API, you need to run mvn package -Dabicheck.writeSpec in the config-model-api folder.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I confirm that this contribution is made under the terms of the license found in the root directory of this repository's source tree and that I have the authority necessary to make this contribution on behalf of its copyright owner.
I will also make PR for CLI to add support for this.