Skip to content

fixup namespace directory constants #544

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

Merged
merged 1 commit into from
Sep 7, 2024
Merged

fixup namespace directory constants #544

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: 2 additions & 0 deletions src/warnet/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@
SRC_DIR = files("warnet")
RESOURCES_DIR = files("resources")
NETWORK_DIR = RESOURCES_DIR.joinpath("networks")
NAMESPACES_DIR = RESOURCES_DIR.joinpath("namespaces")
SCENARIOS_DIR = RESOURCES_DIR.joinpath("scenarios")
CHARTS_DIR = RESOURCES_DIR.joinpath("charts")
MANIFESTS_DIR = RESOURCES_DIR.joinpath("manifests")
NETWORK_FILE = "network.yaml"
DEFAULTS_FILE = "node-defaults.yaml"
NAMESPACES_FILE = "namespaces.yaml"
DEFAULTS_NAMESPACE_FILE = "namespace-defaults.yaml"

# Helm charts
BITCOIN_CHART_LOCATION = str(CHARTS_DIR.joinpath("bitcoincore"))
Expand Down
8 changes: 4 additions & 4 deletions src/warnet/deploy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@
from .constants import (
BITCOIN_CHART_LOCATION,
DEFAULTS_FILE,
DEFAULTS_NAMESPACE_FILE,
FORK_OBSERVER_CHART,
HELM_COMMAND,
NAMESPACES_CHART_LOCATION,
NAMESPACES_FILE,
NETWORK_FILE,
)
Expand Down Expand Up @@ -141,7 +143,7 @@ def deploy_network(directory: Path, debug: bool = False):

def deploy_namespaces(directory: Path):
namespaces_file_path = directory / NAMESPACES_FILE
defaults_file_path = directory / DEFAULTS_FILE
defaults_file_path = directory / DEFAULTS_NAMESPACE_FILE

with namespaces_file_path.open() as f:
namespaces_file = yaml.safe_load(f)
Expand All @@ -161,9 +163,7 @@ def deploy_namespaces(directory: Path):
namespace_name = namespace.get("name")
namespace_config_override = {k: v for k, v in namespace.items() if k != "name"}

cmd = (
f"{HELM_COMMAND} {namespace_name} {BITCOIN_CHART_LOCATION} -f {defaults_file_path}"
)
cmd = f"{HELM_COMMAND} {namespace_name} {NAMESPACES_CHART_LOCATION} -f {defaults_file_path}"

if namespace_config_override:
with tempfile.NamedTemporaryFile(
Expand Down
20 changes: 13 additions & 7 deletions src/warnet/namespaces.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,26 @@

from .constants import (
DEFAULT_NAMESPACES,
DEFAULTS_FILE,
DEFAULTS_NAMESPACE_FILE,
NAMESPACES_DIR,
NAMESPACES_FILE,
NETWORK_DIR,
)
from .process import run_command, stream_command


def copy_namespaces_defaults(directory: Path):
"""Create the project structure for a warnet project"""
(directory / NETWORK_DIR / DEFAULT_NAMESPACES).mkdir(parents=True, exist_ok=True)
target_namespaces_defaults = directory / NETWORK_DIR / DEFAULT_NAMESPACES / DEFAULTS_FILE
target_namespaces_example = directory / NETWORK_DIR / DEFAULT_NAMESPACES / NAMESPACES_FILE
shutil.copy2(NETWORK_DIR / DEFAULT_NAMESPACES / DEFAULTS_FILE, target_namespaces_defaults)
shutil.copy2(NETWORK_DIR / DEFAULT_NAMESPACES / NAMESPACES_FILE, target_namespaces_example)
(directory / NAMESPACES_DIR.name / DEFAULT_NAMESPACES).mkdir(parents=True, exist_ok=True)
target_namespaces_defaults = (
directory / NAMESPACES_DIR.name / DEFAULT_NAMESPACES / DEFAULTS_NAMESPACE_FILE
)
target_namespaces_example = (
directory / NAMESPACES_DIR.name / DEFAULT_NAMESPACES / NAMESPACES_FILE
)
shutil.copy2(
NAMESPACES_DIR / DEFAULT_NAMESPACES / DEFAULTS_NAMESPACE_FILE, target_namespaces_defaults
)
shutil.copy2(NAMESPACES_DIR / DEFAULT_NAMESPACES / NAMESPACES_FILE, target_namespaces_example)


@click.group(name="namespaces")
Expand Down