Skip to content

Backport of Fixes Secondary ConnectCA update into release/1.16.x #17954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hc-github-team-consul-core merged 4 commits into from
Jun 29, 2023
Merged

Backport of Fixes Secondary ConnectCA update into release/1.16.x #17954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7893618
backport of commit afa1f42cc719b13074f2f286202d8f21b8000753
Ranjandas Jun 15, 2023
461143d
backport of commit e0970025d4c2e2702af30e642b37dd5e32561756
Ranjandas Jun 23, 2023
50fe8f1
backport of commit 2f2aad545b1ebcae22bb481b57115a679eb539e5
kisunji Jun 27, 2023
e7d5abb
backport of commit 4a5c9c181f50343911cd30fbb0f0475e473a2c7b
kisunji Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/17846.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
connect/ca: Fixes a bug preventing CA configuration updates in secondary datacenters
```
4 changes: 3 additions & 1 deletion agent/consul/leader_connect_ca.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,9 @@ func shouldPersistNewRootAndConfig(newActiveRoot *structs.CARoot, oldConfig, new
if newConfig == nil {
return false
}
return newConfig.Provider == oldConfig.Provider && reflect.DeepEqual(newConfig.Config, oldConfig.Config)

// Do not persist if the new provider and config are the same as the old
return !(newConfig.Provider == oldConfig.Provider && reflect.DeepEqual(newConfig.Config, oldConfig.Config))
}

func (c *CAManager) UpdateConfiguration(args *structs.CARequest) (reterr error) {
Expand Down