a6a6d5a8ee
OSS port of enterprise PR 1822 Includes the necessary changes to the `proxycfg` and `xds` packages to enable Consul servers to configure arbitrary proxies using catalog data. Broadly, `proxycfg.Manager` now has public methods for registering, deregistering, and listing registered proxies — the existing local agent state-sync behavior has been moved into a separate component that makes use of these methods. When an xDS session is started for a proxy service in the catalog, a goroutine will be spawned to watch the service in the server's state store and re-register it with the `proxycfg.Manager` whenever it is updated (and clean it up when the client goes away).
32 lines
1 KiB
Go
32 lines
1 KiB
Go
package local
|
|
|
|
import (
|
|
"github.com/hashicorp/consul/agent/proxycfg"
|
|
structs "github.com/hashicorp/consul/agent/structs"
|
|
)
|
|
|
|
// ConfigSource wraps a proxycfg.Manager to create watches on services
|
|
// local to the agent (pre-registered by Sync).
|
|
type ConfigSource struct {
|
|
manager ConfigManager
|
|
}
|
|
|
|
// NewConfigSource builds a ConfigSource with the given proxycfg.Manager.
|
|
func NewConfigSource(cfgMgr ConfigManager) *ConfigSource {
|
|
return &ConfigSource{cfgMgr}
|
|
}
|
|
|
|
func (m *ConfigSource) Watch(serviceID structs.ServiceID, nodeName string, _ string) (<-chan *proxycfg.ConfigSnapshot, proxycfg.CancelFunc, error) {
|
|
watchCh, cancelWatch := m.manager.Watch(proxycfg.ProxyID{
|
|
ServiceID: serviceID,
|
|
NodeName: nodeName,
|
|
|
|
// Note: we *intentionally* don't set Token here. All watches on local
|
|
// services use the same ACL token, regardless of whatever token is
|
|
// presented in the xDS stream (the token presented to the xDS server
|
|
// is checked before the watch is created).
|
|
Token: "",
|
|
})
|
|
return watchCh, cancelWatch, nil
|
|
}
|