py-pve-cloud-backup 3.5.16__tar.gz → 3.5.17__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.5.16/src/py_pve_cloud_backup.egg-info → py_pve_cloud_backup-3.5.17}/PKG-INFO +1 -1
- py_pve_cloud_backup-3.5.17/src/pve_cloud_backup/_version.py +1 -0
- {py_pve_cloud_backup-3.5.16 → py_pve_cloud_backup-3.5.17}/src/pve_cloud_backup/daemon/restore.py +38 -0
- {py_pve_cloud_backup-3.5.16 → py_pve_cloud_backup-3.5.17/src/py_pve_cloud_backup.egg-info}/PKG-INFO +1 -1
- py_pve_cloud_backup-3.5.16/src/pve_cloud_backup/_version.py +0 -1
- {py_pve_cloud_backup-3.5.16 → py_pve_cloud_backup-3.5.17}/LICENSE.md +0 -0
- {py_pve_cloud_backup-3.5.16 → py_pve_cloud_backup-3.5.17}/README.md +0 -0
- {py_pve_cloud_backup-3.5.16 → py_pve_cloud_backup-3.5.17}/pyproject.toml +0 -0
- {py_pve_cloud_backup-3.5.16 → py_pve_cloud_backup-3.5.17}/requirements.txt +0 -0
- {py_pve_cloud_backup-3.5.16 → py_pve_cloud_backup-3.5.17}/setup.cfg +0 -0
- {py_pve_cloud_backup-3.5.16 → py_pve_cloud_backup-3.5.17}/src/pve_cloud_backup/daemon/bdd.py +0 -0
- {py_pve_cloud_backup-3.5.16 → py_pve_cloud_backup-3.5.17}/src/pve_cloud_backup/daemon/brctl.py +0 -0
- {py_pve_cloud_backup-3.5.16 → py_pve_cloud_backup-3.5.17}/src/pve_cloud_backup/daemon/funcs.py +0 -0
- {py_pve_cloud_backup-3.5.16 → py_pve_cloud_backup-3.5.17}/src/pve_cloud_backup/fetcher/ext_zfs.py +0 -0
- {py_pve_cloud_backup-3.5.16 → py_pve_cloud_backup-3.5.17}/src/pve_cloud_backup/fetcher/funcs.py +0 -0
- {py_pve_cloud_backup-3.5.16 → py_pve_cloud_backup-3.5.17}/src/pve_cloud_backup/fetcher/git.py +0 -0
- {py_pve_cloud_backup-3.5.16 → py_pve_cloud_backup-3.5.17}/src/pve_cloud_backup/fetcher/main.py +0 -0
- {py_pve_cloud_backup-3.5.16 → py_pve_cloud_backup-3.5.17}/src/pve_cloud_backup/fetcher/net.py +0 -0
- {py_pve_cloud_backup-3.5.16 → py_pve_cloud_backup-3.5.17}/src/pve_cloud_backup/fetcher/nextcloud.py +0 -0
- {py_pve_cloud_backup-3.5.16 → py_pve_cloud_backup-3.5.17}/src/pve_cloud_backup/fetcher/patroni.py +0 -0
- {py_pve_cloud_backup-3.5.16 → py_pve_cloud_backup-3.5.17}/src/py_pve_cloud_backup.egg-info/SOURCES.txt +0 -0
- {py_pve_cloud_backup-3.5.16 → py_pve_cloud_backup-3.5.17}/src/py_pve_cloud_backup.egg-info/dependency_links.txt +0 -0
- {py_pve_cloud_backup-3.5.16 → py_pve_cloud_backup-3.5.17}/src/py_pve_cloud_backup.egg-info/entry_points.txt +0 -0
- {py_pve_cloud_backup-3.5.16 → py_pve_cloud_backup-3.5.17}/src/py_pve_cloud_backup.egg-info/requires.txt +0 -0
- {py_pve_cloud_backup-3.5.16 → py_pve_cloud_backup-3.5.17}/src/py_pve_cloud_backup.egg-info/top_level.txt +0 -0
|
@@ -0,0 +1 @@
|
|
|
1
|
+
__version__ = "3.5.17"
|
{py_pve_cloud_backup-3.5.16 → py_pve_cloud_backup-3.5.17}/src/pve_cloud_backup/daemon/restore.py
RENAMED
|
@@ -141,16 +141,46 @@ def clean_pvc_dict(pvc_dict):
|
|
|
141
141
|
pvc_dict["metadata"]["annotations"].pop(
|
|
142
142
|
"volume.kubernetes.io/storage-provisioner", None
|
|
143
143
|
)
|
|
144
|
+
|
|
145
|
+
pvc_dict["metadata"].pop("owner_references", None)
|
|
144
146
|
pvc_dict["metadata"].pop("finalizers", None)
|
|
145
147
|
pvc_dict["metadata"].pop("managed_fields", None)
|
|
146
148
|
pvc_dict["metadata"].pop("resource_version", None)
|
|
147
149
|
pvc_dict["metadata"].pop("uid", None)
|
|
148
150
|
pvc_dict["metadata"].pop("creation_timestamp", None)
|
|
151
|
+
|
|
149
152
|
pvc_dict.pop("status", None)
|
|
150
153
|
pvc_dict.pop("kind", None)
|
|
151
154
|
pvc_dict.pop("api_version", None)
|
|
152
155
|
|
|
153
156
|
|
|
157
|
+
async def wait_for_pvc_bound(
|
|
158
|
+
core_v1, pvc_name, namespace, timeout=300, poll_interval=5
|
|
159
|
+
):
|
|
160
|
+
logger.info(f"waiting for pvc '{pvc_name}' in '{namespace}' to become available...")
|
|
161
|
+
end_time = asyncio.get_event_loop().time() + timeout
|
|
162
|
+
while asyncio.get_event_loop().time() < end_time:
|
|
163
|
+
try:
|
|
164
|
+
pvc = core_v1.read_namespaced_persistent_volume_claim(
|
|
165
|
+
name=pvc_name, namespace=namespace
|
|
166
|
+
)
|
|
167
|
+
phase = pvc.status.phase
|
|
168
|
+
logger.debug(f"pvc current phase: {phase}")
|
|
169
|
+
|
|
170
|
+
if phase == "Bound":
|
|
171
|
+
logger.info(f"pvc available!")
|
|
172
|
+
return
|
|
173
|
+
|
|
174
|
+
await asyncio.sleep(poll_interval)
|
|
175
|
+
except ApiException as e:
|
|
176
|
+
if e.status == 404:
|
|
177
|
+
await asyncio.sleep(poll_interval)
|
|
178
|
+
else:
|
|
179
|
+
raise
|
|
180
|
+
|
|
181
|
+
raise RuntimeError(f"timeout waiting for pvc to become available")
|
|
182
|
+
|
|
183
|
+
|
|
154
184
|
def clean_pv_dict(pv_dict):
|
|
155
185
|
# cleanup the old pv aswell for recreation
|
|
156
186
|
pv_dict.pop("api_version", None)
|
|
@@ -687,6 +717,10 @@ async def procedure():
|
|
|
687
717
|
)
|
|
688
718
|
)
|
|
689
719
|
|
|
720
|
+
await wait_for_pvc_bound(
|
|
721
|
+
core_v1, pvc_dict["metadata"]["name"], restore_namespace
|
|
722
|
+
)
|
|
723
|
+
|
|
690
724
|
# openebs zfs also has a custom resource for zvols that needs to be created
|
|
691
725
|
custom_api.create_namespaced_custom_object(
|
|
692
726
|
group="zfs.openebs.io",
|
|
@@ -971,6 +1005,10 @@ async def procedure():
|
|
|
971
1005
|
)
|
|
972
1006
|
)
|
|
973
1007
|
|
|
1008
|
+
await wait_for_pvc_bound(
|
|
1009
|
+
core_v1, pvc_dict["metadata"]["name"], restore_namespace
|
|
1010
|
+
)
|
|
1011
|
+
|
|
974
1012
|
# scale back up again
|
|
975
1013
|
if restore_args["auto_scale"]:
|
|
976
1014
|
# auto downscale deployments and statefulsets of namespace
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
__version__ = "3.5.16"
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{py_pve_cloud_backup-3.5.16 → py_pve_cloud_backup-3.5.17}/src/pve_cloud_backup/daemon/bdd.py
RENAMED
|
File without changes
|
{py_pve_cloud_backup-3.5.16 → py_pve_cloud_backup-3.5.17}/src/pve_cloud_backup/daemon/brctl.py
RENAMED
|
File without changes
|
{py_pve_cloud_backup-3.5.16 → py_pve_cloud_backup-3.5.17}/src/pve_cloud_backup/daemon/funcs.py
RENAMED
|
File without changes
|
{py_pve_cloud_backup-3.5.16 → py_pve_cloud_backup-3.5.17}/src/pve_cloud_backup/fetcher/ext_zfs.py
RENAMED
|
File without changes
|
{py_pve_cloud_backup-3.5.16 → py_pve_cloud_backup-3.5.17}/src/pve_cloud_backup/fetcher/funcs.py
RENAMED
|
File without changes
|
{py_pve_cloud_backup-3.5.16 → py_pve_cloud_backup-3.5.17}/src/pve_cloud_backup/fetcher/git.py
RENAMED
|
File without changes
|
{py_pve_cloud_backup-3.5.16 → py_pve_cloud_backup-3.5.17}/src/pve_cloud_backup/fetcher/main.py
RENAMED
|
File without changes
|
{py_pve_cloud_backup-3.5.16 → py_pve_cloud_backup-3.5.17}/src/pve_cloud_backup/fetcher/net.py
RENAMED
|
File without changes
|
{py_pve_cloud_backup-3.5.16 → py_pve_cloud_backup-3.5.17}/src/pve_cloud_backup/fetcher/nextcloud.py
RENAMED
|
File without changes
|
{py_pve_cloud_backup-3.5.16 → py_pve_cloud_backup-3.5.17}/src/pve_cloud_backup/fetcher/patroni.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|