propagate more missing configs

bacalhau-project · Oct 1, 2024 · 5d9a6d6 · 5d9a6d6
1 parent 56eb93a
commit 5d9a6d6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/cmd/cli/serve/util.go b/cmd/cli/serve/util.go
@@ -62,6 +62,11 @@ func GetComputeConfig(
 			ProbeHTTP:           cfg.JobAdmissionControl.ProbeHTTP,
 			ProbeExec:           cfg.JobAdmissionControl.ProbeExec,
 		},
+		ControlPlaneSettings: legacy_types.ComputeControlPlaneConfig{
+			InfoUpdateFrequency: legacy_types.Duration(cfg.Compute.Heartbeat.InfoUpdateInterval),
+			ResourceUpdateFrequency: legacy_types.Duration(cfg.Compute.Heartbeat.ResourceUpdateInterval),
+			HeartbeatFrequency: legacy_types.Duration(cfg.Compute.Heartbeat.Interval),
+		}
 	}
 
 	// if the local publisher is enabled and installed, populate params.
@@ -148,6 +153,7 @@ func getNetworkConfig(cfg types.Bacalhau) (node.NetworkConfig, error) {
 		return node.NetworkConfig{}, err
 	}
 	return node.NetworkConfig{
+		Host	: cfg.Orchestrator.Host,
 		Port:                     cfg.Orchestrator.Port,
 		AdvertisedAddress:        cfg.Orchestrator.Advertise,
 		Orchestrators:            cfg.Compute.Orchestrators,

diff --git a/pkg/nats/transport/nats.go b/pkg/nats/transport/nats.go
@@ -29,6 +29,7 @@ const reservedChars = ".*>"
 
 type NATSTransportConfig struct {
 	NodeID            string
+	Host              string
 	Port              int
 	AdvertisedAddress string
 	Orchestrators     []string
@@ -102,6 +103,7 @@ func NewNATSTransport(ctx context.Context,
 		// create nats server with servers acting as its cluster peers
 		serverOpts := &server.Options{
 			ServerName:             config.NodeID,
+			Host:                   config.Host,
 			Port:                   config.Port,
 			ClientAdvertise:        config.AdvertisedAddress,
 			Authorization:          config.AuthSecret,

diff --git a/pkg/node/config_network.go b/pkg/node/config_network.go
@@ -2,6 +2,7 @@ package node
 
 type NetworkConfig struct {
 	// NATS config for requesters to be reachable by compute nodes
+	Host              string
 	Port              int
 	AdvertisedAddress string
 	Orchestrators     []string

diff --git a/pkg/node/node.go b/pkg/node/node.go
@@ -401,6 +401,7 @@ func createAPIServer(config NodeConfig, userKey *baccrypto.UserKey) (*publicapi.
 func createTransport(ctx context.Context, config NodeConfig) (*nats_transport.NATSTransport, error) {
 	transportLayer, err := nats_transport.NewNATSTransport(ctx, &nats_transport.NATSTransportConfig{
 		NodeID:                   config.NodeID,
+		Host:                     config.NetworkConfig.Host,
 		Port:                     config.NetworkConfig.Port,
 		AdvertisedAddress:        config.NetworkConfig.AdvertisedAddress,
 		AuthSecret:               config.NetworkConfig.AuthSecret,