Skip to content

Agent Mesh

fix AutoRelay default zero value

Antonio Ojeaccd089bb1fbf
diff --git a/cmd/sam-node/main.go b/cmd/sam-node/main.go
index 1ecb9d73..87cd5046 100644
--- a/cmd/sam-node/main.go
+++ b/cmd/sam-node/main.go
@@ -190,12 +190,15 @@ func main() {
MeshID: meshFlag,
DiscoveryInterval: discoveryIntervalFlag,
ListenAddrs: listenAddrs,
- EnableRelay: enableRelayFlag,
- NodeConfig: nodeConfig,
- KeyGracePeriod: keyGracePeriodFlag,
- AllowLoopback: allowLoopbackFlag,
- MonitorBootstrap: monitorBootstrapFlag,
- MonitorInterval: monitorCheckIntervalFlag,
+ EnableRelay: enableRelayFlag,
+ NodeConfig: nodeConfig,
+ KeyGracePeriod: keyGracePeriodFlag,
+ AllowLoopback: allowLoopbackFlag,
+ MonitorBootstrap: monitorBootstrapFlag,
+ MonitorInterval: monitorCheckIntervalFlag,
+ AutoRelayMinInterval: autoRelayMinIntervalFlag,
+ AutoRelayBootDelay: autoRelayBootDelayFlag,
+ AutoRelayBackoff: autoRelayBackoffFlag,
})
if err != nil {
logger.Fatalf("Failed to start mesh node: %v", err)
@@ -243,11 +246,14 @@ func main() {
DiscoveryInterval: discoveryIntervalFlag,
ListenAddrs: listenAddrs,
EnableRelay: enableRelayFlag,
- NodeConfig: nodeConfig,
- KeyGracePeriod: keyGracePeriodFlag,
- AllowLoopback: allowLoopbackFlag,
- MonitorBootstrap: monitorBootstrapFlag,
- MonitorInterval: monitorCheckIntervalFlag,
+ NodeConfig: nodeConfig,
+ KeyGracePeriod: keyGracePeriodFlag,
+ AllowLoopback: allowLoopbackFlag,
+ MonitorBootstrap: monitorBootstrapFlag,
+ MonitorInterval: monitorCheckIntervalFlag,
+ AutoRelayMinInterval: autoRelayMinIntervalFlag,
+ AutoRelayBootDelay: autoRelayBootDelayFlag,
+ AutoRelayBackoff: autoRelayBackoffFlag,
})
if err != nil {
enrollCancel()
diff --git a/tests/integration/failover_test.go b/tests/integration/failover_test.go
index bcc26e8f..57e3c835 100644
--- a/tests/integration/failover_test.go
+++ b/tests/integration/failover_test.go
@@ -143,7 +143,7 @@ roles: {}
"--allow-loopback",
"--monitor-bootstrap", "1s",
"--monitor-interval", "1s",
- "--autorelay-min-interval", "0s",
+ "--autorelay-min-interval", "1s",
"--autorelay-backoff", "1s",
"--autorelay-boot-delay", "0s",
)