From: francisco.garcia Date: Mon, 24 Jul 2023 07:36:19 +0000 (+0200) Subject: k8s: Fix service upload error and flexible yaml loader X-Git-Tag: Beta-15.0.0~151 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=543d391fc0696afe4afa4a5b4695e3c2a7b042de;p=thirdparty%2Fbacula.git k8s: Fix service upload error and flexible yaml loader --- diff --git a/bacula/src/plugins/fd/kubernetes-backend/baculak8s/plugins/k8sbackend/k8sfileinfo.py b/bacula/src/plugins/fd/kubernetes-backend/baculak8s/plugins/k8sbackend/k8sfileinfo.py index 2e69b6487..ad2c7d534 100644 --- a/bacula/src/plugins/fd/kubernetes-backend/baculak8s/plugins/k8sbackend/k8sfileinfo.py +++ b/bacula/src/plugins/fd/kubernetes-backend/baculak8s/plugins/k8sbackend/k8sfileinfo.py @@ -50,7 +50,7 @@ def encoder_load(msg, filename=None): if filename.endswith('.json') or (filename is None and defaultk8sext == 'json'): return json.loads(msg) else: - return yaml.load(msg, Loader=yaml.FullLoader) + return yaml.load(msg, Loader=yaml.Loader) def k8sfile2objname(fname): diff --git a/bacula/src/plugins/fd/kubernetes-backend/baculak8s/plugins/k8sbackend/service.py b/bacula/src/plugins/fd/kubernetes-backend/baculak8s/plugins/k8sbackend/service.py index 955ad05aa..5dbdd0cd8 100644 --- a/bacula/src/plugins/fd/kubernetes-backend/baculak8s/plugins/k8sbackend/service.py +++ b/bacula/src/plugins/fd/kubernetes-backend/baculak8s/plugins/k8sbackend/service.py @@ -63,9 +63,7 @@ def services_restore_namespaced(corev1api, file_info, file_content): if services.spec.cluster_ip != 'None': # clean some data services.spec.cluster_ip = None - # When libraries were upgraded to kubernetes 26, this change was needed. - if services.spec.cluster_i_ps: - services.spec.cluster_i_ps = None + if file_info.objcache is not None: # object exist so we replace it response = corev1api.replace_namespaced_service(k8sfile2objname(file_info.name),