qontract-reconcile 0.10.2.dev226__py3-none-any.whl → 0.10.2.dev228__py3-none-any.whl

{qontract_reconcile-0.10.2.dev226.dist-info → qontract_reconcile-0.10.2.dev228.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev226
+Version: 0.10.2.dev228
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile

{qontract_reconcile-0.10.2.dev226.dist-info → qontract_reconcile-0.10.2.dev228.dist-info}/RECORD

@@ -77,7 +77,7 @@ reconcile/openshift_rolebindings.py,sha256=9mlJ2FjWUoH-rsjtasreA_hV-K5Z_YR00qR_R
 reconcile/openshift_routes.py,sha256=fXvuPSjcjVw1X3j2EQvUAdbOepmIFdKk-M3qP8QzPiw,1075
 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=ftG8vqXCfaMUrkl1QqbPjnRpnQAmMIGCG0IT-YWAG6U,14366
+reconcile/openshift_saas_deploy_trigger_base.py,sha256=fHCnlskcRKcitmIWWF3ePhKhQ0WlMeEaRDZM2IAW9BY,14649
 reconcile/openshift_saas_deploy_trigger_cleaner.py,sha256=roLyVAVntaQptKaZbnN1LyLvCA8fyvqELfjU6M8xfeY,3511
 reconcile/openshift_saas_deploy_trigger_configs.py,sha256=eUejMGWuaQabZTLuvPLLvROfN5HOFyYZOpH4YEsiU_g,928
 reconcile/openshift_saas_deploy_trigger_images.py,sha256=iUsiBGJf-CyFw7tSLWo59rXmSvsVnN6TTaAObbsVpNg,936
@@ -108,7 +108,7 @@ reconcile/slack_base.py,sha256=I-msunWxfgu5bSwXYulGbtLjxUB_tRmTCAUCU-3nabI,3484
 reconcile/slack_usergroups.py,sha256=xFkVe67RXSUj8JvpfSFEiRdQzB0TnJJEHW_b5PEwLng,30213
 reconcile/sql_query.py,sha256=auZCWe6dytsDp83Imfo4zqkpMCLRXU007IUlPeUE3j4,26376
 reconcile/status.py,sha256=cY4IJFXemhxptRJqR4qaaOWqei9e4jgLXuVSGajMsjg,544
-reconcile/status_board.py,sha256=kJ0bus_wdyX3zsFJuUPrH4n9BNG_jhDbiQ3waOLVRBE,8538
+reconcile/status_board.py,sha256=Hxx6sFFyPTNi6zY-qlAco9OqPvdx6Kbgce0DunDUsNQ,15838
 reconcile/terraform_aws_route53.py,sha256=dQzzT46YhwRA902_H6pi-f7WlX4EaH187wXSdmJAUkQ,9958
 reconcile/terraform_cloudflare_dns.py,sha256=-aLEe2QnH5cJPu7HWqs-R9NmQ1NlFbcVUm0v7alVL3I,13431
 reconcile/terraform_cloudflare_resources.py,sha256=pq8Ieo5NmB-dYQ9X2F0s6iEoINMzhiqGw2yQK4ovok4,14980
@@ -740,7 +740,7 @@ reconcile/utils/ocm/products.py,sha256=Ki9o0VV4z_FsXQaJtSFzlUnxLvpk1H-RamvJpUwwb
 reconcile/utils/ocm/search_filters.py,sha256=uUCJ-XOEp4D5uxPW7lDqNe6s-mQWLOCqMu9_xvO6PXU,14798
 reconcile/utils/ocm/service_log.py,sha256=RG1f0MMn6joKaRCAm2xveSJCavdOPP1BVo9FXecDxaI,2018
 reconcile/utils/ocm/sre_capability_labels.py,sha256=nqh0imrYczNeeeC7ZNX3pEwuAIVkKLTKZf0YHSPZYpE,1537
-reconcile/utils/ocm/status_board.py,sha256=ycPWKNhz_YGNE-1g2tD5e_PaNG6UVw2BqIN7kOzG_Uc,2317
+reconcile/utils/ocm/status_board.py,sha256=ptPRzwP1qjmg1d_ZD4X050gB6W2XNnJs8p7hc06tmbw,4142
 reconcile/utils/ocm/subscriptions.py,sha256=hehKXsDXIhnhqvWOuiYvx6y2FGq3zt0APGYj7WiBIdI,2765
 reconcile/utils/ocm/syncsets.py,sha256=9IQm1l5BodOVZa2OFbQmow3afmh4nXe5pn-CCJ5LxTI,1169
 reconcile/utils/ocm/upgrades.py,sha256=Hs3R9pkl5GoFgSyF7ZYhqG1gXOBCSGPL_ymDYAT3jXA,4804
@@ -803,7 +803,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
-qontract_reconcile-0.10.2.dev226.dist-info/METADATA,sha256=bGNtcchcffnsilIn9PgEoNm2KuX18QtvVovsxSIbS1c,24431
-qontract_reconcile-0.10.2.dev226.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev226.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev226.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev228.dist-info/METADATA,sha256=5Vilv7XrctUYz2MggGRV5YpQQzRms_cQB_isU8a-HNE,24431
+qontract_reconcile-0.10.2.dev228.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev228.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev228.dist-info/RECORD,,

reconcile/openshift_saas_deploy_trigger_base.py

@@ -38,7 +38,7 @@ from reconcile.utils.saasherder import (
     TriggerSpecUnion,
 )
 from reconcile.utils.saasherder.interfaces import SaasPipelinesProviderTekton
-from reconcile.utils.saasherder.models import TriggerTypes
+from reconcile.utils.saasherder.models import TriggerSpecConfig, TriggerTypes
 from reconcile.utils.secret_reader import create_secret_reader
 from reconcile.utils.sharding import is_in_shard
 from reconcile.utils.state import init_state
@@ -267,6 +267,10 @@ def _trigger_tekton(
         )
         return False
 
+    target_ref = None
+    if isinstance(spec, TriggerSpecConfig):
+        target_ref = spec.target_ref
+
     tkn_trigger_resource, tkn_name = _construct_tekton_trigger_resource(
         spec.saas_file_name,
         spec.env_name,
@@ -278,6 +282,7 @@ def _trigger_tekton(
         integration_version,
         saasherder.include_trigger_trace,
         spec.reason,
+        target_ref,
     )
 
     error = False
@@ -334,6 +339,7 @@ def _construct_tekton_trigger_resource(
     integration_version: str,
     include_trigger_trace: bool,
     reason: str | None,
+    target_ref: str | None,
 ) -> tuple[OR, str]:
     """Construct a resource (PipelineRun) to trigger a deployment via Tekton.
 
@@ -348,6 +354,7 @@ def _construct_tekton_trigger_resource(
         integration_version (string): Version of calling integration
         include_trigger_trace (bool): Should include traces of the triggering integration and reason
         reason (string): The reason this trigger was created
+        target_ref (string): the SHA ref of the target
 
     Returns:
         OpenshiftResource: OpenShift resource to be applied
@@ -385,6 +392,7 @@ def _construct_tekton_trigger_resource(
             "labels": {
                 "qontract.saas_file_name": saas_file_name,
                 "qontract.env_name": env_name,
+                "qontract.target_ref": target_ref or "",
             },
         },
         "spec": {

reconcile/status_board.py

@@ -4,26 +4,36 @@ from abc import (
     abstractmethod,
 )
 from collections.abc import Iterable, Mapping
+from enum import Enum
 from typing import (
-    Any,
     Optional,
 )
 
 from pydantic import BaseModel
 
+from reconcile.gql_definitions.slo_documents.slo_documents import SLODocumentV1
 from reconcile.gql_definitions.status_board.status_board import StatusBoardV1
+from reconcile.typed_queries.slo_documents import get_slo_documents
 from reconcile.typed_queries.status_board import (
     get_selected_app_names,
     get_status_board,
 )
 from reconcile.utils.differ import diff_mappings
 from reconcile.utils.ocm.status_board import (
+    ApplicationOCMSpec,
+    BaseOCMSpec,
+    ServiceMetadataSpec,
+    ServiceOCMSpec,
     create_application,
     create_product,
+    create_service,
     delete_application,
     delete_product,
+    delete_service,
+    get_application_services,
     get_managed_products,
     get_product_applications,
+    update_service,
 )
 from reconcile.utils.ocm_base_client import (
     OCMBaseClient,
@@ -34,6 +44,12 @@ from reconcile.utils.runtime.integration import QontractReconcileIntegration
 QONTRACT_INTEGRATION = "status-board-exporter"
 
 
+class Action(Enum):
+    create = "create"
+    update = "update"
+    delete = "delete"
+
+
 class AbstractStatusBoard(ABC, BaseModel):
     """Abstract class for upgrade policies
     Used to create and delete upgrade policies in OCM."""
@@ -41,12 +57,15 @@ class AbstractStatusBoard(ABC, BaseModel):
     id: str | None
     name: str
     fullname: str
-    metadata: dict[str, Any] | None
 
     @abstractmethod
     def create(self, ocm: OCMBaseClient) -> None:
         pass
 
+    @abstractmethod
+    def update(self, ocm: OCMBaseClient) -> None:
+        pass
+
     @abstractmethod
     def delete(self, ocm: OCMBaseClient) -> None:
         pass
@@ -60,16 +79,28 @@ class AbstractStatusBoard(ABC, BaseModel):
     def get_priority() -> int:
         pass
 
+    @abstractmethod
+    def to_ocm_spec(self) -> BaseOCMSpec:
+        pass
+
+    def __eq__(self, other: object) -> bool:
+        if not isinstance(other, AbstractStatusBoard):
+            return NotImplemented
+        return self.name == other.name and self.fullname == other.fullname
+
 
 class Product(AbstractStatusBoard):
     applications: list["Application"] | None
 
     def create(self, ocm: OCMBaseClient) -> None:
-        spec = self.dict(by_alias=True)
-        spec.pop("applications")
-        spec.pop("id")
+        spec = self.to_ocm_spec()
         self.id = create_product(ocm, spec)
 
+    def update(self, ocm: OCMBaseClient) -> None:
+        err_msg = "Called update on StatusBoardHandler that doesn't have update method"
+        logging.error(err_msg)
+        raise UpdateNotSupported(err_msg)
+
     def delete(self, ocm: OCMBaseClient) -> None:
         if not self.id:
             logging.error(f'Trying to delete Product "{self.name}" without id')
@@ -79,6 +110,12 @@ class Product(AbstractStatusBoard):
     def summarize(self) -> str:
         return f'Product: "{self.name}"'
 
+    def to_ocm_spec(self) -> BaseOCMSpec:
+        return {
+            "name": self.name,
+            "fullname": self.fullname,
+        }
+
     @staticmethod
     def get_priority() -> int:
         return 0
@@ -86,18 +123,20 @@ class Product(AbstractStatusBoard):
 
 class Application(AbstractStatusBoard):
     product: Optional["Product"]
+    services: list["Service"] | None
 
     def create(self, ocm: OCMBaseClient) -> None:
-        spec = self.dict(by_alias=True)
-        spec.pop("id")
-        product = spec.pop("product")
-        product_id = product.get("id")
-        if product_id:
-            spec["product"] = {"id": product_id}
+        if self.product and self.product.id:
+            spec = self.to_ocm_spec()
             self.id = create_application(ocm, spec)
         else:
             logging.warning("Missing product id for application")
 
+    def update(self, ocm: OCMBaseClient) -> None:
+        err_msg = "Called update on StatusBoardHandler that doesn't have update method"
+        logging.error(err_msg)
+        raise UpdateNotSupported(err_msg)
+
     def delete(self, ocm: OCMBaseClient) -> None:
         if not self.id:
             logging.error(f'Trying to delete Application "{self.name}" without id')
@@ -107,25 +146,110 @@ class Application(AbstractStatusBoard):
     def summarize(self) -> str:
         return f'Application: "{self.name}" "{self.fullname}"'
 
+    def to_ocm_spec(self) -> ApplicationOCMSpec:
+        product_id = self.product.id if self.product and self.product.id else ""
+        return {
+            "name": self.name,
+            "fullname": self.fullname,
+            "product_id": product_id,
+        }
+
     @staticmethod
     def get_priority() -> int:
         return 1
 
 
+class Service(AbstractStatusBoard):
+    # `application` here is used to create a flat map to easily compare state.
+    # This field is optional so we can create the Service object without the
+    # need to create an Application object first.
+    # This filed is needed when we are creating a Service on teh OCM API.
+    # This field is not used when we are mapping the services that belongs to an
+    # application in that case we use the `services` field in Application class.
+    application: Optional["Application"]
+    metadata: ServiceMetadataSpec
+
+    def create(self, ocm: OCMBaseClient) -> None:
+        spec = self.to_ocm_spec()
+        if self.application and self.application.id:
+            self.id = create_service(ocm, spec)
+        else:
+            logging.warning("Missing application id for service")
+
+    def delete(self, ocm: OCMBaseClient) -> None:
+        if not self.id:
+            logging.error(f'Trying to delete Service "{self.name}" without id')
+            return
+        delete_service(ocm, self.id)
+
+    def update(self, ocm: OCMBaseClient) -> None:
+        if not self.id:
+            logging.error(f'Trying to update Service "{self.name}" without id')
+            return
+        spec = self.to_ocm_spec()
+        if self.application and self.application.id:
+            update_service(ocm, self.id, spec)
+        else:
+            logging.warning("Missing application id for service")
+
+    def summarize(self) -> str:
+        return f'Service: "{self.name}" "{self.fullname}"'
+
+    def to_ocm_spec(self) -> ServiceOCMSpec:
+        application_id = (
+            self.application.id if self.application and self.application.id else ""
+        )
+
+        return {
+            "name": self.name,
+            "fullname": self.fullname,
+            "metadata": self.metadata,
+            "status_type": "traffic_light",
+            "service_endpoint": "none",
+            "application_id": application_id,
+        }
+
+    @staticmethod
+    def get_priority() -> int:
+        return 2
+
+    def __eq__(self, other: object) -> bool:
+        if not isinstance(other, Service):
+            return NotImplemented
+        return (
+            self.name == other.name
+            and self.fullname == other.fullname
+            and self.metadata == other.metadata
+        )
+
+
+# Resolve forward references after class definitions
+Product.update_forward_refs()
+Application.update_forward_refs()
+Service.update_forward_refs()
+
+
+class UpdateNotSupported(Exception):
+    pass
+
+
 class StatusBoardHandler(BaseModel):
-    action: str
+    action: Action
     status_board_object: AbstractStatusBoard
 
     def act(self, dry_run: bool, ocm: OCMBaseClient) -> None:
         logging.info(f"{self.action} - {self.status_board_object.summarize()}")
+
         if dry_run:
             return
 
         match self.action:
-            case "delete":
+            case Action.delete:
                 self.status_board_object.delete(ocm)
-            case "create":
+            case Action.create:
                 self.status_board_object.create(ocm)
+            case Action.update:
+                self.status_board_object.update(ocm)
 
 
 class StatusBoardExporterIntegration(QontractReconcileIntegration):
@@ -146,7 +270,9 @@ class StatusBoardExporterIntegration(QontractReconcileIntegration):
         }
 
     @staticmethod
-    def get_current_products_applications(ocm_api: OCMBaseClient) -> list[Product]:
+    def get_current_products_applications_services(
+        ocm_api: OCMBaseClient,
+    ) -> list[Product]:
         products_raw = get_managed_products(ocm_api)
         products = [Product(**p) for p in products_raw]
 
@@ -157,82 +283,135 @@ class StatusBoardExporterIntegration(QontractReconcileIntegration):
             p.applications = [
                 Application(**a) for a in get_product_applications(ocm_api, p.id)
             ]
+            for a in p.applications:
+                if not a.id:
+                    logging.error(f'Application "{a.name}" has no id')
+                    continue
+                a.services = [
+                    Service(**s) for s in get_application_services(ocm_api, a.id)
+                ]
 
         return products
 
     @staticmethod
-    def get_diff(
-        desired_product_apps: Mapping[str, set[str]],
-        current_products_applications: Iterable[Product],
-    ) -> list[StatusBoardHandler]:
-        def create_app(app_name: str, product: Product) -> Application:
-            return Application(
-                name=app_name,
-                fullname=f"{product.name}/{app_name}",
-                product=product,
+    def desired_abstract_status_board_map(
+        desired_product_apps: Mapping[str, set[str]], slodocs: list[SLODocumentV1]
+    ) -> dict[str, AbstractStatusBoard]:
+        """
+        Returns a Mapping of all the AbstractStatusBoard data objects as dictionaries.
+        The key is formed by combining the Product, Application and Service name
+        separeted by a '/' character. This is the same format as the fullname property
+        on Status Board OCM API.
+        """
+        desired_abstract_status_board_map: dict[str, AbstractStatusBoard] = {}
+        for product, apps in desired_product_apps.items():
+            desired_abstract_status_board_map[product] = Product(
+                name=product, fullname=product, applications=[], metadata={}
             )
+            for a in apps:
+                key = f"{product}/{a}"
+                desired_abstract_status_board_map[key] = Application(
+                    name=a,
+                    fullname=key,
+                    services=[],
+                    product=desired_abstract_status_board_map[product],
+                    metadata={},
+                )
+        for slodoc in slodocs:
+            products = [
+                ns.namespace.environment.product.name for ns in slodoc.namespaces
+            ]
+            for slo in slodoc.slos or []:
+                for product in products:
+                    if slodoc.app.parent_app:
+                        app = f"{slodoc.app.parent_app.name}-{slodoc.app.name}"
+                    else:
+                        app = slodoc.app.name
+
+                    # Check if the product or app is excluded from the desired list
+                    product_or_app_excluded = (
+                        product not in desired_product_apps
+                        or app not in desired_product_apps.get(product, set())
+                    )
+
+                    # Check if statusBoard label exists and is explicitly disabled
+                    status_board_enabled = (
+                        slodoc.labels is not None
+                        and "statusBoard" in slodoc.labels
+                        and slodoc.labels["statusBoard"] == "enabled"
+                    )
+
+                    if product_or_app_excluded or not status_board_enabled:
+                        continue
+
+                    key = f"{product}/{app}/{slo.name}"
+                    metadata = {
+                        "sli_type": slo.sli_type,
+                        "sli_specification": slo.sli_specification,
+                        "slo_details": slo.slo_details,
+                        "target": slo.slo_target,
+                        "target_unit": slo.slo_target_unit,
+                        "window": slo.slo_parameters.window,
+                    }
+                    desired_abstract_status_board_map[key] = Service(
+                        name=slo.name,
+                        fullname=key,
+                        metadata=metadata,
+                        application=desired_abstract_status_board_map[
+                            f"{product}/{app}"
+                        ],
+                    )
+
+        return desired_abstract_status_board_map
 
-        return_list: list[StatusBoardHandler] = []
-        current_products = {p.name: p for p in current_products_applications}
+    @staticmethod
+    def current_abstract_status_board_map(
+        current_products_applications_services: Iterable[Product],
+    ) -> dict[str, AbstractStatusBoard]:
+        return_value: dict[str, AbstractStatusBoard] = {}
+        for product in current_products_applications_services:
+            return_value[product.name] = product
+            for app in product.applications or []:
+                return_value[f"{product.name}/{app.name}"] = app
+                for service in app.services or []:
+                    return_value[f"{product.name}/{app.name}/{service.name}"] = service
+
+        return return_value
 
-        current_as_mapping: Mapping[str, set[str]] = {
-            c.name: {a.name for a in c.applications or []}
-            for c in current_products_applications
-        }
+    @staticmethod
+    def get_diff(
+        desired_abstract_status_board_map: Mapping[str, AbstractStatusBoard],
+        current_abstract_status_board_map: Mapping[str, AbstractStatusBoard],
+        current_products: Mapping[str, Product],
+    ) -> list[StatusBoardHandler]:
+        return_list: list[StatusBoardHandler] = []
 
         diff_result = diff_mappings(
-            current_as_mapping,
-            desired_product_apps,
+            current_abstract_status_board_map,
+            desired_abstract_status_board_map,
         )
 
-        for product_name in diff_result.add:
-            product = Product(name=product_name, fullname=product_name, applications=[])
-            return_list.append(
-                StatusBoardHandler(
-                    action="create",
-                    status_board_object=product,
-                )
-            )
-            # new product, so it misses also the applications
-            return_list.extend(
-                StatusBoardHandler(
-                    action="create",
-                    status_board_object=create_app(app_name, product),
-                )
-                for app_name in desired_product_apps[product_name]
-            )
+        return_list.extend(
+            StatusBoardHandler(action=Action.create, status_board_object=o)
+            for o in diff_result.add.values()
+        )
 
-        # existing product, only add/remove applications
-        for product_name, apps in diff_result.change.items():
-            product = current_products[product_name]
-            return_list.extend(
-                StatusBoardHandler(
-                    action="create",
-                    status_board_object=create_app(app_name, product),
-                )
-                for app_name in apps.desired - apps.current
-            )
-            to_delete = apps.current - apps.desired
-            return_list.extend(
-                StatusBoardHandler(
-                    action="delete",
-                    status_board_object=application,
-                )
-                for application in product.applications or []
-                if application.name in to_delete
-            )
+        return_list.extend(
+            StatusBoardHandler(action=Action.delete, status_board_object=o)
+            for o in diff_result.delete.values()
+        )
+
+        services_to_update = [
+            s.desired
+            for _, s in diff_result.change.items()
+            if isinstance(s.desired, Service)
+        ]
+
+        return_list.extend(
+            StatusBoardHandler(action=Action.update, status_board_object=s)
+            for s in services_to_update
+        )
 
-        # product is deleted entirely
-        for product_name in diff_result.delete:
-            return_list.extend(
-                StatusBoardHandler(action="delete", status_board_object=application)
-                for application in current_products[product_name].applications or []
-            )
-            return_list.append(
-                StatusBoardHandler(
-                    action="delete", status_board_object=current_products[product_name]
-                )
-            )
         return return_list
 
     @staticmethod
@@ -241,35 +420,54 @@ class StatusBoardExporterIntegration(QontractReconcileIntegration):
     ) -> None:
         creations: list[StatusBoardHandler] = []
         deletions: list[StatusBoardHandler] = []
+        updates: list[StatusBoardHandler] = []
 
         for o in diff:
             match o.action:
-                case "create":
+                case Action.create:
                     creations.append(o)
-                case "delete":
+                case Action.delete:
                     deletions.append(o)
+                case Action.update:
+                    updates.append(o)
 
         # Products need to be created before Applications
+        # Applications need to be created before Services
         creations.sort(key=lambda x: x.status_board_object.get_priority())
 
+        # Services need to be deleted before Applications
         # Applications need to be deleted before Products
         deletions.sort(key=lambda x: x.status_board_object.get_priority(), reverse=True)
 
-        for d in creations + deletions:
+        for d in creations + deletions + updates:
             d.act(dry_run, ocm_api)
 
     def run(self, dry_run: bool) -> None:
-        # update cyclic reference
-        Product.update_forward_refs()
-
+        slodocs = get_slo_documents()
         for sb in get_status_board():
             ocm_api = init_ocm_base_client(sb.ocm, self.secret_reader)
+
+            # Desired state
             desired_product_apps: dict[str, set[str]] = self.get_product_apps(sb)
+            desired_abstract_status_board_map = self.desired_abstract_status_board_map(
+                desired_product_apps, slodocs
+            )
 
-            current_products_applications = self.get_current_products_applications(
-                ocm_api
+            # Current state
+            current_products_applications_services = (
+                self.get_current_products_applications_services(ocm_api)
+            )
+            current_abstract_status_board_map = self.current_abstract_status_board_map(
+                current_products_applications_services
             )
 
-            diff = self.get_diff(desired_product_apps, current_products_applications)
+            current_products = {
+                p.name: p for p in current_products_applications_services
+            }
+            diff = self.get_diff(
+                desired_abstract_status_board_map,
+                current_abstract_status_board_map,
+                current_products,
+            )
 
             self.apply_diff(dry_run, ocm_api, diff)

reconcile/utils/ocm/status_board.py

@@ -1,7 +1,8 @@
-from typing import Any
+from typing import Any, TypedDict
 
 from reconcile.utils.ocm_base_client import OCMBaseClient
 
+SERVICE_DESIRED_KEYS = {"id", "name", "fullname", "metadata"}
 APPLICATION_DESIRED_KEYS = {"id", "name", "fullname", "metadata"}
 PRODUCTS_DESIRED_KEYS = {"id", "name", "fullname", "metadata"}
 
@@ -10,6 +11,33 @@ METADATA_MANAGED_BY_KEY = "managedBy"
 METADATA_MANAGED_BY_VALUE = "qontract-reconcile"
 
 
+class BaseOCMSpec(TypedDict):
+    name: str
+    fullname: str
+
+
+class ApplicationOCMSpec(BaseOCMSpec):
+    product_id: str
+
+
+class ServiceMetadataSpec(TypedDict):
+    sli_type: str
+    sli_specification: str
+    slo_details: str
+    target: float
+    target_unit: str
+    window: str
+
+
+class ServiceOCMSpec(BaseOCMSpec):
+    # The next two fields come from the orignal script at
+    # https://gitlab.cee.redhat.com/service/status-board/-/blob/main/scripts/create-services-from-app-intf.sh?ref_type=heads#L116
+    status_type: str
+    service_endpoint: str
+    application_id: str
+    metadata: ServiceMetadataSpec
+
+
 def get_product_applications(
     ocm_api: OCMBaseClient, product_id: str
 ) -> list[dict[str, Any]]:
@@ -29,6 +57,25 @@ def get_product_applications(
     return results
 
 
+def get_application_services(
+    ocm_api: OCMBaseClient, app_id: str
+) -> list[dict[str, Any]]:
+    results: list[dict[str, Any]] = []
+
+    for service in ocm_api.get_paginated(
+        f"/api/status-board/v1/applications/{app_id}/services"
+    ):
+        if (
+            service.get("metadata", {}).get(METADATA_MANAGED_BY_KEY, "")
+            == METADATA_MANAGED_BY_VALUE
+        ):
+            results.append({  # noqa: PERF401
+                k: v for k, v in service.items() if k in SERVICE_DESIRED_KEYS
+            })
+
+    return results
+
+
 def get_managed_products(ocm_api: OCMBaseClient) -> list[dict[str, Any]]:
     results: list[dict[str, Any]] = []
     for product in ocm_api.get_paginated("/api/status-board/v1/products/"):
@@ -42,25 +89,50 @@ def get_managed_products(ocm_api: OCMBaseClient) -> list[dict[str, Any]]:
     return results
 
 
-def create_product(ocm_api: OCMBaseClient, spec: dict[str, Any]) -> str:
-    if "metadata" not in spec or spec["metadata"] is None:
-        spec["metadata"] = {}
-    spec["metadata"][METADATA_MANAGED_BY_KEY] = METADATA_MANAGED_BY_VALUE
-    resp = ocm_api.post("/api/status-board/v1/products/", data=spec)
+def create_product(ocm_api: OCMBaseClient, spec: BaseOCMSpec) -> str:
+    data = spec | {"metadata": {METADATA_MANAGED_BY_KEY: METADATA_MANAGED_BY_VALUE}}
+
+    resp = ocm_api.post("/api/status-board/v1/products/", data=data)
+    return resp["id"]
+
+
+def create_application(ocm_api: OCMBaseClient, spec: ApplicationOCMSpec) -> str:
+    data = spec | {"metadata": {METADATA_MANAGED_BY_KEY: METADATA_MANAGED_BY_VALUE}}
+
+    resp = ocm_api.post("/api/status-board/v1/applications/", data=data)
     return resp["id"]
 
 
-def create_application(ocm_api: OCMBaseClient, spec: dict[str, Any]) -> str:
-    if "metadata" not in spec or spec["metadata"] is None:
-        spec["metadata"] = {}
-    spec["metadata"][METADATA_MANAGED_BY_KEY] = METADATA_MANAGED_BY_VALUE
-    resp = ocm_api.post("/api/status-board/v1/applications/", data=spec)
+def create_service(ocm_api: OCMBaseClient, spec: ServiceOCMSpec) -> str:
+    data = spec | {
+        "metadata": spec["metadata"]
+        | {METADATA_MANAGED_BY_KEY: METADATA_MANAGED_BY_VALUE}
+    }
+
+    resp = ocm_api.post("/api/status-board/v1/services/", data=data)
     return resp["id"]
 
 
+def update_service(
+    ocm_api: OCMBaseClient,
+    service_id: str,
+    spec: ServiceOCMSpec,
+) -> None:
+    data = spec | {
+        "metadata": spec["metadata"]
+        | {METADATA_MANAGED_BY_KEY: METADATA_MANAGED_BY_VALUE}
+    }
+
+    ocm_api.patch(f"/api/status-board/v1/services/{service_id}", data=data)
+
+
 def delete_product(ocm_api: OCMBaseClient, product_id: str) -> None:
     ocm_api.delete(f"/api/status-board/v1/products/{product_id}")
 
 
 def delete_application(ocm_api: OCMBaseClient, application_id: str) -> None:
     ocm_api.delete(f"/api/status-board/v1/applications/{application_id}")
+
+
+def delete_service(ocm_api: OCMBaseClient, service_id: str) -> None:
+    ocm_api.delete(f"/api/status-board/v1/services/{service_id}")