qontract-reconcile 0.9.1rc93__py3-none-any.whl → 0.9.1rc95__py3-none-any.whl

{qontract_reconcile-0.9.1rc93.dist-info → qontract_reconcile-0.9.1rc95.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.9.1rc93
+Version: 0.9.1rc95
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Home-page: https://github.com/app-sre/qontract-reconcile
 Author: Red Hat App-SRE Team

{qontract_reconcile-0.9.1rc93.dist-info → qontract_reconcile-0.9.1rc95.dist-info}/RECORD

@@ -79,7 +79,7 @@ reconcile/openshift_base.py,sha256=-vEJEQAES6-QDGnGkWKGwjkG7rt4DLWd8YngZn0zhlo,4
 reconcile/openshift_clusterrolebindings.py,sha256=cztreWXqrkxLgKvJGGWJg4ZleU1hxvY8Z6rRgCbyahc,5771
 reconcile/openshift_groups.py,sha256=t-wlYPA5a_futYATEyJCPrehHRr-2iAcIH29S3Qnr6M,9390
 reconcile/openshift_limitranges.py,sha256=SZkHhGS3m9oBUkzcclRiszfLEB7jQ8z8xh9P2Y8KTzg,3393
-reconcile/openshift_namespace_labels.py,sha256=3PLFs5H7E_z6F1JAAQ9zFhDHEhF_MmDoVWKPJSlbgBo,15866
+reconcile/openshift_namespace_labels.py,sha256=Kgk91c0-iQ9czTVaNfh5Q8h0uvEhosM3dKagzCu_tK0,15843
 reconcile/openshift_namespaces.py,sha256=K_Okla8OTt9EFvdT__wjujbLnR9Iqhy-9dDqUPduVjA,4945
 reconcile/openshift_network_policies.py,sha256=X48jTvKOXhrLwWymkxbieYqJg01bDn90FnXFDr0WBI8,4189
 reconcile/openshift_resourcequotas.py,sha256=QR73mIa7rCEQgUqfRCCvlg9trqFNPjeIJZ_qVzY-mSQ,2795
@@ -278,7 +278,7 @@ reconcile/test/test_ocm_update_recommended_version.py,sha256=ONY3slwUHwEdonvIYRI
 reconcile/test/test_ocm_upgrade_scheduler.py,sha256=tBbCUQ0ZyunfF4R5Ang5yquYhzwQ_4QMUP6ZaHpqW0E,20567
 reconcile/test/test_ocm_upgrade_scheduler_org_updater.py,sha256=zYRGUX7pAmxSv9oFYw2ZnPGa-YAPgDfmqXOJM4eE-8A,4353
 reconcile/test/test_openshift_base.py,sha256=OpTsZ2hwcSjov4wpjg5Yw6ZtlVTCOvR2uU57hlM_AV0,19378
-reconcile/test/test_openshift_namespace_labels.py,sha256=r4BZ9G-RRIDXNYQY9InaC6iSzR5WQPTZE4Fs3KMIXI0,12125
+reconcile/test/test_openshift_namespace_labels.py,sha256=MqjESFjJQsRku7SKW17d9A5SmlK0ZUyDSV4-2BVS6Pg,12101
 reconcile/test/test_openshift_namespaces.py,sha256=fHfI3wDA3glYrdCxwqE8X9WCVYguyVwuUhudoubQQps,8188
 reconcile/test/test_openshift_resource.py,sha256=YxXONreobUzn43iw4pCx4AZC4dONjCeZ6hvEwYsBin0,12106
 reconcile/test/test_openshift_resources_base.py,sha256=zqPsk_FHovOBjj5lPs4OQboP4PDhxz6D35cRWkvQx50,12963
@@ -468,8 +468,8 @@ tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y
 tools/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/test/test_qontract_cli.py,sha256=taXJPi2yJrV5ql6G3IivU3Lj5mNXje-nUEjp6uXa1oc,1396
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.9.1rc93.dist-info/METADATA,sha256=3bGGM2_JSqKt-ibzKE9-sqsBmEMPiHMRAMn2Tdmzv-8,2256
-qontract_reconcile-0.9.1rc93.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-qontract_reconcile-0.9.1rc93.dist-info/entry_points.txt,sha256=3BPvsRryM1C4S_mb5kXmP5AVv-wJBzVCrOJyv6qUmc0,195
-qontract_reconcile-0.9.1rc93.dist-info/top_level.txt,sha256=j0CHPIc8TsVRB50wOz_jhxjjaRyCJB3NOQeXhuHS67c,34
-qontract_reconcile-0.9.1rc93.dist-info/RECORD,,
+qontract_reconcile-0.9.1rc95.dist-info/METADATA,sha256=VdW6w4GerY--SRx9wGBl7k1CYkAIpaf3CNWpR_B-Uig,2256
+qontract_reconcile-0.9.1rc95.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+qontract_reconcile-0.9.1rc95.dist-info/entry_points.txt,sha256=3BPvsRryM1C4S_mb5kXmP5AVv-wJBzVCrOJyv6qUmc0,195
+qontract_reconcile-0.9.1rc95.dist-info/top_level.txt,sha256=j0CHPIc8TsVRB50wOz_jhxjjaRyCJB3NOQeXhuHS67c,34
+qontract_reconcile-0.9.1rc95.dist-info/RECORD,,

reconcile/openshift_namespace_labels.py

@@ -1,4 +1,3 @@
-import json
 import logging
 import sys
 from collections.abc import (
@@ -241,9 +240,8 @@ def get_desired(
         # eg: internal settings may not match --internal / --external param
         if cluster not in oc_map.clusters():
             continue
-        labels = json.loads(ns.labels)
 
-        validation_errors = validate_labels(labels)
+        validation_errors = validate_labels(ns.labels)
         for err in validation_errors:
             inventory.add_error(cluster=cluster, namespace=ns_name, err=err)
         if inventory.errors(cluster=cluster, namespace=ns_name):
@@ -255,7 +253,9 @@ def get_desired(
             to_be_ignored.append((cluster, ns_name))
             continue
 
-        inventory.set(cluster=cluster, namespace=ns_name, type=DESIRED, labels=labels)
+        inventory.set(
+            cluster=cluster, namespace=ns_name, type=DESIRED, labels=ns.labels
+        )
 
     for cluster, ns_name in to_be_ignored:
         # Log only a warning here and do not report errors nor fail the

reconcile/test/test_openshift_namespace_labels.py

@@ -1,4 +1,3 @@
-import json
 from dataclasses import dataclass
 from typing import Optional
 from unittest import TestCase
@@ -49,7 +48,7 @@ class NS:
         namespace.name = self.name
         namespace.cluster.name = self.cluster
         if self.desired is not None:
-            namespace.labels = json.dumps(self.desired)
+            namespace.labels = self.desired
         return namespace
 
     def oc_get_all(self):