kvstore/etcd: also reload keypair using trusted-ca-file #10754
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
When we define the new `trusted-ca-file` attribute, etcd's
`clientyaml.NewConfig` would set `cfg.TLS.RootCAs`, which
shortcuts most of the (now deprecated) `newConfig` wrapper, and
prevents us from hooking reloads with `TLS.GetClientCertificate`:
```
if cfg.TLS == nil || cfg.TLS.RootCAs != nil {
return cfg, nil
}
```
While at it, make it so the reload functionality survives
newConfig removal.
Signed-off-by: Benjamin Pineau <benjamin.pineau@datadoghq.com>
|
Please set the appropriate release note label. |
aanm
added
pending-review
release-note/minor
|
test-me-please |
aanm
approved these changes
Mar 30, 2020
|
Is there anything I can do for integration tests? failures seems unrelated to the PR. |
|
test-me-please |
I've re-trigger the tests. They might have been caused by a flake. |
|
restart-ginkgo Restarting as CI hit #10760. |
|
going to merge since it hit a known flake and flake is fixed on master. |
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.
When we define the new
trusted-ca-fileattribute, etcd'sclientyaml.NewConfigwould setcfg.TLS.RootCAs, whichshortcuts most of the (now deprecated)
newConfigwrapper, andprevents us from hooking reloads with
TLS.GetClientCertificate:While at it, make it so the reload functionality survives
newConfig removal.
Signed-off-by: Benjamin Pineau benjamin.pineau@datadoghq.com