raijin-server 0.2.27__py3-none-any.whl → 0.2.28__py3-none-any.whl

raijin_server/__init__.py

@@ -1,5 +1,5 @@
 """Pacote principal do CLI Raijin Server."""
 
-__version__ = "0.2.27"
+__version__ = "0.2.28"
 
 __all__ = ["__version__"]

raijin_server/modules/kong.py

@@ -52,7 +52,7 @@ def _check_existing_kong(ctx: ExecutionContext) -> bool:
 
 
 def _check_orphan_crds(ctx: ExecutionContext) -> list[str]:
-    """Detecta CRDs orfaos do Kong (sem ownership do Helm)."""
+    """Detecta CRDs do Kong que existem sem ownership do Helm."""
     result = run_cmd(
         ["kubectl", "get", "crd", "-o", "name"],
         ctx,
@@ -72,19 +72,71 @@ def _check_orphan_crds(ctx: ExecutionContext) -> list[str]:
     return kong_crds
 
 
-def _cleanup_orphan_crds(ctx: ExecutionContext, crds: list[str]) -> None:
-    """Remove CRDs orfaos do Kong."""
-    typer.echo(f"Removendo {len(crds)} CRDs orfaos do Kong...")
+def _adopt_crds_for_helm(ctx: ExecutionContext, crds: list[str]) -> bool:
+    """Adiciona labels do Helm aos CRDs existentes para permitir adocao."""
+    typer.echo(f"Adicionando labels Helm a {len(crds)} CRDs existentes...")
     
     for crd in crds:
+        # Adiciona label managed-by
         run_cmd(
-            ["kubectl", "delete", "crd", crd, "--ignore-not-found"],
+            ["kubectl", "label", "crd", crd, "app.kubernetes.io/managed-by=Helm", "--overwrite"],
+            ctx,
+            check=False,
+        )
+        # Adiciona annotations de release
+        run_cmd(
+            ["kubectl", "annotate", "crd", crd, "meta.helm.sh/release-name=kong", "--overwrite"],
+            ctx,
+            check=False,
+        )
+        run_cmd(
+            ["kubectl", "annotate", "crd", crd, "meta.helm.sh/release-namespace=kong", "--overwrite"],
             ctx,
             check=False,
         )
     
-    time.sleep(3)
-    typer.secho("  CRDs orfaos removidos.", fg=typer.colors.GREEN)
+    typer.secho("  ✓ CRDs preparados para adocao pelo Helm.", fg=typer.colors.GREEN)
+    return True
+
+
+def _cleanup_orphan_crds(ctx: ExecutionContext, crds: list[str]) -> bool:
+    """Remove CRDs do Kong completamente."""
+    typer.echo(f"Removendo {len(crds)} CRDs do Kong...")
+    
+    for crd in crds:
+        run_cmd(
+            ["kubectl", "delete", "crd", crd, "--ignore-not-found", "--wait=true"],
+            ctx,
+            check=False,
+        )
+    
+    # Aguarda e verifica se foram realmente removidos
+    typer.echo("  Aguardando remocao completa dos CRDs...")
+    max_attempts = 10
+    for attempt in range(max_attempts):
+        time.sleep(2)
+        remaining = _check_orphan_crds(ctx)
+        if not remaining:
+            typer.secho("  ✓ CRDs removidos com sucesso.", fg=typer.colors.GREEN)
+            return True
+        
+        if attempt < max_attempts - 1:
+            typer.echo(f"  Ainda restam {len(remaining)} CRDs. Tentando remover novamente...")
+            for crd in remaining:
+                run_cmd(
+                    ["kubectl", "delete", "crd", crd, "--ignore-not-found", "--wait=true", "--timeout=30s"],
+                    ctx,
+                    check=False,
+                )
+    
+    remaining = _check_orphan_crds(ctx)
+    if remaining:
+        typer.secho(f"  ⚠️  {len(remaining)} CRDs ainda existem:", fg=typer.colors.YELLOW)
+        for crd in remaining[:5]:
+            typer.echo(f"      - {crd}")
+        return False
+    
+    return True
 
 
 def _uninstall_kong(ctx: ExecutionContext) -> None:
@@ -158,29 +210,42 @@ def run(ctx: ExecutionContext) -> None:
         if cleanup:
             _uninstall_kong(ctx)
     
-    # Verificar CRDs orfaos (sem ownership do Helm)
-    orphan_crds = _check_orphan_crds(ctx)
-    if orphan_crds:
+    # Verificar CRDs existentes do Kong (sem ownership do Helm)
+    existing_crds = _check_orphan_crds(ctx)
+    skip_crds = False
+    
+    if existing_crds:
         typer.secho(
-            f"\n⚠️  Detectados {len(orphan_crds)} CRDs orfaos do Kong (sem ownership do Helm):",
+            f"\n⚠️  Detectados {len(existing_crds)} CRDs do Kong sem labels do Helm:",
             fg=typer.colors.YELLOW,
         )
-        for crd in orphan_crds[:5]:
+        for crd in existing_crds[:5]:
             typer.echo(f"    - {crd}")
-        if len(orphan_crds) > 5:
-            typer.echo(f"    ... e mais {len(orphan_crds) - 5}")
+        if len(existing_crds) > 5:
+            typer.echo(f"    ... e mais {len(existing_crds) - 5}")
         
-        cleanup_crds = typer.confirm(
-            "\nRemover CRDs orfaos para permitir instalacao limpa?",
-            default=True,
-        )
-        if cleanup_crds:
-            _cleanup_orphan_crds(ctx, orphan_crds)
+        typer.echo("\nOpcoes:")
+        typer.echo("  1. Adotar CRDs existentes (adicionar labels Helm) - RECOMENDADO")
+        typer.echo("  2. Deletar CRDs e deixar Helm recriar")
+        typer.echo("  3. Ignorar CRDs (usar --skip-crds)")
+        typer.echo("  4. Cancelar instalacao")
+        
+        choice = typer.prompt("Escolha", default="1")
+        
+        if choice == "1":
+            _adopt_crds_for_helm(ctx, existing_crds)
+        elif choice == "2":
+            cleanup_success = _cleanup_orphan_crds(ctx, existing_crds)
+            if not cleanup_success:
+                if not typer.confirm("CRDs ainda existem. Continuar mesmo assim?", default=False):
+                    typer.secho("Instalacao cancelada.", fg=typer.colors.RED)
+                    return
+        elif choice == "3":
+            skip_crds = True
+            typer.secho("Helm não gerenciará os CRDs existentes.", fg=typer.colors.YELLOW)
         else:
-            typer.secho(
-                "AVISO: A instalacao pode falhar devido aos CRDs orfaos.",
-                fg=typer.colors.YELLOW,
-            )
+            typer.secho("Instalacao cancelada.", fg=typer.colors.RED)
+            return
 
     # Detectar dependencias
     has_metallb = _check_metallb_installed(ctx)
@@ -273,6 +338,11 @@ podAnnotations:
 
     run_cmd(["kubectl", "create", "namespace", "kong"], ctx, check=False)
     
+    # Monta args extras para o helm
+    extra_args = ["-f", str(values_path)]
+    if skip_crds:
+        extra_args.append("--skip-crds")
+    
     helm_upgrade_install(
         release="kong",
         chart="kong",
@@ -281,7 +351,7 @@ podAnnotations:
         repo_url="https://charts.konghq.com",
         ctx=ctx,
         values=[],
-        extra_args=["-f", str(values_path)],
+        extra_args=extra_args,
     )
     
     # Aguarda pods ficarem prontos

{raijin_server-0.2.27.dist-info → raijin_server-0.2.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: raijin-server
-Version: 0.2.27
+Version: 0.2.28
 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.27.dist-info → raijin_server-0.2.28.dist-info}/RECORD

@@ -1,4 +1,4 @@
-raijin_server/__init__.py,sha256=ZjIsech_uw8wSidEG2vZITmdC6GCiNK6nsXDMvlyVog,95
+raijin_server/__init__.py,sha256=WPj_zYPlDDdC8qb99tlMy-WAu5vWOQOyCldFgDmmT9Q,95
 raijin_server/cli.py,sha256=2m7q1znMLbBdnUwN6oOUrCZXEqC2e7SfbjYkymbP4lQ,37884
 raijin_server/config.py,sha256=QNiEVvrbW56XgvNn5-h3bkJm46Xc8mjNqPbvixXD8N0,4829
 raijin_server/healthchecks.py,sha256=lzXdFw6S0hOYbUKbqksh4phb04lXgXdTspP1Dsz4dx8,15401
@@ -18,7 +18,7 @@ raijin_server/modules/hardening.py,sha256=4hz3ifkMhPlXa2n7gPxN0gitQgzALZ-073vuU3
 raijin_server/modules/harness.py,sha256=uWTxTVJlY_VB6xi4ftMtTSaIb96HA8WJQS-RbyxU45M,5391
 raijin_server/modules/istio.py,sha256=o0K5-Fw4LRs-kbAVgwzYxHzEt_aPFJG8suqOqvg2748,7297
 raijin_server/modules/kafka.py,sha256=n7ZpLPWv6sKBJhdBiPe7VgeDB24YiCIOWvOQkWwt03Y,5664
-raijin_server/modules/kong.py,sha256=s6g8Qq_SyUBy_AIXXSTAb9XyqaQrK3eDOU_xS5merRw,9825
+raijin_server/modules/kong.py,sha256=5KCGcIhnEkHHwYEDEDdUTaoDCUwn7HKaZetoqOBlP3E,12553
 raijin_server/modules/kubernetes.py,sha256=9E6zV0zGQWZW92NVpxwYctpi-4JDmi6YzF3tKRI4HlU,13343
 raijin_server/modules/loki.py,sha256=aNiUpnOFppZMXoQwYhn7IoPMzwUz4aHi6pbiqj1PRjc,5022
 raijin_server/modules/metallb.py,sha256=uUuklc_RsQ-W2qDVRMQAxQm9HKGEqso444b1IwBpM6w,8554
@@ -38,9 +38,9 @@ raijin_server/scripts/checklist.sh,sha256=j6E0Kmk1EfjLvKK1VpCqzXJAXI_7Bm67LK4ndy
 raijin_server/scripts/install.sh,sha256=Y1ickbQ4siQ0NIPs6UgrqUr8WWy7U0LHmaTQbEgavoI,3949
 raijin_server/scripts/log_size_metric.sh,sha256=Iv4SsX8AuCYRou-klYn32mX41xB6j0xJGLBO6riw4rU,1208
 raijin_server/scripts/pre-deploy-check.sh,sha256=XqMo7IMIpwUHF17YEmU0-cVmTDMoCGMBFnmS39FidI4,4912
-raijin_server-0.2.27.dist-info/licenses/LICENSE,sha256=kJsMCjOiRZE0AQNtxWqBa32z9kMAaF4EUxyHj3hKaJo,1105
-raijin_server-0.2.27.dist-info/METADATA,sha256=zvRHWIQU7Lere-1GwtkxnNNtcReyE5BFUqpMyKPEgk8,22476
-raijin_server-0.2.27.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-raijin_server-0.2.27.dist-info/entry_points.txt,sha256=3ZvxDX4pvcjkIRsXAJ69wIfVmKa78LKo-C3QhqN2KVM,56
-raijin_server-0.2.27.dist-info/top_level.txt,sha256=Yz1xneCRtsZOzbPIcTAcrSxd-1p80pohMXYAZ74dpok,14
-raijin_server-0.2.27.dist-info/RECORD,,
+raijin_server-0.2.28.dist-info/licenses/LICENSE,sha256=kJsMCjOiRZE0AQNtxWqBa32z9kMAaF4EUxyHj3hKaJo,1105
+raijin_server-0.2.28.dist-info/METADATA,sha256=hVqz4e9G6A5HwIr9nHeGF1zGwDSKoiuPDPGttOAY1vM,22476
+raijin_server-0.2.28.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+raijin_server-0.2.28.dist-info/entry_points.txt,sha256=3ZvxDX4pvcjkIRsXAJ69wIfVmKa78LKo-C3QhqN2KVM,56
+raijin_server-0.2.28.dist-info/top_level.txt,sha256=Yz1xneCRtsZOzbPIcTAcrSxd-1p80pohMXYAZ74dpok,14
+raijin_server-0.2.28.dist-info/RECORD,,