qontract-reconcile 0.10.0__py3-none-any.whl → 0.10.1.dev1203__py3-none-any.whl

reconcile/ocm_upgrade_scheduler_org_updater.py

@@ -1,9 +1,6 @@
 import json
 import logging
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 import yaml
 
@@ -12,7 +9,7 @@ from reconcile import (
     mr_client_gateway,
     queries,
 )
-from reconcile.openshift_resources_base import process_jinja2_template
+from reconcile.utils.jinja2.utils import process_jinja2_template
 from reconcile.utils.ocm import (
     OCMMap,
     OCMSpec,
@@ -25,7 +22,7 @@ def render_policy(
     template: dict[str, Any],
     cluster_spec: OCMSpec,
     labels: dict[str, str],
-    settings: Optional[dict[str, Any]] = None,
+    settings: dict[str, Any] | None = None,
 ) -> dict[str, Any]:
     body = template["path"]["content"]
     type = template.get("type") or "jinja2"
@@ -65,17 +62,22 @@ def run(dry_run, gitlab_project_id):
                 c for c in upgrade_policy_clusters if c["name"] == ocm_cluster_name
             ]
             if not found:
-                ocm_cluster_labels = ocm.get_external_configuration_labels(
-                    ocm_cluster_name
+                ocm_cluster_labels = (
+                    ocm.get_external_configuration_labels(ocm_cluster_name)
+                    if not ocm_cluster_spec.spec.hypershift
+                    else {}
                 )
                 for default in upgrade_policy_defaults:
                     default_name = default["name"]
                     match_labels: dict[str, str] = json.loads(default["matchLabels"])
                     if match_labels.items() <= ocm_cluster_labels.items():
                         create_update_mr = True
-                        logging.info(
-                            ["add_cluster", ocm_name, ocm_cluster_name, default_name]
-                        )
+                        logging.info([
+                            "add_cluster",
+                            ocm_name,
+                            ocm_cluster_name,
+                            default_name,
+                        ])
                         policy = default["upgradePolicy"]
                         if not policy:
                             template = default["upgradePolicyTemplate"]
@@ -85,6 +87,8 @@ def run(dry_run, gitlab_project_id):
                         item = {
                             "action": "add",
                             "cluster": ocm_cluster_name,
+                            "url": ocm_cluster_spec.server_url,
+                            "id": ocm_cluster_spec.spec.id,
                             "policy": policy,
                         }
                         updates.append(item)