qontract-reconcile 0.10.1rc1109__py3-none-any.whl → 0.10.1rc1110__py3-none-any.whl

{qontract_reconcile-0.10.1rc1109.dist-info → qontract_reconcile-0.10.1rc1110.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc1109
+Version: 0.10.1rc1110
 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.10.1rc1109.dist-info → qontract_reconcile-0.10.1rc1110.dist-info}/RECORD

@@ -61,7 +61,7 @@ reconcile/ocm_groups.py,sha256=-rTPMewkdyo1De6gs4u-294p3z34oUbGfuNi8ov56Sk,3424
 reconcile/ocm_machine_pools.py,sha256=poGfITOCJEMwYAJpiuL8SytgTcBmGIKEZPgNGld80TY,16563
 reconcile/ocm_update_recommended_version.py,sha256=IYkfLXIprOW1jguZeELcGP1iBPuj-b53R-FTqKulMl8,4204
 reconcile/ocm_upgrade_scheduler_org_updater.py,sha256=aLgyInt9oIWAg0XtCiwJRUSwdPx3masKV8kHzkyEEOQ,4282
-reconcile/openshift_base.py,sha256=l3stMLbjRj3Z18orwyRv8ZN5IqVRaEwQ9tgiQJjDI5w,52641
+reconcile/openshift_base.py,sha256=6hWLBQ6HF6ignq74PWxVDTxPs84kno0yQnomdx_o8K0,52736
 reconcile/openshift_cluster_bots.py,sha256=AmCLCrlsZ_Wd5qMPzlv-O01i47WGJuojEc-Jgt2n77c,10942
 reconcile/openshift_clusterrolebindings.py,sha256=sDgHi_t2ayE3O6zZ5CLao7uBmihxRK8K70w2GSADz-w,5822
 reconcile/openshift_groups.py,sha256=sK2wLWwNupztbfyFPl32VH42s_s8Mu3g-URdlisnwJc,9382
@@ -75,7 +75,7 @@ reconcile/openshift_resources.py,sha256=I2nO_C37mG3rfyGrd4cGwN3mVseVGuTAHAyhFzLy
 reconcile/openshift_resources_base.py,sha256=1A5_699p0rdsMwRQRPzePEfjhhq5eB2Obwxx4Ibr8jA,41205
 reconcile/openshift_rolebindings.py,sha256=9mlJ2FjWUoH-rsjtasreA_hV-K5Z_YR00qR_RR60OZM,6555
 reconcile/openshift_routes.py,sha256=fXvuPSjcjVw1X3j2EQvUAdbOepmIFdKk-M3qP8QzPiw,1075
-reconcile/openshift_saas_deploy.py,sha256=UZlm29JujJVS3MzSm6uehlC3y-jZxl6WVwMeKRdN11U,12773
+reconcile/openshift_saas_deploy.py,sha256=T1dvb9zajisaJNjbnR6-AZHU-itscHtr4oCqLj8KCK0,13037
 reconcile/openshift_saas_deploy_change_tester.py,sha256=12uyBwaeMka1C3_pejmQPIBPAx2V1sJ4dJkScq-2e2M,8793
 reconcile/openshift_saas_deploy_trigger_base.py,sha256=Ss_FE31d8jR2f3lbSiU0ROBMVI1kg-Y_8nxLavFPFko,14036
 reconcile/openshift_saas_deploy_trigger_cleaner.py,sha256=roLyVAVntaQptKaZbnN1LyLvCA8fyvqELfjU6M8xfeY,3511
@@ -699,7 +699,7 @@ reconcile/utils/make.py,sha256=QaEwucrzbl8-VHS66Wfdjfo0ubmAcvt_hZGpiGsKU50,231
 reconcile/utils/metrics.py,sha256=QN37XJDajWt-FdVGgqqDUkhemwTj0srfb-rhkIBxvsE,18591
 reconcile/utils/models.py,sha256=BYsgjWyuwO7obMhqADsqEQ-_YJrmy8LmFKHSLMFbo1g,4645
 reconcile/utils/oauth2_backend_application_session.py,sha256=6W16sMpnWEPFDUX7qi5Cui2yOnmLfpgUxWtB3Ii35D0,4177
-reconcile/utils/oc.py,sha256=B_XFgL3yPhztKGrQNl7sdjCZV3t7zpmN0k62WnOiWlk,66015
+reconcile/utils/oc.py,sha256=AjwQnzLxnMv0ML70GfjTHeYmiNsztI8kgXQF3N0Hvfw,66088
 reconcile/utils/oc_connection_parameters.py,sha256=7DiEGo--TJelfYoZXJFyTBPeTw9kXL3L58vy2fiJnes,9643
 reconcile/utils/oc_filters.py,sha256=Tz3OwtbUaYKmxENFls5CtPVzkZDeFXknw53dJe-wbT8,1382
 reconcile/utils/oc_map.py,sha256=U8cYhiaZsomkofzbIjVrl7E7crRxkS2JKsFpVeeHVE8,8964
@@ -870,8 +870,8 @@ tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jr
 tools/test/test_saas_promotion_state.py,sha256=dy4kkSSAQ7bC0Xp2CociETGN-2aABEfL6FU5D9Jl00Y,6056
 tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc1109.dist-info/METADATA,sha256=xkpjJve4vseH5U9biXZ2ku_Jc0lSIvJudH_ROUPvaQ0,2213
-qontract_reconcile-0.10.1rc1109.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-qontract_reconcile-0.10.1rc1109.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1109.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1109.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1110.dist-info/METADATA,sha256=_zirPDusBEjVZlm4_iZZ18epfv7-X0dL3liL66u5o8M,2213
+qontract_reconcile-0.10.1rc1110.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+qontract_reconcile-0.10.1rc1110.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1110.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1110.dist-info/RECORD,,

reconcile/openshift_base.py

@@ -300,7 +300,9 @@ def populate_current_state(
         return
     try:
         for item in spec.oc.get_items(
-            spec.kind, namespace=spec.namespace, resource_names=spec.resource_names
+            spec.kind,
+            namespace=spec.namespace,
+            resource_names=spec.resource_names,
         ):
             openshift_resource = OR(item, integration, integration_version)
 
@@ -331,6 +333,7 @@ def fetch_current_state(
     init_api_resources: bool = False,
     cluster_admin: bool = False,
     caller: str | None = None,
+    init_projects: bool = False,
 ) -> tuple[ResourceInventory, OC_Map]:
     ri = ResourceInventory()
     settings = queries.get_app_interface_settings()
@@ -344,6 +347,7 @@ def fetch_current_state(
         thread_pool_size=thread_pool_size,
         init_api_resources=init_api_resources,
         cluster_admin=cluster_admin,
+        init_projects=init_projects,
     )
     state_specs = init_specs_to_fetch(
         ri,

reconcile/openshift_saas_deploy.py

@@ -33,6 +33,7 @@ from reconcile.utils.secret_reader import create_secret_reader
 from reconcile.utils.semver_helper import make_semver
 from reconcile.utils.slack_api import SlackApi
 from reconcile.utils.state import init_state
+from reconcile.utils.unleash import get_feature_toggle_state
 
 QONTRACT_INTEGRATION = "openshift-saas-deploy"
 QONTRACT_INTEGRATION_VERSION = make_semver(0, 1, 0)
@@ -216,6 +217,11 @@ def run(
         logging.warning("no targets found")
         sys.exit(ExitCodes.SUCCESS)
 
+    # check enable_init_projects flag status
+    enable_init_projects = get_feature_toggle_state(
+        "enable_init_projects",
+        default=False,
+    )
     ri, oc_map = ob.fetch_current_state(
         namespaces=[ns.dict(by_alias=True) for ns in saasherder.namespaces],
         thread_pool_size=thread_pool_size,
@@ -224,6 +230,7 @@ def run(
         init_api_resources=True,
         cluster_admin=bool(saasherder.cluster_admin),
         use_jump_host=use_jump_host,
+        init_projects=enable_init_projects,
     )
     if defer:  # defer is provided by the method decorator. this makes just mypy happy
         defer(oc_map.cleanup)

reconcile/utils/oc.py

@@ -370,6 +370,7 @@ class OCCli:  # pylint: disable=too-many-public-methods
         self.api_resources_lock = threading.RLock()
         self.init_api_resources = init_api_resources
         self.api_resources = {}
+        self.projects = set()
         if self.init_api_resources:
             self.api_resources = self.get_api_resources()
 
@@ -379,7 +380,7 @@ class OCCli:  # pylint: disable=too-many-public-methods
                 kind = "Project.project.openshift.io"
             else:
                 kind = "Namespace"
-            self.projects = [p["metadata"]["name"] for p in self.get_all(kind)["items"]]
+            self.projects = {p["metadata"]["name"] for p in self.get_all(kind)["items"]}
 
         self.slow_oc_reconcile_threshold = float(
             os.environ.get("SLOW_OC_RECONCILE_THRESHOLD", 600)
@@ -442,6 +443,7 @@ class OCCli:  # pylint: disable=too-many-public-methods
         self.api_resources_lock = threading.RLock()
         self.init_api_resources = init_api_resources
         self.api_resources = {}
+        self.projects = set()
         if self.init_api_resources:
             self.api_resources = self.get_api_resources()
 
@@ -451,7 +453,7 @@ class OCCli:  # pylint: disable=too-many-public-methods
                 kind = "Project.project.openshift.io"
             else:
                 kind = "Namespace"
-            self.projects = [p["metadata"]["name"] for p in self.get_all(kind)["items"]]
+            self.projects = {p["metadata"]["name"] for p in self.get_all(kind)["items"]}
 
         self.slow_oc_reconcile_threshold = float(
             os.environ.get("SLOW_OC_RECONCILE_THRESHOLD", 600)
@@ -605,9 +607,8 @@ class OCCli:  # pylint: disable=too-many-public-methods
         return self._msg_to_process_reconcile_time(namespace, resource)
 
     def project_exists(self, name):
-        if self.init_projects:
-            return name in self.projects
-
+        if name in self.projects:
+            return True
         try:
             if self.is_kind_supported("Project"):
                 self.get(None, "Project.project.openshift.io", name)
@@ -1265,14 +1266,14 @@ class OCNative(OCCli):
             raise Exception("A method relies on client/api_kind_version to be set")
 
         self.object_clients: dict[Any, Any] = {}
-
+        self.projects = set()
         self.init_projects = init_projects
         if self.init_projects:
             if self.is_kind_supported("Project"):
                 kind = "Project.project.openshift.io"
             else:
                 kind = "Namespace"
-            self.projects = [p["metadata"]["name"] for p in self.get_all(kind)["items"]]
+            self.projects = {p["metadata"]["name"] for p in self.get_all(kind)["items"]}
 
     def __enter__(self):
         return self
@@ -1370,7 +1371,6 @@ class OCNative(OCCli):
         items = items_list.get("items")
         if items is None:
             raise Exception("Expecting items")
-
         return items
 
     @retry(max_attempts=5, exceptions=(ServerTimeoutError, ForbiddenError))