Compare commits

...

2 Commits

Author SHA1 Message Date
whentimeslows 847f05d316 Updated VMs to 8GB RAM due to mem pressure
Deploy home services / deploy-nas1 (push) Has been cancelled
Deploy home services / deploy-rhel1 (push) Has been cancelled
2026-10-03 14:39:03 -06:00
whentimeslows 191e41bbe9 Adjusting folder to compose-services so we don't get confused with the argo folder 2026-10-03 14:38:14 -06:00
3 changed files with 15 additions and 15 deletions
+2 -2
View File
@@ -17,8 +17,8 @@ sudo virsh net-start my-talos-net
sudo virsh net-autostart my-talos-net
sudo mv ~/downloads/metal-arm64.iso /var/lib/libvirt/images/
sudo chown root: /var/lib/libvirt/images/metal-amd64.iso
sudo virt-install --virt-type kvm --name control-plane-node-1 --ram 2048 --vcpus 2 --disk path=control-plane-node-1-disk.qcow2,bus=virtio,size=40,format=qcow2 --cdrom metal-amd64.iso --os-variant=linux2022 --network network=my-talos-net --boot hd,cdrom --noautoconsole
sudo virt-install --virt-type kvm --name worker-node-1 --ram 4096 --vcpus 4 --disk path=control-plane-node-1-disk.qcow2,bus=virtio,size=40,format=qcow2 --cdrom metal-amd64.iso --os-variant=linux2022 --network network=my-talos-net --boot hd,cdrom --noautoconsole
sudo virt-install --virt-type kvm --name control-plane-node-1 --ram 8192 --vcpus 4 --disk path=control-plane-node-1-disk.qcow2,bus=virtio,size=40,format=qcow2 --cdrom metal-amd64.iso --os-variant=linux2022 --network network=my-talos-net --boot hd,cdrom --noautoconsole
sudo virt-install --virt-type kvm --name worker-node-1 --ram 8192 --vcpus 4 --disk path=control-plane-node-1-disk.qcow2,bus=virtio,size=40,format=qcow2 --cdrom metal-amd64.iso --os-variant=linux2022 --network network=my-talos-net --boot hd,cdrom --noautoconsole
```
+3 -3
View File
@@ -58,7 +58,7 @@ def build_compose_command(
def discover_compose_files(root: Path) -> list[Path]:
"""Return compose files under the services directory."""
services_dir = root / "compose-services"
services_dir = root / "services"
if not services_dir.exists():
return []
@@ -67,7 +67,7 @@ def discover_compose_files(root: Path) -> list[Path]:
def discover_stack_names(root: Path) -> list[str]:
"""Infer stack names from the services directory layout."""
services_dir = root / "compose-services"
services_dir = root / "services"
if not services_dir.exists():
return []
@@ -135,7 +135,7 @@ def main() -> int:
failure_count = 0
for stack_name in stack_names:
compose_file = args.compose_file or Path(f"compose-services/{stack_name}/compose.yaml")
compose_file = args.compose_file or Path(f"services/{stack_name}/compose.yaml")
project_name = args.project_name or f"{stack_name}_services"
if args.action == "refresh":
+10 -10
View File
@@ -26,7 +26,7 @@ class ComposeCtlTests(unittest.TestCase):
def test_build_compose_command_uses_selected_runtime(self):
cmd = build_compose_command(
runtime="podman",
compose_file=Path("compose-services/media_rhel1/compose.yaml"),
compose_file=Path("services/media_rhel1/compose.yaml"),
project_name="media_rhel1_services",
action="up",
)
@@ -36,7 +36,7 @@ class ComposeCtlTests(unittest.TestCase):
"podman",
"compose",
"-f",
"compose-services/media_rhel1/compose.yaml",
"services/media_rhel1/compose.yaml",
"-p",
"media_rhel1_services",
"up",
@@ -47,8 +47,8 @@ class ComposeCtlTests(unittest.TestCase):
def test_discover_compose_files_finds_existing_stacks(self):
stack_files = discover_compose_files(Path("."))
self.assertIn(Path("compose-services/media_nas1/compose.yaml"), stack_files)
self.assertIn(Path("compose-services/media_rhel1/compose.yaml"), stack_files)
self.assertIn(Path("services/media_nas1/compose.yaml"), stack_files)
self.assertIn(Path("services/media_rhel1/compose.yaml"), stack_files)
def test_discover_stack_names_returns_inferred_stack_names(self):
stack_names = discover_stack_names(Path("."))
@@ -58,22 +58,22 @@ class ComposeCtlTests(unittest.TestCase):
def test_build_update_commands_returns_full_stack_refresh_sequence(self):
commands = build_update_commands(
runtime="podman",
compose_file=Path("compose-services/media_rhel1/compose.yaml"),
compose_file=Path("services/media_rhel1/compose.yaml"),
project_name="media_rhel1_services",
)
self.assertEqual(
commands,
[
["podman", "compose", "-f", "compose-services/media_rhel1/compose.yaml", "-p", "media_rhel1_services", "config"],
["podman", "compose", "-f", "compose-services/media_rhel1/compose.yaml", "-p", "media_rhel1_services", "pull"],
["podman", "compose", "-f", "compose-services/media_rhel1/compose.yaml", "-p", "media_rhel1_services", "up", "-d", "--remove-orphans"],
["podman", "compose", "-f", "services/media_rhel1/compose.yaml", "-p", "media_rhel1_services", "config"],
["podman", "compose", "-f", "services/media_rhel1/compose.yaml", "-p", "media_rhel1_services", "pull"],
["podman", "compose", "-f", "services/media_rhel1/compose.yaml", "-p", "media_rhel1_services", "up", "-d", "--remove-orphans"],
],
)
def test_build_update_commands_can_include_image_prune(self):
commands = build_update_commands(
runtime="docker",
compose_file=Path("compose-services/media_nas1/compose.yaml"),
compose_file=Path("services/media_nas1/compose.yaml"),
project_name="media_nas1_services",
prune=True,
)
@@ -82,7 +82,7 @@ class ComposeCtlTests(unittest.TestCase):
def test_build_compose_command_can_validate_configuration(self):
command = build_compose_command(
runtime="docker",
compose_file=Path("compose-services/media_nas1/compose.yaml"),
compose_file=Path("services/media_nas1/compose.yaml"),
project_name="media_nas1_services",
action="config",
)