py-pve-cloud 0.13.5__tar.gz → 0.13.22__tar.gz

{py_pve_cloud-0.13.5/src/py_pve_cloud.egg-info → py_pve_cloud-0.13.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: py-pve-cloud
-Version: 0.13.5
+Version: 0.13.22
 Author-email: Tobias Huebner <tobias.huebner@vmzberlin.com>
 License-Expression: GPL-3.0-or-later
 License-File: LICENSE.md

{py_pve_cloud-0.13.5 → py_pve_cloud-0.13.22}/README.md

@@ -18,4 +18,4 @@ PROXY_IP=$(ssh root@$PVE_HOST_IP cat /etc/pve/cloud/cluster_vars.yaml | yq '.pve
 export PG_CONN_STR=postgresql+psycopg2://postgres:$PATRONI_PASS@$PROXY_IP:5000/pve_cloud?sslmode=disable
 ```
 
-To create a new migration the database needs to be on the latest version, run `alembic upgrade head` to upgrade it.
+To create a new migration the database needs to be on the latest version, run `alembic upgrade head` to upgrade it.

py_pve_cloud-0.13.22/src/pve_cloud/_version.py

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

{py_pve_cloud-0.13.5 → py_pve_cloud-0.13.22}/src/pve_cloud/cli/pvcli.py

@@ -83,11 +83,13 @@ def connect_cluster(args):
     if node_ip_address is None:
       raise Exception(f"Could not find ip for node {node_name}")
     
+    print(f"adding {node_name}")
     dynamic_inventory[pve_cloud_domain][cluster_name][node_name] = {
       "ansible_user": "root",
       "ansible_host": node_ip_address
     }
 
+  print(f"writing dyn inv to {inv_path}")
   with open(inv_path, "w") as file:
     yaml.dump(dynamic_inventory, file)
 

{py_pve_cloud-0.13.5 → py_pve_cloud-0.13.22}/src/pve_cloud/cli/pvclu.py

@@ -74,14 +74,14 @@ def get_ssh_master_kubeconfig(cluster_vars, stack_name):
   admin_conf["clusters"][0]["name"] = stack_name
 
   admin_conf["contexts"][0]["context"]["cluster"] = stack_name
-  admin_conf["contexts"][0]["name"] = f"kubernetes-admin@{stack_name}"
+  admin_conf["contexts"][0]["name"] = stack_name
 
-  admin_conf["current-context"] =  f"kubernetes-admin@{stack_name}"
+  admin_conf["current-context"] = stack_name
 
   return yaml.safe_dump(admin_conf)
 
 
-def export_envr(args):
+def export_pg_conn_str(args):
   cloud_domain = get_cloud_domain(args.target_pve, suppress_warnings=True)
   pve_inventory = get_pve_inventory(cloud_domain, suppress_warnings=True)
 
@@ -95,24 +95,10 @@ def export_envr(args):
     raise RuntimeError(f"Could not find online host for {args.target_pve}!")
 
   cluster_vars, patroni_pass, bind_internal_key = get_cloud_env(ansible_host)
-  print(f"export PVE_ANSIBLE_HOST='{ansible_host}'")
-  print(f"export PVE_CLOUD_DOMAIN='{cloud_domain}'")
 
-  # tf vars
   print(f"export PG_CONN_STR=\"postgres://postgres:{patroni_pass}@{cluster_vars['pve_haproxy_floating_ip_internal']}:5000/tf_states?sslmode=disable\"")
-  print(f"export TF_VAR_pve_cloud_domain='{cloud_domain}'")
-  print(f"export TF_VAR_pve_host='{ansible_host}'")
-  print(f"export TF_VAR_cluster_proxy_ip='{cluster_vars['pve_haproxy_floating_ip_internal']}'")
-  print(f"export TF_VAR_pve_cloud_pg_cstr=\"postgresql+psycopg2://postgres:{patroni_pass}@{cluster_vars['pve_haproxy_floating_ip_internal']}:5000/pve_cloud?sslmode=disable\"")
-  print(f"export TF_VAR_master_b64_kubeconf='{base64.b64encode(get_ssh_master_kubeconfig(cluster_vars, args.stack_name).encode('utf-8')).decode('utf-8')}'")
-  print(f"export TF_VAR_bind_master_ip='{cluster_vars['bind_master_ip']}'")
-  print(f"export TF_VAR_bind_internal_key='{bind_internal_key}'")
-
-  # pve inventory gets converted as b64 yaml string
-  pve_64 = yaml.safe_dump(pve_inventory)
-  print(f"export TF_VAR_pve_inventory_b64='{base64.b64encode(pve_64.encode('utf-8')).decode('utf-8')}'")
-
-  
+
+
 def main():
   parser = argparse.ArgumentParser(description="PVE Cloud utility cli. Should be called with bash eval.")
 
@@ -120,10 +106,9 @@ def main():
 
   subparsers = parser.add_subparsers(dest="command", required=True)
 
-  export_envr_parser = subparsers.add_parser("export-envrc", help="Export variables for k8s .envrc", parents=[base_parser])
+  export_envr_parser = subparsers.add_parser("export-psql", help="Export variables for k8s .envrc", parents=[base_parser])
   export_envr_parser.add_argument("--target-pve", type=str, help="The target pve cluster.", required=True)
-  export_envr_parser.add_argument("--stack-name", type=str, help="Stack name of the deployment.", required=True)
-  export_envr_parser.set_defaults(func=export_envr)
+  export_envr_parser.set_defaults(func=export_pg_conn_str)
 
   get_online_pve_host_parser = subparsers.add_parser("get-online-host", help="Gets the ip for the first online proxmox host in the cluster.", parents=[base_parser])
   get_online_pve_host_parser.add_argument("--target-pve", type=str, help="The target pve cluster to get the first online ip of.", required=True)

{py_pve_cloud-0.13.5 → py_pve_cloud-0.13.22}/src/pve_cloud/lib/inventory.py

@@ -100,6 +100,10 @@ def get_online_pve_host(target_pve, suppress_warnings = False, skip_py_cloud_che
                         pve_host_ip = pve_inventory[pve_cloud][pve_cluster][pve_host]["ansible_host"]
                         try:
                             with socket.create_connection((pve_host_ip, 22), timeout=3):
+                                
+                                if not skip_py_cloud_check:
+                                    raise_on_py_cloud_missmatch(pve_host_ip) # validate that versions of dev machine and running on cluster match
+
                                 return pve_host_ip
                         except Exception as e:
                             # debug

{py_pve_cloud-0.13.5 → py_pve_cloud-0.13.22}/src/pve_cloud/orm/alchemy.py

@@ -1,5 +1,5 @@
 from sqlalchemy import Column, Integer, String, Boolean, SmallInteger, Text
-from sqlalchemy.dialects.postgresql import MACADDR, INET, JSONB, insert
+from sqlalchemy.dialects.postgresql import MACADDR, INET, JSONB, insert, ENUM
 from sqlalchemy import create_engine, MetaData, Table, select, delete, update
 from sqlalchemy.orm import declarative_base
 from alembic.config import Config
@@ -33,6 +33,7 @@ class KeaReservations(Base):
   hostname = Column(String(253), nullable=False)
   client_classes = Column(String(1000)) # csv seperated client classes
   stack_fqdn = Column(String(253), nullable=False)
+  machine_type = Column(String(50), nullable=False)
 
 
 class KeaClientClassDefs(Base):
@@ -43,24 +44,7 @@ class KeaClientClassDefs(Base):
   class_content = Column(JSONB, nullable=False)
 
 
-class K8SWorkers(Base):
-  __tablename__ = "k8s_workers"
-
-  ip = Column(INET, primary_key=True)
-  hostname = Column(String(253), nullable=False)
-  stack_fqdn = Column(String(253), nullable=False)
-  proxy_stack_fqdn = Column(String(253), nullable=False)
-
-
-class K8SMasters(Base):
-  __tablename__ = "k8s_masters"
-
-  ip = Column(INET, primary_key=True)
-  hostname = Column(String(253), nullable=False)
-  stack_fqdn = Column(String(253), nullable=False)
-  proxy_stack_fqdn = Column(String(253), nullable=False)
-
-
+# todo: rename just ingress rules
 class K8SIngressRules(Base):
   __tablename__ = "k8s_ingress_rules"
 
@@ -70,8 +54,10 @@ class K8SIngressRules(Base):
   proxy_stack_fqdn = Column(String(253), nullable=False)
   external = Column(Boolean, default=False)
   rule_len = Column(Integer, nullable=False)
+  is_k8s = Column(Boolean, nullable=False)
 
 
+# todo: rename to just tcp proxies
 class K8STcpProxies(Base):
   __tablename__ = "k8s_tcp_proxies"
 
@@ -79,6 +65,8 @@ class K8STcpProxies(Base):
   haproxy_port = Column(SmallInteger, primary_key=True)
   node_port = Column(SmallInteger, nullable=False)
   stack_fqdn = Column(String(253), nullable=False)
+  # determines backend routing in haproxy, if false will go 
+  is_k8s = Column(Boolean, nullable=False) 
   proxy_snippet = Column(Text)
   proxy_stack_fqdn = Column(String(253), primary_key=True)
   external = Column(Boolean, default=False)

py_pve_cloud-0.13.22/src/pve_cloud/orm/migrations/versions/0ad803c51325_machine_type_refactor.py

@@ -0,0 +1,65 @@
+"""machine type refactor
+
+Revision ID: 0ad803c51325
+Revises: fdcb5aa33b76
+Create Date: 2025-12-22 13:46:51.857049
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision: str = '0ad803c51325'
+down_revision: Union[str, Sequence[str], None] = 'fdcb5aa33b76'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+
+    op.add_column('k8s_tcp_proxies', sa.Column('is_k8s', sa.Boolean(), nullable=False, server_default='true'))
+    op.add_column('kea_reservations', sa.Column('machine_type', sa.String(length=50), nullable=False, server_default='k8s_worker'))
+    
+    # remove defaults
+    op.alter_column('k8s_tcp_proxies', 'is_k8s', server_default=None)
+    op.alter_column('kea_reservations', 'machine_type', server_default=None)
+
+    # set master type
+    op.execute("""
+        UPDATE kea_reservations kr
+        SET machine_type = 'k8s_master'
+        FROM k8s_masters km
+        WHERE kr.ip = km.ip
+    """)
+
+    op.drop_table('k8s_masters')
+    op.drop_table('k8s_workers')
+
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('kea_reservations', 'machine_type')
+    op.drop_column('k8s_tcp_proxies', 'is_k8s')
+    op.create_table('k8s_workers',
+    sa.Column('ip', postgresql.INET(), autoincrement=False, nullable=False),
+    sa.Column('hostname', sa.VARCHAR(length=253), autoincrement=False, nullable=False),
+    sa.Column('stack_fqdn', sa.VARCHAR(length=253), autoincrement=False, nullable=False),
+    sa.Column('proxy_stack_fqdn', sa.VARCHAR(length=253), autoincrement=False, nullable=False),
+    sa.PrimaryKeyConstraint('ip', name=op.f('k8s_workers_pkey'))
+    )
+    op.create_table('k8s_masters',
+    sa.Column('ip', postgresql.INET(), autoincrement=False, nullable=False),
+    sa.Column('hostname', sa.VARCHAR(length=253), autoincrement=False, nullable=False),
+    sa.Column('stack_fqdn', sa.VARCHAR(length=253), autoincrement=False, nullable=False),
+    sa.Column('proxy_stack_fqdn', sa.VARCHAR(length=253), autoincrement=False, nullable=False),
+    sa.PrimaryKeyConstraint('ip', name=op.f('k8s_masters_pkey'))
+    )
+    # ### end Alembic commands ###

py_pve_cloud-0.13.22/src/pve_cloud/orm/migrations/versions/e60b9cc63413_ingress_generic.py

@@ -0,0 +1,33 @@
+"""ingress generic
+
+Revision ID: e60b9cc63413
+Revises: 0ad803c51325
+Create Date: 2025-12-22 21:29:59.987939
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'e60b9cc63413'
+down_revision: Union[str, Sequence[str], None] = '0ad803c51325'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('k8s_ingress_rules', sa.Column('is_k8s', sa.Boolean(), nullable=False, server_default='true'))
+    op.alter_column('k8s_ingress_rules', 'is_k8s', server_default=None) # default create as true since to this point its only for k8s
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('k8s_ingress_rules', 'is_k8s')
+    # ### end Alembic commands ###

{py_pve_cloud-0.13.5 → py_pve_cloud-0.13.22/src/py_pve_cloud.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: py-pve-cloud
-Version: 0.13.5
+Version: 0.13.22
 Author-email: Tobias Huebner <tobias.huebner@vmzberlin.com>
 License-Expression: GPL-3.0-or-later
 License-File: LICENSE.md

{py_pve_cloud-0.13.5 → py_pve_cloud-0.13.22}/src/py_pve_cloud.egg-info/SOURCES.txt

@@ -10,6 +10,7 @@ src/pve_cloud/orm/alchemy.py
 src/pve_cloud/orm/alembic.ini
 src/pve_cloud/orm/migrations/env.py
 src/pve_cloud/orm/migrations/versions/04398db10434_external_cp_extra_sans.py
+src/pve_cloud/orm/migrations/versions/0ad803c51325_machine_type_refactor.py
 src/pve_cloud/orm/migrations/versions/24a548bfce3e_len_rules_enforcements.py
 src/pve_cloud/orm/migrations/versions/27724e407e2b_proxy_fqdn.py
 src/pve_cloud/orm/migrations/versions/3c95509a5de9_fix.py
@@ -17,6 +18,7 @@ src/pve_cloud/orm/migrations/versions/7868bcd05006_migrate_old.py
 src/pve_cloud/orm/migrations/versions/7dea8c4ee39f_init.py
 src/pve_cloud/orm/migrations/versions/944a8fd5d5bc_ext_ctrl_plns.py
 src/pve_cloud/orm/migrations/versions/d9b711555be8_ext_control_plane.py
+src/pve_cloud/orm/migrations/versions/e60b9cc63413_ingress_generic.py
 src/pve_cloud/orm/migrations/versions/fdcb5aa33b76_slop_firewall_seperation.py
 src/py_pve_cloud.egg-info/PKG-INFO
 src/py_pve_cloud.egg-info/SOURCES.txt

py_pve_cloud-0.13.5/src/pve_cloud/_version.py

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