3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-06-12 15:52:53 +02:00
Code Issues Projects Releases Packages Wiki Activity

core/zero: add organization id and cluster id to bootstrap config (#5275)

Browse source
This commit is contained in:
Caleb Doxsey 2024-09-10 11:31:45 -06:00 • committed by Kenneth Jenkins
parent a2f98c8743
commit aa816dc2a8
5 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
internal/zero/bootstrap/source.go
View file

@ -55,9 +55,9 @@ func (src *source) OnConfigChange(_ context.Context, l config.ChangeListener) {
func (src *source) UpdateBootstrap(ctx context.Context, cfg cluster_api.BootstrapConfig) bool {
current := src.cfg.Load()
incoming := current.Clone()
applyBootstrapConfig(incoming.Options, &cfg)
applyBootstrapConfig(incoming, &cfg)
if cmp.Equal(incoming.Options, current.Options, cmpOpts...) {
if cmp.Equal(incoming, current, cmpOpts...) {
return false
}
@ -81,13 +81,15 @@ func (src *source) notifyListeners(ctx context.Context, cfg *config.Config) {
}
}
func applyBootstrapConfig(dst *config.Options, src *cluster_api.BootstrapConfig) {
dst.SharedKey = base64.StdEncoding.EncodeToString(src.SharedSecret)
func applyBootstrapConfig(dst *config.Config, src *cluster_api.BootstrapConfig) {
dst.Options.SharedKey = base64.StdEncoding.EncodeToString(src.SharedSecret)
if src.DatabrokerStorageConnection != nil {
dst.DataBrokerStorageType = config.StoragePostgresName
dst.DataBrokerStorageConnectionString = *src.DatabrokerStorageConnection
dst.Options.DataBrokerStorageType = config.StoragePostgresName
dst.Options.DataBrokerStorageConnectionString = *src.DatabrokerStorageConnection
} else {
dst.DataBrokerStorageType = config.StorageInMemoryName
dst.DataBrokerStorageConnectionString = ""
dst.Options.DataBrokerStorageType = config.StorageInMemoryName
dst.Options.DataBrokerStorageConnectionString = ""
}
dst.ZeroClusterID = src.ClusterId
dst.ZeroOrganizationID = src.OrganizationId
}