status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

ca: Only initialize clusterID in the primary 

The secondary must get the clusterID from the primary
This commit is contained in:
Daniel Nephin 2021-11-05 18:08:44 -04:00
parent 01bd3d118d
commit d9110136f2
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
agent/consul/leader_connect_ca.go
View File

@ -213,7 +213,8 @@ func (c *CAManager) initializeCAConfig() (*structs.CAConfiguration, error) {
} }
if config == nil { if config == nil {
config = c.serverConf.CAConfig config = c.serverConf.CAConfig
if config.ClusterID == "" {
if c.serverConf.Datacenter == c.serverConf.PrimaryDatacenter && config.ClusterID == "" {
id, err := uuid.GenerateUUID() id, err := uuid.GenerateUUID()
if err != nil { if err != nil {
return nil, err return nil, err

2
agent/consul/state/connect_ca.go
View File

@ -180,8 +180,6 @@ func (s *Store) caSetConfigTxn(idx uint64, tx WriteTxn, config *structs.CAConfig
if prev != nil { if prev != nil {
existing := prev.(*structs.CAConfiguration) existing := prev.(*structs.CAConfiguration)
config.CreateIndex = existing.CreateIndex config.CreateIndex = existing.CreateIndex
// Allow the ClusterID to change if it's provided by an internal operation, such
// as a primary datacenter being switched to secondary mode.
if config.ClusterID == "" { if config.ClusterID == "" {
config.ClusterID = existing.ClusterID config.ClusterID = existing.ClusterID
} }