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 2e69b64874ae0dde48223b38e6751b88b56fc34a..ad2c7d5343b6a3627235974b75d768c26ccb89c9 100644 (file)
--- 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 955ad05aaec0acbbbbbd6babb0fc11e8cf1d7397..5dbdd0cd81f387c38b2955845b579b7b04e0d66f 100644 (file)
--- 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),