pytest-pve-cloud 3.2.5__tar.gz → 3.3.0__tar.gz

{pytest_pve_cloud-3.2.5/src/pytest_pve_cloud.egg-info → pytest_pve_cloud-3.3.0}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: pytest-pve-cloud
-Version: 3.2.5
+Version: 3.3.0
 Author-email: Tobias Huebner <tobias.huebner@vmzberlin.com>
 License-Expression: GPL-3.0-or-later
 License-File: LICENSE.md
-Requires-Dist: py-pve-cloud<3.3.0,>=3.2.5
+Requires-Dist: py-pve-cloud<3.4.0,>=3.3.0
 Requires-Dist: kubernetes==34.1.0
 Requires-Dist: pytest==8.4.2
 Requires-Dist: ansible-runner==2.4.2

{pytest_pve_cloud-3.2.5 → pytest_pve_cloud-3.3.0}/requirements.txt

@@ -1,4 +1,4 @@
-py-pve-cloud>=3.2.5,<3.3.0
+py-pve-cloud>=3.3.0,<3.4.0
 kubernetes==34.1.0
 pytest==8.4.2
 ansible-runner==2.4.2

pytest_pve_cloud-3.3.0/src/pve_cloud_test/_version.py

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

{pytest_pve_cloud-3.2.5 → pytest_pve_cloud-3.3.0}/src/pve_cloud_test/cloud_fixtures.py

@@ -3,6 +3,7 @@ import inspect
 import logging
 import os
 import re
+import tempfile
 from contextlib import contextmanager
 
 import ansible_runner
@@ -295,3 +296,41 @@ def get_proxmoxer(get_test_env):
     assert nodes
 
     return proxmox
+
+
+@pytest.fixture(scope="session")
+def get_pve_hosts_inv(get_test_env):
+    logger.info("proxmox hosts cloud inventory")
+    with tempfile.NamedTemporaryFile(
+        "w", suffix=".yaml", delete=False
+    ) as temp_cloud_inv:
+        # write pve cloud inventory file for main pve cluster setup playbook
+        pve_clusters = {
+            get_test_env["pve_test_cluster_name"]: {
+                "pve_unique_cloud_services": ["dns", "dhcp", "psql-state"],
+                "pve_host_vars": (
+                    get_test_env["pve_test_cluster_host_vars"]
+                    if "pve_test_cluster_host_vars" in get_test_env
+                    else {}
+                ),
+                "pve_haproxy_floating_ip_external": get_test_env[
+                    "pve_test_cluster_floating_external"
+                ],
+                "pve_haproxy_floating_ip_internal": get_test_env[
+                    "pve_test_cluster_floating_internal"
+                ],
+            }
+        }
+
+        yaml.dump(
+            {
+                "plugin": "pxc.cloud.pve_cloud_inv",
+                "pve_cloud_domain": get_test_env["cloud_inventory"]["pve_cloud_domain"],
+                "pve_clusters": pve_clusters,
+            }
+            | get_test_env["cloud_inventory"],
+            temp_cloud_inv,
+        )
+        temp_cloud_inv.flush()
+
+        return temp_cloud_inv.name

{pytest_pve_cloud-3.2.5 → pytest_pve_cloud-3.3.0}/src/pve_cloud_test/k8s_fixtures.py

@@ -12,6 +12,16 @@ from pve_cloud_test.cloud_fixtures import get_test_env
 logger = logging.getLogger(__name__)
 
 
+def get_e2e_limit_feature(get_test_env, feature_key):
+    if (
+        "pve_test_limit_features" in get_test_env
+        and feature_key in get_test_env["pve_test_limit_features"]
+    ):
+        return get_test_env["pve_test_limit_features"][feature_key]
+
+    return False
+
+
 @pytest.fixture(scope="session")
 def get_secondary_kubespray_inv(get_test_env):
     logger.info("create secondary kubespray")
@@ -50,6 +60,12 @@ def get_secondary_kubespray_inv(get_test_env):
                         ],  # route these specially to this secondary
                     }
                 ],
+                "qemu_global_vars": {
+                    "zpool_create_force": True,  # needed for recreate since by id disk doesnt get wiped
+                    "e2e_limit_containerd_downloads": get_e2e_limit_feature(
+                        get_test_env, "limit_containerd_downloads"
+                    ),
+                },
                 "qemu_base_parameters": {
                     "cpu": "host",
                     "net0": "virtio,bridge=vmbr0,firewall=1"
@@ -57,23 +73,75 @@ def get_secondary_kubespray_inv(get_test_env):
                     "sockets": 1,
                 },
                 "qemus": [
-                    {
-                        "k8s_roles": ["master", "worker"],
-                        "disk": {
-                            "size": "150G",
-                            "options": {
-                                "discard": "on",
-                                "iothread": "on",
-                                "ssd": "on",
-                                "cache": "unsafe",
+                    (
+                        {
+                            "k8s_roles": ["master", "worker"],
+                            "disk": {
+                                "size": "150G",
+                                "options": {
+                                    "discard": "on",
+                                    "iothread": "on",
+                                    "ssd": "on",
+                                    "cache": "unsafe",
+                                },
+                                "pool": get_test_env["pve_vm_storage_id"],
                             },
-                            "pool": get_test_env["pve_vm_storage_id"],
-                        },
-                        "parameters": {
-                            "cores": 4,
-                            "memory": 10240,
-                        },
-                    },
+                            "zpool_csi_parameters": {
+                                "pool_properties": {"ashift": "12"},
+                                "vdevs": [
+                                    {
+                                        "disks": [
+                                            "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_scsi1-pxzfs"
+                                        ]
+                                    },
+                                    {
+                                        "disks": [
+                                            "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_scsi2-pxzfs"
+                                        ]
+                                    },
+                                ],
+                            },
+                            "zfs_localpv_csi_disks": (
+                                [
+                                    {
+                                        "from_storage": {
+                                            "size": "50G",
+                                            "options": {
+                                                "discard": "on",
+                                                "iothread": "on",
+                                                "ssd": "on",
+                                                "cache": "unsafe",  # fastest for consumer ssds
+                                            },
+                                            "pool": get_test_env["pve_vm_storage_id"],
+                                        }
+                                    }
+                                ]
+                                + [
+                                    {
+                                        "via_passthrough": {
+                                            "disk_id": get_test_env["kubernetes"][
+                                                "zfs_localpv_test"
+                                            ]["disk_id"],
+                                            "options": {"iothread": "on"},
+                                        }
+                                    }
+                                ]
+                                if "zfs_localpv_test" in get_test_env["kubernetes"]
+                                else []
+                            ),
+                            "parameters": {
+                                "cores": 4,
+                                "memory": 10240,
+                            },
+                        }
+                        | {
+                            "target_host": get_test_env["kubernetes"][
+                                "zfs_localpv_test"
+                            ]["target_host"]
+                        }
+                        if "zfs_localpv_test" in get_test_env["kubernetes"]
+                        else {}
+                    ),
                 ],
                 "target_pve_hosts": list(get_test_env["pve_test_cluster_hosts"].keys()),
                 "root_ssh_pub_key": get_test_env["ssh_pub_key"],
@@ -143,6 +211,11 @@ def get_kubespray_inv(get_test_env):
                         "mount_options": ["discard", "barrier=0"],
                     }
                 ],
+                "qemu_global_vars": {
+                    "e2e_limit_containerd_downloads": get_e2e_limit_feature(
+                        get_test_env, "limit_containerd_downloads"
+                    )
+                },
                 "qemu_base_parameters": (
                     {
                         "cpu": "host",

{pytest_pve_cloud-3.2.5 → pytest_pve_cloud-3.3.0}/src/pve_cloud_test/terraform.py

@@ -185,6 +185,10 @@ def apply(
         all_pods_running = True
 
         for pod in kube_v1.list_pod_for_all_namespaces().items:
+            if pod.metadata.deletion_timestamp:
+                logger.info(f"skipping pod scheduled for deletion {pod.metadata.name}")
+                continue
+
             phase = pod.status.phase
             assert (
                 phase != "Failed"

{pytest_pve_cloud-3.2.5 → pytest_pve_cloud-3.3.0}/src/pve_cloud_test/test_env_schema.yaml

@@ -22,7 +22,21 @@ properties:
     type: string
     description: |
       Optional jump host for connecting the the test proxmox cluster. When defined the entire suite is testing via the jump
-      proxy functionality. 
+      proxy functionality.
+  pve_test_limit_features:
+    type: object
+    additionalProperties: false
+    description: "Features to make slow / old hardware more stable / capable, for various tradeoffs."
+    properties:
+      limit_containerd_downloads:
+        type: boolean
+        description: "Set to true to limit max_concurrent_downloads on containerd runtimes in kubernetes and k0s."
+      use_unsafe_qemu_disks:
+        type: boolean
+        # todo. implement
+        description: "Qemu disks will be created with cache=unsafe, greatly increasing performance on consumer ssds for ceph / zfs."
+        # todo: also implement setting sync=disabled on zfs zpools / datasets for openebs / containerd dataset
+        # todo: also implement using network rbd for ceph csi as this also increases greatly pvc performance for consumer ssds
   pve_test_cluster_hosts:
     type: object
     title: "PVE Cluster name"
@@ -149,6 +163,19 @@ properties:
       - copy_target_pve
       - tls_copy_stack_name
     properties:
+      zfs_localpv_test:
+        type: object
+        description: "Config for disk passthrough and openebs zfs localpv csi testing."
+        required:
+          - target_host
+          - disk_id
+        properties:
+          target_host:
+            type: string
+            description: "pve-host.pve-cluster-name for host that contains the disk with the specified disk_id for passthrough."
+          disk_id:
+            type: string
+            description: "/dev/disk/by-id accuired id of the hard drive we want to pass through."
       deployments_domain:
         type: string
         description: domain used for test deployments of the suites kubernetes clusters. This needs to be delegated correctly in your central dns.

{pytest_pve_cloud-3.2.5 → pytest_pve_cloud-3.3.0/src/pytest_pve_cloud.egg-info}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: pytest-pve-cloud
-Version: 3.2.5
+Version: 3.3.0
 Author-email: Tobias Huebner <tobias.huebner@vmzberlin.com>
 License-Expression: GPL-3.0-or-later
 License-File: LICENSE.md
-Requires-Dist: py-pve-cloud<3.3.0,>=3.2.5
+Requires-Dist: py-pve-cloud<3.4.0,>=3.3.0
 Requires-Dist: kubernetes==34.1.0
 Requires-Dist: pytest==8.4.2
 Requires-Dist: ansible-runner==2.4.2

{pytest_pve_cloud-3.2.5 → pytest_pve_cloud-3.3.0}/src/pytest_pve_cloud.egg-info/requires.txt

@@ -1,4 +1,4 @@
-py-pve-cloud<3.3.0,>=3.2.5
+py-pve-cloud<3.4.0,>=3.3.0
 kubernetes==34.1.0
 pytest==8.4.2
 ansible-runner==2.4.2

pytest_pve_cloud-3.2.5/src/pve_cloud_test/_version.py

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