py-pve-cloud-backup 3.1.2__tar.gz → 3.2.1__tar.gz

{py_pve_cloud_backup-3.1.2/src/py_pve_cloud_backup.egg-info → py_pve_cloud_backup-3.2.1}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: py-pve-cloud-backup
-Version: 3.1.2
+Version: 3.2.1
 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.1.0,>=3.0.10
+Requires-Dist: py-pve-cloud<3.2.0,>=3.1.1
 Requires-Dist: kubernetes==34.1.0
 Requires-Dist: requests==2.32.5
 Requires-Dist: zstandard==0.25.0

{py_pve_cloud_backup-3.1.2 → py_pve_cloud_backup-3.2.1}/requirements.txt

@@ -1,5 +1,5 @@
 # pessimistic operator for local tdd installs (pip install -e .)
-py-pve-cloud>=3.0.10,<3.1.0
+py-pve-cloud>=3.1.1,<3.2.0
 kubernetes==34.1.0
 requests==2.32.5
 zstandard==0.25.0

py_pve_cloud_backup-3.2.1/src/pve_cloud_backup/_version.py

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

{py_pve_cloud_backup-3.1.2 → py_pve_cloud_backup-3.2.1}/src/pve_cloud_backup/daemon/brctl.py

@@ -16,9 +16,10 @@ from kubernetes.client import (V1ConfigMapVolumeSource, V1Container, V1EnvVar,
                                V1PodTemplateSpec, V1SecretVolumeSource,
                                V1Volume, V1VolumeMount)
 from kubernetes.config.kube_config import KubeConfigLoader
-from pve_cloud.cli.pvclu import (get_cloud_domain, get_cluster_vars,
-                                 get_ssh_master_kubeconfig)
-from pve_cloud.lib.inventory import get_online_pve_host
+from pve_cloud.cli.pvclu import (get_cloud_domain, get_ssh_master_kubeconfig,
+                                 get_ssh_remote_master_kubeconfig)
+from pve_cloud.lib.inventory import (get_cluster_vars,
+                                     get_online_pve_host_from_target_pve)
 from pve_cloud_backup._version import __version__ as bkp_version
 
 from pve_cloud_backup.daemon.funcs import get_backup_base_dir
@@ -159,14 +160,38 @@ async def launch_restore_job(args):
         kubespray_inv = yaml.safe_load(file)
 
     # fetch the kubeconfig of the cluster we want to launch the restore job in
-    online_pve_host = get_online_pve_host(kubespray_inv["target_pve"])
-    cluster_vars = get_cluster_vars(online_pve_host)
-    cloud_domain = get_cloud_domain(kubespray_inv["target_pve"])
+    online_pve_host, jump_host = get_online_pve_host_from_target_pve(
+        kubespray_inv["target_pve"]
+    )
 
-    kubeconfig_dict = yaml.safe_load(
-        get_ssh_master_kubeconfig(cluster_vars, kubespray_inv["stack_name"])
+    external_cp_defined = (
+        "extra_control_plane_sans" in kubespray_inv
+        and kubespray_inv["extra_control_plane_sans"]
     )
 
+    if jump_host and not external_cp_defined:
+        raise NotImplementedError(
+            "Jump host functionality requires external san to be set for the kubernetes cluster!"
+        )
+
+    cloud_domain = get_cloud_domain(kubespray_inv["target_pve"])
+
+    if jump_host:
+        kubeconfig_dict = yaml.safe_load(
+            get_ssh_remote_master_kubeconfig(
+                kubespray_inv["stack_name"],
+                kubespray_inv["extra_control_plane_sans"][0],
+                jump_host,
+                online_pve_host,
+            )
+        )
+    else:
+        cluster_vars = get_cluster_vars(online_pve_host)
+
+        kubeconfig_dict = yaml.safe_load(
+            get_ssh_master_kubeconfig(cluster_vars, kubespray_inv["stack_name"])
+        )
+
     # init kube client for launching the restore job
     loader = KubeConfigLoader(config_dict=kubeconfig_dict)
     configuration = client.Configuration()

{py_pve_cloud_backup-3.1.2 → py_pve_cloud_backup-3.2.1/src/py_pve_cloud_backup.egg-info}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: py-pve-cloud-backup
-Version: 3.1.2
+Version: 3.2.1
 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.1.0,>=3.0.10
+Requires-Dist: py-pve-cloud<3.2.0,>=3.1.1
 Requires-Dist: kubernetes==34.1.0
 Requires-Dist: requests==2.32.5
 Requires-Dist: zstandard==0.25.0

{py_pve_cloud_backup-3.1.2 → py_pve_cloud_backup-3.2.1}/src/py_pve_cloud_backup.egg-info/requires.txt

@@ -1,4 +1,4 @@
-py-pve-cloud<3.1.0,>=3.0.10
+py-pve-cloud<3.2.0,>=3.1.1
 kubernetes==34.1.0
 requests==2.32.5
 zstandard==0.25.0

py_pve_cloud_backup-3.1.2/src/pve_cloud_backup/_version.py

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