py-pve-cloud 3.2.0rc0__tar.gz → 3.2.2__tar.gz

{py_pve_cloud-3.2.0rc0/src/py_pve_cloud.egg-info → py_pve_cloud-3.2.2}/PKG-INFO

@@ -1,10 +1,9 @@
 Metadata-Version: 2.4
 Name: py-pve-cloud
-Version: 3.2.0rc0
+Version: 3.2.2
 Author-email: Tobias Huebner <tobias.huebner@vmzberlin.com>
 License-Expression: GPL-3.0-or-later
 License-File: LICENSE.md
-Requires-Dist: PyYAML==6.0.3
 Requires-Dist: psycopg2-binary==2.9.11
 Requires-Dist: SQLAlchemy==2.0.45
 Requires-Dist: alembic==1.18.0
@@ -14,4 +13,5 @@ Requires-Dist: dnspython==2.8.0
 Requires-Dist: rpyc==6.0.2
 Requires-Dist: fabric==3.2.3
 Requires-Dist: asyncssh==2.22.0
+Requires-Dist: pve-cloud-schemas<3.2.0,>=3.1.7
 Dynamic: license-file

{py_pve_cloud-3.2.0rc0 → py_pve_cloud-3.2.2}/pyproject.toml

@@ -8,7 +8,6 @@ authors = [{ name = "Tobias Huebner", email = "tobias.huebner@vmzberlin.com" }]
 license = "GPL-3.0-or-later"
 license-files = ["LICENSE.md"]
 dependencies = [
-  "PyYAML==6.0.3",
   "psycopg2-binary==2.9.11",
   "SQLAlchemy==2.0.45",
   "alembic==1.18.0",
@@ -17,7 +16,8 @@ dependencies = [
   "dnspython==2.8.0",
   "rpyc==6.0.2",
   "fabric==3.2.3",
-  "asyncssh==2.22.0"
+  "asyncssh==2.22.0",
+  "pve-cloud-schemas>=3.1.7,<3.2.0"
 ]
 dynamic = ["version"]
 

py_pve_cloud-3.2.2/src/pve_cloud/_version.py

@@ -0,0 +1 @@
+__version__ = "3.2.2"

{py_pve_cloud-3.2.0rc0 → py_pve_cloud-3.2.2}/src/pve_cloud/cli/pvcli.py

@@ -4,11 +4,12 @@ from types import SimpleNamespace
 
 import yaml
 from proxmoxer import ProxmoxAPI
-from pve_cloud_schemas.validate import validate_cloud_dyn_inv
+from pve_cloud_schemas.validate import (validate_cloud_dyn_inv,
+                                        validate_cluster_vars)
 
 from pve_cloud.cli.pvclu import (get_ssh_master_kubeconfig,
                                  get_ssh_remote_master_kubeconfig)
-from pve_cloud.cli.pxrpc import launch_pxrpc
+from pve_cloud.cli.pxrpc import PxServiceEnum, launch_pxrpc
 from pve_cloud.lib.inventory import (get_cloud_domain, get_cluster_vars,
                                      get_online_pve_host, get_pve_inventory,
                                      get_target_cluster)
@@ -109,12 +110,19 @@ def connect_remote_cluster(args):
     jump_host = args.jump_hosts.split(",")[0]
 
     with launch_pxrpc(
-        jump_host, args.pve_host, init_venv=True, local_pypi_ip=args.local_pypi_ip
+        jump_host,
+        args.pve_host,
+        init_venv=True,
+        local_pypi_ip=args.local_pypi_ip,
+        service=PxServiceEnum.PROXMOXER,
     ) as (pxrpc, pve_host):
 
         def read_cluster_vars():
             result = pve_host.run("cat /etc/pve/cloud/cluster_vars.yaml")
-            return yaml.safe_load(result.stdout.strip())
+            cluster_vars = yaml.safe_load(result.stdout.strip())
+            validate_cluster_vars(cluster_vars)
+
+            return cluster_vars
 
         init_funcs = SimpleNamespace(
             cluster_vars=read_cluster_vars,
@@ -196,6 +204,7 @@ def print_kubeconfig(args):
             _, stdout, _ = pve_ssh.exec_command("cat /etc/pve/cloud/cluster_vars.yaml")
 
             cluster_vars = yaml.safe_load(stdout.read().decode("utf-8"))
+            validate_cluster_vars(cluster_vars)
 
             print(get_ssh_master_kubeconfig(cluster_vars, inventory["stack_name"]))
 

{py_pve_cloud-3.2.0rc0 → py_pve_cloud-3.2.2}/src/pve_cloud/cli/pvclu.py

@@ -6,6 +6,8 @@ import dns.resolver
 import paramiko
 import yaml
 from fabric import Connection
+from pve_cloud_schemas.validate import (validate_cloud_dyn_inv,
+                                        validate_cluster_vars)
 
 from pve_cloud.cli.pxrpc import launch_pxrpc
 from pve_cloud.lib.inventory import (get_cloud_domain, get_online_pve_host,
@@ -30,6 +32,7 @@ def get_ssh_remote_master_kubeconfig(stack_name, external_san, jump_host, pve_ho
 
         result = pve_host_conn.run("cat /etc/pve/cloud/cluster_vars.yaml")
         cluster_vars = yaml.safe_load(result.stdout.strip())
+        validate_cluster_vars(cluster_vars)
 
         ddns_ips = pxrpc.resolve_k8s_master(
             [cluster_vars["bind_master_ip"], cluster_vars["bind_slave_ip"]],
@@ -95,6 +98,7 @@ def get_ssh_master_kubeconfig(cluster_vars, stack_name):
     return yaml.safe_dump(admin_conf)
 
 
+# todo: rename function and implement rsync terraform cache mirroring like in terraform e2e suite
 def export_pg_conn_str(args):
     if not args.target_pve and not args.cloud_domain:
         raise RuntimeError("Neither --target-pve nor --cloud-domain was specified.")
@@ -119,6 +123,7 @@ def export_pg_conn_str(args):
     with connect_host(pve_host, jump_host=jump_host) as ssh:
         _, stdout, _ = ssh.exec_command("cat /etc/pve/cloud/cluster_vars.yaml")
         cluster_vars = yaml.safe_load(stdout.read().decode("utf-8"))
+        validate_cluster_vars(cluster_vars)
 
         _, stdout, _ = ssh.exec_command("cat /etc/pve/cloud/secrets/patroni.pass")
         patroni_pass = stdout.read().decode("utf-8").strip()

{py_pve_cloud-3.2.0rc0 → py_pve_cloud-3.2.2}/src/pve_cloud/cli/pxrpc.py

@@ -2,6 +2,7 @@ import asyncio
 import json
 import multiprocessing
 import os
+import re
 import signal
 import socket
 import subprocess
@@ -9,13 +10,18 @@ import sys
 import time
 from concurrent.futures import ProcessPoolExecutor
 from contextlib import asynccontextmanager, contextmanager
+from enum import StrEnum
 
+import dns.rcode
 import dns.resolver
+import dns.tsigkeyring
+import dns.update
 import pve_cloud._version as pxc_version
 import rpyc
 import yaml
 from fabric import Connection
 from proxmoxer import ProxmoxAPI
+from pve_cloud_schemas.validate import validate_cluster_vars
 from sqlalchemy import create_engine, delete, select
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import Session
@@ -23,6 +29,13 @@ from sqlalchemy.orm import Session
 from pve_cloud.orm.alchemy import (AcmeX509, ProxmoxCloudSecrets,
                                    VirtualMachineVars)
 
+
+# services need to implement the shutdown function
+class PxServiceEnum(StrEnum):
+    PXRPC = "PXRPC"
+    PROXMOXER = "PROXMOXER"
+
+
 # initialized / launched by pvcli connect_remote_cluster
 # it is launched on a proxmox host
 
@@ -43,6 +56,43 @@ def shutdown_handler(signum, frame):
     os.killpg(os.getpgrp(), signal.SIGKILL)
 
 
+@rpyc.service
+class RemoteProxmoxApi(rpyc.Service):
+
+    def __init__(self):
+        super().__init__()
+
+        # init services required by most functions
+        self.proxmox = ProxmoxAPI("127.0.0.1", user="root", backend="ssh_paramiko")
+
+    # rpyc doesnt have a clean shutdown methodology
+    # this is the cleanest i found without triggerin eof on the clients side
+    @rpyc.exposed
+    def shutdown(self):
+        os.kill(MASTER_PID, signal.SIGTERM)  # this triggers the shutdown handler
+
+    @rpyc.exposed
+    def get_pve_cluster_name(self):
+        # try get the cluster name
+        cluster_name = None
+        status_resp = self.proxmox.cluster.status.get()
+        for entry in status_resp:
+            if entry["id"] == "cluster":
+                cluster_name = entry["name"]
+                break
+
+        return cluster_name
+
+    @rpyc.exposed
+    def get_nodes(self):
+        return self.proxmox.nodes.get()
+
+    @rpyc.exposed
+    def get_node_network(self, node_name):
+        return self.proxmox.nodes(node_name).network.get()
+
+
+@rpyc.service
 class PxrpcService(rpyc.Service):
 
     # functions for constructor
@@ -54,6 +104,7 @@ class PxrpcService(rpyc.Service):
             check=True,
         )
         cluster_vars = yaml.safe_load(result_vars.stdout)
+        validate_cluster_vars(cluster_vars)
 
         return cluster_vars
 
@@ -69,43 +120,49 @@ class PxrpcService(rpyc.Service):
 
         return f"postgresql+psycopg2://postgres:{patroni_pass}@{cluster_vars['pve_haproxy_floating_ip_internal']}:5000/pve_cloud?sslmode=disable"
 
-    def __init__(self):
-        super().__init__()
+    def get_internal_bind_key(self):
+        result_key = subprocess.run(
+            ["cat", "/etc/pve/cloud/secrets/internal.key"],
+            capture_output=True,
+            text=True,
+            check=True,
+        )
 
-        # init services required by most functions
-        self.proxmox = ProxmoxAPI("127.0.0.1", user="root", backend="ssh_paramiko")
-        self.cluster_vars = self.get_cluster_vars()
-        self.patroni_cstr = self.get_pg_conn_str(
-            self.cluster_vars
-        )  # we need postgres for almost anything
+        return re.search(r'secret\s+"([^"]+)";', result_key.stdout).group(1)
+
+    def __init__(self, cluster_vars=None, patroni_cstr=None, internal_bind_key=None):
+        super().__init__()
 
-    def exposed_e2e_return(self):
+        if cluster_vars:
+            self.cluster_vars = cluster_vars
+        else:
+            self.cluster_vars = self.get_cluster_vars()
+
+        if internal_bind_key:
+            self.internal_bind_key = internal_bind_key
+        else:
+            self.internal_bind_key = self.get_internal_bind_key()
+
+        if patroni_cstr:
+            self.patroni_cstr = patroni_cstr
+        else:
+            self.patroni_cstr = self.get_pg_conn_str(
+                self.cluster_vars
+            )  # we need postgres for almost anything
+
+    @rpyc.exposed
+    def e2e_return(self):
         print(f"e2e return on pid {os.getpid()}")
         return self.patroni_cstr
 
-    def exposed_get_pve_cluster_name(self):
-        # try get the cluster name
-        cluster_name = None
-        status_resp = self.proxmox.cluster.status.get()
-        for entry in status_resp:
-            if entry["id"] == "cluster":
-                cluster_name = entry["name"]
-                break
-
-        return cluster_name
-
-    def exposed_get_nodes(self):
-        return self.proxmox.nodes.get()
-
-    def exposed_get_node_network(self, node_name):
-        return self.proxmox.nodes(node_name).network.get()
-
     # rpyc doesnt have a clean shutdown methodology
     # this is the cleanest i found without triggerin eof on the clients side
-    def exposed_shutdown(self):
+    @rpyc.exposed
+    def shutdown(self):
         os.kill(MASTER_PID, signal.SIGTERM)  # this triggers the shutdown handler
 
-    def exposed_resolve_k8s_master(self, nameservers, a_rs_hostname):
+    @rpyc.exposed
+    def resolve_k8s_master(self, nameservers, a_rs_hostname):
         resolver = dns.resolver.Resolver()
         resolver.nameservers = nameservers
         ddns_answer = resolver.resolve(a_rs_hostname)
@@ -114,7 +171,8 @@ class PxrpcService(rpyc.Service):
 
         return ddns_ips
 
-    def exposed_e2e_inject_cert(self, stack_fqdn, record0):
+    @rpyc.exposed
+    def e2e_inject_cert(self, stack_fqdn, record0):
         engine = create_engine(self.patroni_cstr)
 
         # update certs and mirror pull secret
@@ -129,7 +187,8 @@ class PxrpcService(rpyc.Service):
             session.merge(copy_cert)
             session.commit()
 
-    def exposed_inject_cloud_secret(
+    @rpyc.exposed
+    def inject_cloud_secret(
         self, cloud_domain, secret_name, secret_data_json, secret_type
     ):
         engine = create_engine(self.patroni_cstr)
@@ -151,7 +210,31 @@ class PxrpcService(rpyc.Service):
                 session.rollback()
                 return False
 
-    def exposed_delete_cloud_secret(self, cloud_domain, secret_name):
+    @rpyc.exposed
+    def merge_cloud_secret(
+        self, cloud_domain, secret_name, secret_data_json, secret_type
+    ):
+        engine = create_engine(self.patroni_cstr)
+
+        with Session(engine) as session:
+            try:
+                session.merge(
+                    ProxmoxCloudSecrets(
+                        cloud_domain=cloud_domain,
+                        secret_name=secret_name,
+                        secret_data=json.loads(secret_data_json),
+                        secret_type=secret_type,
+                    )
+                )
+                session.commit()
+                return True
+
+            except IntegrityError as e:
+                session.rollback()
+                return False
+
+    @rpyc.exposed
+    def delete_cloud_secret(self, cloud_domain, secret_name):
 
         engine = create_engine(self.patroni_cstr)
 
@@ -164,7 +247,8 @@ class PxrpcService(rpyc.Service):
             result = session.execute(stmt)
             session.commit()
 
-    def exposed_get_cloud_secret(self, cloud_domain, secret_name):
+    @rpyc.exposed
+    def get_cloud_secret(self, cloud_domain, secret_name):
 
         engine = create_engine(self.patroni_cstr)
 
@@ -181,7 +265,8 @@ class PxrpcService(rpyc.Service):
         secret_data_json = json.dumps(record.secret_data)
         return secret_data_json
 
-    def exposed_get_cloud_secrets(self, cloud_domain, secret_type):
+    @rpyc.exposed
+    def get_cloud_secrets(self, cloud_domain, secret_type):
         engine = create_engine(self.patroni_cstr)
 
         with Session(engine) as session:
@@ -196,7 +281,8 @@ class PxrpcService(rpyc.Service):
         )
         return secrets_json
 
-    def exposed_get_vm_vars_blake(self, blake_ids_json, cloud_domain):
+    @rpyc.exposed
+    def get_vm_vars_blake(self, blake_ids_json, cloud_domain):
         engine = create_engine(self.patroni_cstr)
 
         blake_ids = json.loads(blake_ids_json)
@@ -211,7 +297,8 @@ class PxrpcService(rpyc.Service):
         vars_json = json.dumps({entry.blake_id: entry.vm_vars for entry in records})
         return vars_json
 
-    def exposed_get_dns_a_record(self, host):
+    @rpyc.exposed
+    def get_dns_a_record(self, host):
         # get nameservers of the cloud (global in all cluster vars defined)
         resolver = dns.resolver.Resolver()
         resolver.nameservers = [
@@ -225,9 +312,42 @@ class PxrpcService(rpyc.Service):
         except (dns.resolver.NoAnswer, dns.resolver.NXDOMAIN):
             return "[]"
 
-    def exposed_create_external_acme_tls(
-        self, stack_fqdn, cert_config_json, ec_csr_json
-    ):
+    @rpyc.exposed
+    def create_cname_record(self, zone, name, cname, ttl):
+        keyring = dns.tsigkeyring.from_text({"internal.": self.internal_bind_key})
+
+        update = dns.update.Update(zone, keyring=keyring)
+        update.add(name, ttl, "CNAME", cname)
+
+        try:
+            response = dns.query.tcp(update, self.cluster_vars["bind_master_ip"])
+
+            if response.rcode() != dns.rcode.NOERROR:
+                return False, dns.rcode.to_text(response.rcode())
+
+            return True, None
+        except Exception as e:
+            return False, str(e)
+
+    @rpyc.exposed
+    def delete_cname_record(self, zone, name):
+        keyring = dns.tsigkeyring.from_text({"internal.": self.internal_bind_key})
+
+        update = dns.update.Update(zone, keyring=keyring)
+        update.delete(name, "CNAME")
+
+        try:
+            response = dns.query.tcp(update, self.cluster_vars["bind_master_ip"])
+
+            if response.rcode() != dns.rcode.NOERROR:
+                return False, dns.rcode.to_text(response.rcode())
+
+            return True, None
+        except Exception as e:
+            return False, str(e)
+
+    @rpyc.exposed
+    def create_external_acme_tls(self, stack_fqdn, cert_config_json, ec_csr_json):
         engine = create_engine(self.patroni_cstr)
         with Session(engine) as session:
 
@@ -240,7 +360,8 @@ class PxrpcService(rpyc.Service):
             )
             session.commit()
 
-    def exposed_delete_external_acme_tls(self, stack_fqdn):
+    @rpyc.exposed
+    def delete_external_acme_tls(self, stack_fqdn):
         engine = create_engine(self.patroni_cstr)
         with Session(engine) as session:
             stmt = delete(AcmeX509).where(
@@ -254,17 +375,25 @@ class PxrpcService(rpyc.Service):
 def main():
     from rpyc.utils.server import ForkingServer, ThreadedServer
 
-    print("launching on", sys.argv[1])
+    print("launching on", sys.argv[1], sys.argv[2], sys.argv[3])
 
     # register handler in master thread / process
     signal.signal(signal.SIGTERM, shutdown_handler)
 
+    service_to_launch = None
+    match PxServiceEnum(sys.argv[3]):
+        # here custom inits could take place (using classpartial / constructor)
+        case PxServiceEnum.PXRPC:
+            service_to_launch = PxrpcService
+        case PxServiceEnum.PROXMOXER:
+            service_to_launch = RemoteProxmoxApi
+
     # launch it threaded for sync (easy tasks no paralellism)
     if sys.argv[2] == "THREADED":
-        pxrpc_server = ThreadedServer(PxrpcService, port=int(sys.argv[1]))
+        pxrpc_server = ThreadedServer(service_to_launch, port=int(sys.argv[1]))
         pxrpc_server.start()
     elif sys.argv[2] == "FORKING":  # forking launch for paralellism
-        pxrpc_server = ForkingServer(PxrpcService, port=int(sys.argv[1]))
+        pxrpc_server = ForkingServer(service_to_launch, port=int(sys.argv[1]))
         pxrpc_server.start()
     else:
         raise RuntimeError("Unknown / missing 2 string arg THREADED/FORKING")
@@ -272,7 +401,12 @@ def main():
 
 @contextmanager
 def _launch_pxrpc_base(
-    jump_host, pve_host, rpyc_server_type, init_venv=False, local_pypi_ip=None
+    jump_host: str,
+    pve_host: str,
+    rpyc_server_type: str,
+    rpyc_service: PxServiceEnum,
+    init_venv: bool = False,
+    local_pypi_ip: str = None,
 ):
     with Connection(host=jump_host, user="root") as jump_host_conn:
         with Connection(
@@ -317,8 +451,10 @@ def _launch_pxrpc_base(
 
             # run detached pxrpc server - we use this to execute python code remotely on the jump host
             # pkill -f pxrpc to cleanup
+            pxrpc_cmd = f"export PYTHONUNBUFFERED=1; /root/.pxc-venv/bin/pxrpc {open_port_remote} {rpyc_server_type} {rpyc_service} >> /var/log/pxrpc-{open_port_remote}.log 2>&1"
+            print("pxrpc cmd", pxrpc_cmd)
             pve_host_conn.run(
-                f"export PYTHONUNBUFFERED=1; /root/.pxc-venv/bin/pxrpc {open_port_remote} {rpyc_server_type} >> /var/log/pxrpc-{open_port_remote}.log 2>&1",
+                pxrpc_cmd,
                 disown=True,
             )
 
@@ -353,11 +489,18 @@ class RPyCConnectionWrapper:
 
 # client launch contextmanagers:
 @contextmanager
-def launch_pxrpc(jump_host, pve_host, init_venv=False, local_pypi_ip=None):
+def launch_pxrpc(
+    jump_host: str,
+    pve_host: str,
+    init_venv: bool = False,
+    local_pypi_ip: str = None,
+    service: PxServiceEnum = PxServiceEnum.PXRPC,
+):
     with _launch_pxrpc_base(
         jump_host,
         pve_host,
         "THREADED",
+        service,
         init_venv=init_venv,
         local_pypi_ip=local_pypi_ip,
     ) as (local_open_port, pve_host_conn):
@@ -426,9 +569,20 @@ class AsyncRPyCPoolWrapper:
 
 
 @asynccontextmanager
-async def launch_pxrpc_async(jump_host, pve_host, init_venv=False, local_pypi_ip=None):
+async def launch_pxrpc_async(
+    jump_host: str,
+    pve_host: str,
+    init_venv: bool = False,
+    local_pypi_ip: str = None,
+    service: PxServiceEnum = PxServiceEnum.PXRPC,
+):
     with _launch_pxrpc_base(
-        jump_host, pve_host, "FORKING", init_venv=init_venv, local_pypi_ip=local_pypi_ip
+        jump_host,
+        pve_host,
+        "FORKING",
+        service,
+        init_venv=init_venv,
+        local_pypi_ip=local_pypi_ip,
     ) as (local_open_port, _):
 
         NUM_WORKERS = 4

{py_pve_cloud-3.2.0rc0 → py_pve_cloud-3.2.2}/src/pve_cloud/lib/inventory.py

@@ -7,7 +7,8 @@ import paramiko
 import pve_cloud._version
 import yaml
 from proxmoxer import ProxmoxAPI
-from pve_cloud_schemas.validate import validate_cloud_dyn_inv
+from pve_cloud_schemas.validate import (validate_cloud_dyn_inv,
+                                        validate_cluster_vars)
 
 from pve_cloud.lib.ssh import check_ssh_open, connect_host
 
@@ -288,5 +289,6 @@ def get_cluster_vars(pve_host, jump_host=None):
         _, stdout, _ = ssh.exec_command("cat /etc/pve/cloud/cluster_vars.yaml")
 
         cluster_vars = yaml.safe_load(stdout.read().decode("utf-8"))
+        validate_cluster_vars(cluster_vars)
 
         return cluster_vars

{py_pve_cloud-3.2.0rc0 → py_pve_cloud-3.2.2/src/py_pve_cloud.egg-info}/PKG-INFO

@@ -1,10 +1,9 @@
 Metadata-Version: 2.4
 Name: py-pve-cloud
-Version: 3.2.0rc0
+Version: 3.2.2
 Author-email: Tobias Huebner <tobias.huebner@vmzberlin.com>
 License-Expression: GPL-3.0-or-later
 License-File: LICENSE.md
-Requires-Dist: PyYAML==6.0.3
 Requires-Dist: psycopg2-binary==2.9.11
 Requires-Dist: SQLAlchemy==2.0.45
 Requires-Dist: alembic==1.18.0
@@ -14,4 +13,5 @@ Requires-Dist: dnspython==2.8.0
 Requires-Dist: rpyc==6.0.2
 Requires-Dist: fabric==3.2.3
 Requires-Dist: asyncssh==2.22.0
+Requires-Dist: pve-cloud-schemas<3.2.0,>=3.1.7
 Dynamic: license-file

{py_pve_cloud-3.2.0rc0 → py_pve_cloud-3.2.2}/src/py_pve_cloud.egg-info/requires.txt

@@ -1,4 +1,3 @@
-PyYAML==6.0.3
 psycopg2-binary==2.9.11
 SQLAlchemy==2.0.45
 alembic==1.18.0
@@ -8,3 +7,4 @@ dnspython==2.8.0
 rpyc==6.0.2
 fabric==3.2.3
 asyncssh==2.22.0
+pve-cloud-schemas<3.2.0,>=3.1.7

py_pve_cloud-3.2.0rc0/src/pve_cloud/_version.py

@@ -1 +0,0 @@
-__version__ = "3.2.0rc0"