Release 3.5 - v3.5.14-dd.1 #3
Merged
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
…peer TLS identities Cherry-pick etcd-io#13460 manually because the remote repository has been deleted Signed-off-by: Ayaz Badouraly <[email protected]>
The separate package was introduced in etcd-io#13411 for the release 3.6 Signed-off-by: Ayaz Badouraly <[email protected]>
Cherry-pick etcd-io#13445 manually because the remote repository has been deleted, and add support for multiple values for allowed client and peer URIs Signed-off-by: Ayaz Badouraly <[email protected]>
Follow up on the Cherry-pick of [etcd-io#13445](etcd-io#13445) Allowing the config file of the security config to use multi allowedCN and multi Allowed Hostnames This won't be cross compatible, if we want to upstream this we need to allow for both AllowedCN and AllowedCNs
nyodas
force-pushed
the
bob/release-3.5-dd-v3.5.14-dd.1
branch
2 times, most recently
from
4c564e8
to
46f4c88
Compare
nyodas
force-pushed
the
bob/release-3.5-dd-v3.5.14-dd.1
branch
from
46f4c88
to
b150476
Compare
badouralix
approved these changes
Jul 15, 2024
Comment on lines
+453
to
+454
| AllowedCNs []string `json:"allowed-cns"` | ||
| AllowedHostnames []string `json:"allowed-hostnames"` |
There was a problem hiding this comment.
I am quite surprise they are also changing the json tags upstream since this is a breaking change
In the flag-based config, we updated the go struct keys ( e.g. AllowedHostnames ), but kept the old flag name ( e.g. client-cert-allowed-hostname ) to make the migration smoother without having to synchronize an update of the binary with an update of the config
etcd/server/etcdmain/config.go
Lines 414 to 418 in 54e885a
No problem with it though this we do not use the file-based config
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.
The current branch we're releasing onto is upstream 3.5.14
Rebasing on release-3.5-dd was a mess.
Further improvement could be done to the feature we cherry pick by including the recent work of upstream with the config file.