Skip to content
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

Remove unused sd_client config from control service #3668

Merged
merged 3 commits into from
Feb 17, 2020
Merged

Remove unused sd_client config from control service #3668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4955df3
Remove unused sd_client config from control service
matzf Feb 11, 2020
16f3e42
Remove sd_config from generator and test configs
matzf Feb 17, 2020
d452831
Remove unused option EnableQUICTest
matzf Feb 17, 2020
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: 0 additions & 3 deletions acceptance/topo_cs_reload/testdata/cs.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,3 @@ Connection = "cs1-ff00_0_110-1.beacon.db"

[metrics]
Prometheus = "242.253.100.2:30453"

[sd_client]
Address = "242.253.100.3:30255"
27 changes: 11 additions & 16 deletions go/cs/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,19 +80,17 @@ var _ config.Config = (*Config)(nil)

// Config is the beacon server configuration.
type Config struct {
General env.General
Features env.Features
Logging env.Logging
Metrics env.Metrics
Tracing env.Tracing
QUIC env.QUIC `toml:"quic"`
SCIOND env.SCIONDClient `toml:"sd_client"`
TrustDB truststorage.TrustDBConf
BeaconDB beaconstorage.BeaconDBConf
BS BSConfig
CS CSConfig
PS PSConfig
EnableQUICTest bool
General env.General
Features env.Features
Logging env.Logging
Metrics env.Metrics
Tracing env.Tracing
QUIC env.QUIC `toml:"quic"`
TrustDB truststorage.TrustDBConf
BeaconDB beaconstorage.BeaconDBConf
BS BSConfig
CS CSConfig
PS PSConfig
}

// InitDefaults initializes the default values for all parts of the config.
Expand All @@ -103,7 +101,6 @@ func (cfg *Config) InitDefaults() {
&cfg.Logging,
&cfg.Metrics,
&cfg.Tracing,
&cfg.SCIOND,
&cfg.TrustDB,
&cfg.BeaconDB,
&cfg.BS,
Expand All @@ -119,7 +116,6 @@ func (cfg *Config) Validate() error {
&cfg.Features,
&cfg.Logging,
&cfg.Metrics,
&cfg.SCIOND,
&cfg.TrustDB,
&cfg.BeaconDB,
&cfg.BS,
Expand All @@ -137,7 +133,6 @@ func (cfg *Config) Sample(dst io.Writer, path config.Path, _ config.CtxMap) {
&cfg.Metrics,
&cfg.Tracing,
&cfg.QUIC,
&cfg.SCIOND,
&cfg.TrustDB,
&cfg.BeaconDB,
&cfg.BS,
Expand Down
7 changes: 0 additions & 7 deletions go/lib/env/testdata/cs.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,6 @@
# reconnects.
ReconnectToDispatcher = true

[sd_client]
# Sciond path. It defaults to sciond.DefaultSCIONDPath.
Path = "/run/shm/sciond/1-ff00_0_110.sock"

# Timeout for trying to connect to sciond. (default 20s)
Timeout = "20s"

[logging]
[logging.file]
# Location of the logging file.
Expand Down
4 changes: 0 additions & 4 deletions python/topology/go.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ def generate_control_service(self):
CS_CONFIG_NAME), toml.dumps(bs_conf))

def _build_control_service_conf(self, topo_id, ia, base, name, infra_elem):
sciond = "[%s]:%d" % (sciond_ip(self.args.docker, topo_id, self.args.networks), SD_API_PORT)
config_dir = '/share/conf' if self.args.docker else os.path.join(
base, name)
raw_entry = {
Expand All @@ -132,9 +131,6 @@ def _build_control_service_conf(self, topo_id, ia, base, name, infra_elem):
'tracing': self._tracing_entry(),
'metrics': self._metrics_entry(name, infra_elem, CS_PROM_PORT),
'quic': self._quic_conf_entry(CS_QUIC_PORT, self.args.svcfrac, infra_elem),
'sd_client': {
'address': sciond,
},
'cs': {
'LeafReissueLeadTime': "6h",
'IssuerReissueLeadTime': "3d",
Expand Down