raijin-server 0.2.7__tar.gz → 0.2.8__tar.gz

{raijin_server-0.2.7/src/raijin_server.egg-info → raijin_server-0.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: raijin-server
-Version: 0.2.7
+Version: 0.2.8
 Summary: CLI para automacao de setup e hardening de servidores Ubuntu Server.
 Home-page: https://example.com/raijin-server
 Author: Equipe Raijin

{raijin_server-0.2.7 → raijin_server-0.2.8}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = raijin-server
-version = 0.2.7
+version = 0.2.8
 description = CLI para automacao de setup e hardening de servidores Ubuntu Server.
 long_description = file: README.md
 long_description_content_type = text/markdown

{raijin_server-0.2.7 → raijin_server-0.2.8}/src/raijin_server/config.py

@@ -78,15 +78,15 @@ class ConfigManager:
             "modules": {
                 "network": {
                     "interface": "ens18",
-                    "address": "192.168.0.10/24",
-                    "gateway": "192.168.0.1",
-                    "dns": "1.1.1.1,8.8.8.8",
+                    "address": "192.168.1.81/24",
+                    "gateway": "192.168.1.254",
+                    "dns": "177.128.80.44,177.128.80.45",
                 },
                 "kubernetes": {
                     "pod_cidr": "10.244.0.0/16",
                     "service_cidr": "10.96.0.0/12",
                     "cluster_name": "raijin",
-                    "advertise_address": "0.0.0.0",
+                    "advertise_address": "192.168.1.81",
                 },
                 "calico": {
                     "pod_cidr": "10.244.0.0/16",

{raijin_server-0.2.7 → raijin_server-0.2.8}/src/raijin_server/healthchecks.py

@@ -124,6 +124,21 @@ def check_k8s_pods_in_namespace(namespace: str, ctx: ExecutionContext, timeout:
     )
 
 
+def check_swap_disabled(ctx: ExecutionContext) -> tuple[bool, str]:
+    """Confirma que nao ha swap ativa (requisito kubeadm/kubelet)."""
+    if ctx.dry_run:
+        return True, "dry-run"
+    try:
+        with open("/proc/swaps") as f:
+            lines = f.read().strip().splitlines()
+        # /proc/swaps tem header + linhas; se so header, swap esta off
+        if len(lines) <= 1:
+            return True, "swap desativada"
+        return False, "swap ativa (remova entradas do fstab e execute swapoff -a)"
+    except Exception as exc:
+        return False, f"falha ao verificar swap: {exc}"
+
+
 def check_helm_release(release: str, namespace: str, ctx: ExecutionContext) -> Tuple[bool, str]:
     """Verifica status de um release Helm."""
     if ctx.dry_run:
@@ -217,6 +232,13 @@ def verify_kubernetes(ctx: ExecutionContext) -> bool:
     services = ["kubelet", "containerd"]
     all_ok = True
 
+    swap_ok, swap_msg = check_swap_disabled(ctx)
+    if swap_ok:
+        typer.secho(f"  ✓ Swap: {swap_msg}", fg=typer.colors.GREEN)
+    else:
+        typer.secho(f"  ✗ Swap: {swap_msg}", fg=typer.colors.RED)
+        all_ok = False
+
     for service in services:
         ok, status = check_systemd_service(service, ctx)
         if ok:

{raijin_server-0.2.7 → raijin_server-0.2.8}/src/raijin_server/modules/kubernetes.py

@@ -146,6 +146,11 @@ def run(ctx: ExecutionContext) -> None:
     enable_service("containerd", ctx)
     enable_service("kubelet", ctx)
 
+    # Garante swap off antes de prosseguir (requisito kubeadm)
+    typer.echo("Desabilitando swap (requisito Kubernetes)...")
+    run_cmd(["swapoff", "-a"], ctx, check=False)
+    run_cmd("sed -i '/swap/d' /etc/fstab", ctx, use_shell=True, check=False)
+
     # kubeadm exige ip_forward=1; sobrepoe ajuste de hardening para fase de cluster.
     # Desabilita IPv6 completamente para evitar erros de preflight e simplificar rede
     sysctl_k8s = """# Kubernetes network settings
@@ -164,7 +169,19 @@ net.ipv6.conf.lo.disable_ipv6=1
     pod_cidr = typer.prompt("Pod CIDR", default="10.244.0.0/16")
     service_cidr = typer.prompt("Service CIDR", default="10.96.0.0/12")
     cluster_name = typer.prompt("Nome do cluster", default="raijin")
-    advertise_address = typer.prompt("API advertise address", default="0.0.0.0")
+    default_adv = "192.168.1.81"
+    advertise_address = typer.prompt("API advertise address", default=default_adv)
+    if advertise_address != default_adv:
+        typer.secho(
+            f"⚠ Para ambiente atual use {default_adv} (IP LAN, evita NAT).", fg=typer.colors.YELLOW
+        )
+        if not typer.confirm(f"Deseja forcar {default_adv}?", default=True):
+            typer.secho(
+                f"Usando valor informado: {advertise_address}. Certifique-se que todos os nos alcancem esse IP.",
+                fg=typer.colors.YELLOW,
+            )
+        else:
+            advertise_address = default_adv
 
     kubeadm_config = f"""apiVersion: kubeadm.k8s.io/v1beta3
 kind: ClusterConfiguration

{raijin_server-0.2.7 → raijin_server-0.2.8}/src/raijin_server/modules/network.py

@@ -124,9 +124,9 @@ def run(ctx: ExecutionContext) -> None:
         )
 
     iface = typer.prompt("Interface", default="ens18")
-    address = typer.prompt("Endereco CIDR", default="192.168.0.10/24")
-    gateway = typer.prompt("Gateway", default="192.168.0.1")
-    dns = typer.prompt("DNS (separe por virgula)", default="1.1.1.1,8.8.8.8")
+    address = typer.prompt("Endereco CIDR", default="192.168.1.81/24")
+    gateway = typer.prompt("Gateway", default="192.168.1.254")
+    dns = typer.prompt("DNS (separe por virgula)", default="177.128.80.44,177.128.80.45")
 
     dns_list = ",".join([item.strip() for item in dns.split(",") if item.strip()])
     netplan_content = f"""network:

{raijin_server-0.2.7 → raijin_server-0.2.8}/src/raijin_server/modules/sanitize.py

@@ -7,7 +7,14 @@ from pathlib import Path
 
 import typer
 
-from raijin_server.utils import ExecutionContext, require_root, run_cmd
+from raijin_server.utils import ExecutionContext, require_root, run_cmd, write_file
+
+# Defaults alinhados com configuracao de rede solicitada
+NETPLAN_IFACE = "ens18"
+NETPLAN_ADDRESS = "192.168.1.81/24"
+NETPLAN_GATEWAY = "192.168.1.254"
+NETPLAN_DNS = "177.128.80.44,177.128.80.45"
+NETPLAN_PATH = Path("/etc/netplan/01-raijin-static.yaml")
 
 SYSTEMD_SERVICES = [
     "kubelet",
@@ -48,6 +55,44 @@ APT_MARKERS = [
 ]
 
 
+def _ensure_netplan(ctx: ExecutionContext) -> None:
+    """Garante que o netplan esteja com IP fixo esperado; se ja estiver, mostra OK."""
+
+    desired = f"""network:
+  version: 2
+  renderer: networkd
+  ethernets:
+    {NETPLAN_IFACE}:
+      dhcp4: false
+      addresses: [{NETPLAN_ADDRESS}]
+      gateway4: {NETPLAN_GATEWAY}
+      nameservers:
+        addresses: [{NETPLAN_DNS}]
+"""
+
+    existing = None
+    if NETPLAN_PATH.exists():
+        try:
+            existing = NETPLAN_PATH.read_text()
+        except Exception:
+            existing = None
+
+    if existing and all(x in existing for x in (NETPLAN_ADDRESS, NETPLAN_GATEWAY, NETPLAN_DNS)):
+        typer.secho(
+            f"\n✓ Netplan ja configurado com {NETPLAN_ADDRESS} / gw {NETPLAN_GATEWAY} / dns {NETPLAN_DNS}",
+            fg=typer.colors.GREEN,
+        )
+        return
+
+    typer.echo("Aplicando netplan padrao antes da limpeza...")
+    write_file(NETPLAN_PATH, desired, ctx)
+    run_cmd(["netplan", "apply"], ctx, check=False)
+    typer.secho(
+        f"✓ Netplan ajustado para {NETPLAN_ADDRESS} (gw {NETPLAN_GATEWAY}, dns {NETPLAN_DNS})",
+        fg=typer.colors.GREEN,
+    )
+
+
 def _stop_services(ctx: ExecutionContext) -> None:
     typer.echo("Parando serviços relacionados (kubelet, containerd)...")
     for service in SYSTEMD_SERVICES:
@@ -131,6 +176,9 @@ def run(ctx: ExecutionContext) -> None:
             typer.echo("Sanitizacao cancelada pelo usuario.")
             return
 
+    # Primeiro passo: garantir netplan consistente, sem quebrar ao limpar
+    _ensure_netplan(ctx)
+
     _stop_services(ctx)
     _kubeadm_reset(ctx)
     _flush_iptables(ctx)

{raijin_server-0.2.7 → raijin_server-0.2.8/src/raijin_server.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: raijin-server
-Version: 0.2.7
+Version: 0.2.8
 Summary: CLI para automacao de setup e hardening de servidores Ubuntu Server.
 Home-page: https://example.com/raijin-server
 Author: Equipe Raijin