Skip to content

feat(api): make Nomad node pool configurable #2368

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

Open
chencjcj wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(api): make Nomad node pool configurable #2368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions iac/provider-aws/nomad/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ module "api" {
auth_db_min_idle_connections = var.auth_db_min_idle_connections

job_env_vars = {
NOMAD_NODE_POOL = var.orchestrator_node_pool
VOLUME_TOKEN_ISSUER = var.domain_name
VOLUME_TOKEN_SIGNING_KEY = "HMAC:${base64encode(random_password.volume_token_key.result)}"
VOLUME_TOKEN_SIGNING_KEY_NAME = "e2b-volume-token-key"
Expand Down
1 change: 1 addition & 0 deletions iac/provider-gcp/nomad/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ module "api" {
default_persistent_volume_type = var.default_persistent_volume_type

job_env_vars = {
NOMAD_NODE_POOL = var.orchestrator_node_pool
VOLUME_TOKEN_ISSUER = var.volume_token_issuer
VOLUME_TOKEN_SIGNING_KEY = var.volume_token_signing_key
VOLUME_TOKEN_SIGNING_KEY_NAME = var.volume_token_signing_key_name
Expand Down
5 changes: 3 additions & 2 deletions packages/api/internal/cfg/model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@ type Config struct {
LokiURL string `env:"LOKI_URL,required"`
LokiUser string `env:"LOKI_USER"`

NomadAddress string `env:"NOMAD_ADDRESS" envDefault:"http://localhost:4646"`
NomadToken string `env:"NOMAD_TOKEN"`
NomadAddress string `env:"NOMAD_ADDRESS" envDefault:"http://localhost:4646"`
NomadToken string `env:"NOMAD_TOKEN"`
NomadNodePool string `env:"NOMAD_NODE_POOL" envDefault:"default"`

PostgresConnectionString string `env:"POSTGRES_CONNECTION_STRING,required,notEmpty"`
DBMaxOpenConnections int32 `env:"DB_MAX_OPEN_CONNECTIONS" envDefault:"40"`
Expand Down
3 changes: 1 addition & 2 deletions packages/api/internal/orchestrator/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,7 @@ func (o *Orchestrator) listNomadNodes(ctx context.Context) ([]nodemanager.NomadS
defer listSpan.End()

options := &nomadapi.QueryOptions{
// TODO: Use variable for node pool name ("default")
Filter: "Status == \"ready\" and NodePool == \"default\"",
Filter: fmt.Sprintf("Status == \"ready\" and NodePool == \"%s\"", o.nomadNodePool),
}
nomadNodes, _, err := o.nomadClient.Nodes().List(options.WithContext(ctx))
if err != nil {
Expand Down
7 changes: 4 additions & 3 deletions packages/api/internal/orchestrator/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,10 @@ func newTestOrchestrator(t *testing.T, nomad *nomadapi.Client) *Orchestrator {
logger.ReplaceGlobals(ctx, logger.NewNopLogger())

return &Orchestrator{
nodes: smap.New[*nodemanager.Node](),
nomadClient: nomad,
tel: telemetry.NewNoopClient(),
nodes: smap.New[*nodemanager.Node](),
nomadClient: nomad,
nomadNodePool: "default",
tel: telemetry.NewNoopClient(),
}
}

Expand Down
2 changes: 2 additions & 0 deletions packages/api/internal/orchestrator/orchestrator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ type SnapshotCacheInvalidator interface {
type Orchestrator struct {
httpClient *http.Client
nomadClient *nomadapi.Client
nomadNodePool string
sandboxStore *sandbox.Store
nodes *smap.Map[*nodemanager.Node]
placementAlgorithm *placement.BestOfK
Expand Down Expand Up @@ -142,6 +143,7 @@ func New(
analytics: analyticsInstance,
posthogClient: posthogClient,
nomadClient: nomadClient,
nomadNodePool: config.NomadNodePool,
nodes: smap.New[*nodemanager.Node](),
placementAlgorithm: bestOfKAlgorithm,
featureFlagsClient: featureFlags,
Expand Down
Loading