py-pve-cloud-backup 3.3.5__tar.gz → 3.4.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {py_pve_cloud_backup-3.3.5/src/py_pve_cloud_backup.egg-info → py_pve_cloud_backup-3.4.0}/PKG-INFO +2 -2
- {py_pve_cloud_backup-3.3.5 → py_pve_cloud_backup-3.4.0}/requirements.txt +1 -1
- py_pve_cloud_backup-3.4.0/src/pve_cloud_backup/_version.py +1 -0
- {py_pve_cloud_backup-3.3.5 → py_pve_cloud_backup-3.4.0}/src/pve_cloud_backup/daemon/bdd.py +3 -0
- {py_pve_cloud_backup-3.3.5 → py_pve_cloud_backup-3.4.0}/src/pve_cloud_backup/daemon/brctl.py +15 -1
- py_pve_cloud_backup-3.4.0/src/pve_cloud_backup/daemon/restore.py +746 -0
- {py_pve_cloud_backup-3.3.5 → py_pve_cloud_backup-3.4.0}/src/pve_cloud_backup/fetcher/funcs.py +223 -25
- {py_pve_cloud_backup-3.3.5 → py_pve_cloud_backup-3.4.0}/src/pve_cloud_backup/fetcher/main.py +33 -3
- {py_pve_cloud_backup-3.3.5 → py_pve_cloud_backup-3.4.0}/src/pve_cloud_backup/fetcher/net.py +15 -8
- {py_pve_cloud_backup-3.3.5 → py_pve_cloud_backup-3.4.0/src/py_pve_cloud_backup.egg-info}/PKG-INFO +2 -2
- {py_pve_cloud_backup-3.3.5 → py_pve_cloud_backup-3.4.0}/src/py_pve_cloud_backup.egg-info/requires.txt +1 -1
- py_pve_cloud_backup-3.3.5/src/pve_cloud_backup/_version.py +0 -1
- py_pve_cloud_backup-3.3.5/src/pve_cloud_backup/daemon/restore.py +0 -539
- {py_pve_cloud_backup-3.3.5 → py_pve_cloud_backup-3.4.0}/LICENSE.md +0 -0
- {py_pve_cloud_backup-3.3.5 → py_pve_cloud_backup-3.4.0}/README.md +0 -0
- {py_pve_cloud_backup-3.3.5 → py_pve_cloud_backup-3.4.0}/pyproject.toml +0 -0
- {py_pve_cloud_backup-3.3.5 → py_pve_cloud_backup-3.4.0}/setup.cfg +0 -0
- {py_pve_cloud_backup-3.3.5 → py_pve_cloud_backup-3.4.0}/src/pve_cloud_backup/daemon/funcs.py +0 -0
- {py_pve_cloud_backup-3.3.5 → py_pve_cloud_backup-3.4.0}/src/pve_cloud_backup/daemon/rpc.py +0 -0
- {py_pve_cloud_backup-3.3.5 → py_pve_cloud_backup-3.4.0}/src/pve_cloud_backup/fetcher/git.py +0 -0
- {py_pve_cloud_backup-3.3.5 → py_pve_cloud_backup-3.4.0}/src/pve_cloud_backup/fetcher/nextcloud.py +0 -0
- {py_pve_cloud_backup-3.3.5 → py_pve_cloud_backup-3.4.0}/src/pve_cloud_backup/fetcher/patroni.py +0 -0
- {py_pve_cloud_backup-3.3.5 → py_pve_cloud_backup-3.4.0}/src/py_pve_cloud_backup.egg-info/SOURCES.txt +0 -0
- {py_pve_cloud_backup-3.3.5 → py_pve_cloud_backup-3.4.0}/src/py_pve_cloud_backup.egg-info/dependency_links.txt +0 -0
- {py_pve_cloud_backup-3.3.5 → py_pve_cloud_backup-3.4.0}/src/py_pve_cloud_backup.egg-info/entry_points.txt +0 -0
- {py_pve_cloud_backup-3.3.5 → py_pve_cloud_backup-3.4.0}/src/py_pve_cloud_backup.egg-info/top_level.txt +0 -0
{py_pve_cloud_backup-3.3.5/src/py_pve_cloud_backup.egg-info → py_pve_cloud_backup-3.4.0}/PKG-INFO
RENAMED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: py-pve-cloud-backup
|
|
3
|
-
Version: 3.
|
|
3
|
+
Version: 3.4.0
|
|
4
4
|
Author-email: Tobias Huebner <tobias.huebner@vmzberlin.com>
|
|
5
5
|
License-Expression: GPL-3.0-or-later
|
|
6
6
|
License-File: LICENSE.md
|
|
7
|
-
Requires-Dist: py-pve-cloud<3.
|
|
7
|
+
Requires-Dist: py-pve-cloud<3.4.0,>=3.3.0
|
|
8
8
|
Requires-Dist: kubernetes==34.1.0
|
|
9
9
|
Requires-Dist: requests==2.32.5
|
|
10
10
|
Requires-Dist: zstandard==0.25.0
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
__version__ = "3.4.0"
|
|
@@ -253,6 +253,9 @@ async def handle_client(reader: asyncio.StreamReader, writer: asyncio.StreamWrit
|
|
|
253
253
|
backup_dir = f"{get_backup_base_dir()}/{request_archive}"
|
|
254
254
|
|
|
255
255
|
async with get_lock(backup_dir):
|
|
256
|
+
logger.info(
|
|
257
|
+
f"running borg extract on {backup_dir}::{request_artifact}"
|
|
258
|
+
)
|
|
256
259
|
proc = await asyncio.create_subprocess_exec(
|
|
257
260
|
"borg",
|
|
258
261
|
"extract",
|
{py_pve_cloud_backup-3.3.5 → py_pve_cloud_backup-3.4.0}/src/pve_cloud_backup/daemon/brctl.py
RENAMED
|
@@ -217,6 +217,7 @@ async def launch_restore_job(args):
|
|
|
217
217
|
).encode()
|
|
218
218
|
).decode(),
|
|
219
219
|
),
|
|
220
|
+
V1EnvVar(name="LOG_LEVEL", value=args.log_level),
|
|
220
221
|
]
|
|
221
222
|
|
|
222
223
|
container = V1Container(
|
|
@@ -237,9 +238,14 @@ async def launch_restore_job(args):
|
|
|
237
238
|
mount_path="/etc/pve/priv/ceph.client.admin.keyring",
|
|
238
239
|
sub_path="ceph-admin-keyring",
|
|
239
240
|
),
|
|
241
|
+
V1VolumeMount(
|
|
242
|
+
name="fetcher-secrets", mount_path="/opt/id_qemu", sub_path="qemu-id"
|
|
243
|
+
),
|
|
240
244
|
],
|
|
241
245
|
)
|
|
242
246
|
|
|
247
|
+
# todo: conditionally load ceph config and check restore type, zfs restores should work without
|
|
248
|
+
# and only need ssh key / host info
|
|
243
249
|
template = V1PodTemplateSpec(
|
|
244
250
|
metadata=V1ObjectMeta(labels={"job": f"pxc-restore-{args.timestamp}"}),
|
|
245
251
|
spec=V1PodSpec(
|
|
@@ -254,6 +260,11 @@ async def launch_restore_job(args):
|
|
|
254
260
|
name="ceph-secrets",
|
|
255
261
|
secret=V1SecretVolumeSource(secret_name="ceph-secrets"),
|
|
256
262
|
),
|
|
263
|
+
# todo: should be made more specific
|
|
264
|
+
V1Volume(
|
|
265
|
+
name="fetcher-secrets",
|
|
266
|
+
secret=V1SecretVolumeSource(secret_name="fetcher-secrets"),
|
|
267
|
+
),
|
|
257
268
|
],
|
|
258
269
|
),
|
|
259
270
|
)
|
|
@@ -313,7 +324,7 @@ def get_parser():
|
|
|
313
324
|
|
|
314
325
|
k8s_restore_parser = subparsers.add_parser(
|
|
315
326
|
"restore-k8s",
|
|
316
|
-
help="Restore k8s csi backups. If pvcs with same name exist, test-restore will be appended to pvc name.",
|
|
327
|
+
help="Restore pxc k8s csi backups (zfs/ceph origin) into ceph storage class backed pvcs. If pvcs with same name exist, test-restore will be appended to pvc name.",
|
|
317
328
|
parents=[base_parser],
|
|
318
329
|
)
|
|
319
330
|
k8s_restore_parser.add_argument(
|
|
@@ -364,6 +375,9 @@ def get_parser():
|
|
|
364
375
|
type=str,
|
|
365
376
|
help="Custom image for launching restore job (e2e test arg).",
|
|
366
377
|
)
|
|
378
|
+
|
|
379
|
+
k8s_restore_parser.add_argument("--log-level", default="INFO")
|
|
380
|
+
|
|
367
381
|
k8s_restore_parser.set_defaults(func=launch_restore_job)
|
|
368
382
|
|
|
369
383
|
base_dir_parser = subparsers.add_parser(
|