Skip to content

fix issue with instances not being destroyed #95

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
joshterrill wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix issue with instances not being destroyed #95

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
2 changes: 1 addition & 1 deletion numerai/cli/destroy_all.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def destroy_all(ctx, verbose, preserve_node_config):
verbose,
provider,
env_vars=provider_keys,
inputs={"node_config_file": "nodes.json"},
inputs={"node_config_file": "../nodes.json"},
)

except Exception as e:
Expand Down
2 changes: 1 addition & 1 deletion numerai/cli/node/destroy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def destroy(ctx, preserve_node_config, verbose):
verbose,
provider,
env_vars=provider_keys,
inputs={"node_config_file": "nodes.json"},
inputs={"node_config_file": "../nodes.json"},
)

except Exception as e:
Expand Down
2 changes: 1 addition & 1 deletion numerai/cli/uninstall.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def uninstall():
provider=provider,
verbose=True,
env_vars=provider_keys,
inputs={"node_config_file": "nodes.json"},
inputs={"node_config_file": "../nodes.json"},
)

click.secho("cleaning up docker images...")
Expand Down
2 changes: 1 addition & 1 deletion numerai/cli/upgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ def upgrade(verbose):
verbose,
provider="aws",
env_vars=load_or_init_keys("aws"),
inputs={"node_config_file": "nodes.json"},
inputs={"node_config_file": "../nodes.json"},
)

click.secho("Upgrade complete!", fg="green")
Expand Down
8 changes: 4 additions & 4 deletions numerai/cli/util/terraform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def apply_terraform(nodes_config, affected_providers, provider, verbose):
verbose,
affected_provider,
env_vars=load_or_init_keys(affected_provider),
inputs={"node_config_file": "nodes.json"},
inputs={"node_config_file": "../nodes.json"},
)
else:
click.secho(f"provider {affected_provider} not supported", fg="red")
Expand Down Expand Up @@ -51,7 +51,7 @@ def create_azure_registry(provider, provider_keys, verbose):
verbose,
"azure",
env_vars=provider_keys,
inputs={"node_config_file": "nodes.json"},
inputs={"node_config_file": "../nodes.json"},
)
res = terraform("output -json acr_repo_details", True, provider).decode("utf-8")
return json.loads(res)
Expand All @@ -64,13 +64,13 @@ def create_gcp_registry(provider, verbose):
'apply -target="google_project_service.cloud_resource_manager" -auto-approve ',
verbose,
"gcp",
inputs={"node_config_file": "nodes.json"},
inputs={"node_config_file": "../nodes.json"},
)
terraform(
'apply -target="google_artifact_registry_repository.registry[0]" -auto-approve ',
verbose,
"gcp",
inputs={"node_config_file": "nodes.json"},
inputs={"node_config_file": "../nodes.json"},
)
res = terraform("output -json artifact_registry_details", True, provider).decode(
"utf-8"
Expand Down
2 changes: 1 addition & 1 deletion numerai/terraform/aws/-inputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ variable "az_count" {
variable "node_config_file" {
description = "Path to the json file used to configure nodes"
type = string
default = "nodes.json"
default = "../nodes.json"
}

variable "node_container_port" {
Expand Down
2 changes: 1 addition & 1 deletion numerai/terraform/aws/aws/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ resource "aws_launch_template" "node" {
}

resource "aws_batch_compute_environment" "node" {
compute_environment_name_prefix = "${local.node_prefix}-"
compute_environment_name = "${local.node_prefix}-compute"

compute_resources {
instance_role = aws_iam_instance_profile.batch_ecs_instance_role.arn
Expand Down
2 changes: 1 addition & 1 deletion numerai/terraform/azure/input.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ variable "az_resource_group_location" {
variable "node_config_file" {
description = "Path to the json file used to configure nodes"
type = string
default = "nodes.json"
default = "../nodes.json"
}

variable "node_container_port" {
Expand Down
2 changes: 1 addition & 1 deletion numerai/terraform/gcp/-inputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ variable "region" {
variable "node_config_file" {
description = "Path to the json file used to configure nodes"
type = string
default = "nodes.json"
default = "../nodes.json"
}
Loading