cmd/containerboot: load containerboot serve config that does not contain HTTPS endpoint in tailnets with HTTPS disabled #14538
Conversation
This file contains 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
…ain HTTPS endpoint in tailnets with HTTPS disabled Fixes an issue where, if a tailnet has HTTPS disabled, no serve config set via TS_SERVE_CONFIG was loaded, even if it does not contain an HTTPS endpoint. Now for tailnets with HTTPS disabled serve config provided to containerboot is considered invalid (and therefore not loaded) only if there is an HTTPS endpoint defined in the config. Fixes #14495 Signed-off-by: Irbe Krumina <irbe@tailscale.com>
irbekrm
force-pushed
the
irbekrm/serve_http
branch
from
f23be29 to
d9b2aca
Compare
irbekrm
commented
Jan 6, 2025
| @@ -68,7 +68,6 @@ func watchServeConfigChanges(ctx context.Context, path string, cdChanged <-chan | |||
| if prevServeConfig != nil && reflect.DeepEqual(sc, prevServeConfig) { | |||
| continue | |||
| } | |||
| validateHTTPSServe(certDomain, sc) | |||
There was a problem hiding this comment.
Removed this function call as it's called from within updateServeConfig on the next line anyway
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.
Fixes an issue where, if a tailnet has HTTPS disabled, no serve config set via TS_SERVE_CONFIG gets loaded, even if the config does not contain an HTTPS endpoint.
Now serve config provided to containerboot is considered invalid (and not loaded) for tailnets with no HTTPS only if there is an HTTPS endpoint defined in the config.
I've tested by hand that the existing behaviour is retained and also serve config without HTTPS endpoint can now gets loaded for tailnets with HTTPS disabled.
Fixes #14495