control-plane: bootstrap configuration server #129
Conversation
| @@ -23,6 +23,8 @@ type XdsServerConfig struct { | |||
| DataplaneConfigurationRefreshInterval time.Duration `yaml:"dataplaneConfigurationRefreshInterval" envconfig:"konvoy_xds_server_dataplane_configuration_refresh_interval"` | |||
| // Interval for flushing status of Dataplanes connected to the Control Plane | |||
| DataplaneStatusFlushInterval time.Duration `yaml:"dataplaneStatusFlushInterval" envconfig:"konvoy_xds_server_dataplane_status_flush_interval"` | |||
| // Configuration of Bootstrap Server, which provides bootstrap config to Dataplanes | |||
| Bootstrap *XdsBootstrapServerConfig `yaml:"bootstrap"` | |||
There was a problem hiding this comment.
I think, bootstrapServer configuration should be separate from xdsServer
There was a problem hiding this comment.
Yeah, I wasn't sure about this. Logically in code the bootstrap logic is placed in xds package. But from user perspective it makes more sense to put it outside. Changed.
Btw, shouldn't the diagnostic port also be separated from XdsConfig?
components/konvoy-control-plane/pkg/xds/bootstrap/server_test.go
Outdated
Show resolved
Hide resolved
components/konvoy-control-plane/pkg/xds/bootstrap/server_test.go
Outdated
Show resolved
Hide resolved
jakubdyszkiewicz
force-pushed
the
feature/bootstrap-configuration-server
branch
from
884f875
to
6450d6a
Compare
jakubdyszkiewicz
force-pushed
the
feature/bootstrap-configuration-server
branch
from
6450d6a
to
9795706
Compare
| @@ -66,6 +69,9 @@ func (c *Config) Validate() error { | |||
| if err := c.XdsServer.Validate(); err != nil { | |||
| return errors.Wrap(err, "Xds Server validation failed") | |||
| } | |||
| if err := c.BootstrapServer.Validate(); err != nil { | |||
| return errors.Wrap(err, "Bootstrap validation failed") | |||
There was a problem hiding this comment.
Let's change it to Bootstrap Server validation failed
|
|
||
| func (b *BootstrapParamsConfig) Validate() error { | ||
| if b.AdminPort < 0 { | ||
| return errors.New("Port cannot be negative") |
There was a problem hiding this comment.
AdminPort cannot be negative
| return errors.New("Port cannot be negative") | ||
| } | ||
| if b.XdsHost == "" { | ||
| return errors.New("Host cannot be empty") |
There was a problem hiding this comment.
Let's change it to XdsHost cannot be empty
| return errors.New("Host cannot be empty") | ||
| } | ||
| if b.XdsPort < 0 { | ||
| return errors.New("Port cannot be negative") |
There was a problem hiding this comment.
Let's change it to XdsPort cannot be negative
| "net/http" | ||
| ) | ||
|
|
||
| var log = core.Log.WithName("xds-server").WithName("bootstrap") |
There was a problem hiding this comment.
Let's change it to core.Log.WithName("bootstrap-server")
|
minor changes fixed in another PR, so I won't have to rebase and do both CI checks and stuff. |
This PR introduces server that provides an initial bootstrap configuration for Envoy.
The client of this server provides Node ID, for this Node ID we look for Dataplane definition in our resources store and seek required data. We also define a XDS Server location on the server side.