qontract-reconcile 0.10.2.dev97__tar.gz → 0.10.2.dev99__tar.gz

{qontract_reconcile-0.10.2.dev97 → qontract_reconcile-0.10.2.dev99}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev97
+Version: 0.10.2.dev99
 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.dev97 → qontract_reconcile-0.10.2.dev99}/reconcile/dynatrace_token_provider/integration.py

@@ -16,7 +16,7 @@ from reconcile.dynatrace_token_provider.metrics import (
 from reconcile.dynatrace_token_provider.model import DynatraceAPIToken, K8sSecret
 from reconcile.dynatrace_token_provider.ocm import (
     DTP_LABEL_SEARCH,
-    DTP_TENANT_LABEL,
+    DTP_TENANT_V2_LABEL,
     Cluster,
     OCMClient,
 )
@@ -172,10 +172,10 @@ class DynatraceTokenProviderIntegration(QontractReconcileIntegration[NoParams]):
                                 _expose_errors_as_service_log(
                                     ocm_client,
                                     cluster_uuid=cluster.external_id,
-                                    error=f"Missing label {DTP_TENANT_LABEL}",
+                                    error=f"Missing label {DTP_TENANT_V2_LABEL}",
                                 )
                                 logging.warn(
-                                    f"[{cluster.id=}] Missing value for label {DTP_TENANT_LABEL}"
+                                    f"[{cluster.id=}] Missing value for label {DTP_TENANT_V2_LABEL}"
                                 )
                                 continue
                             if (

{qontract_reconcile-0.10.2.dev97 → qontract_reconcile-0.10.2.dev99}/reconcile/dynatrace_token_provider/ocm.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import logging
 from collections.abc import Mapping
 from datetime import timedelta
 from typing import Any
@@ -34,10 +35,7 @@ from reconcile.utils.ocm_base_client import (
 Thin abstractions of reconcile.ocm module to reduce coupling.
 """
 
-DTP_TENANT_LABEL = sre_capability_label_key("dtp", "tenant")
-DTP_SPEC_LABEL = sre_capability_label_key("dtp", "token-spec")
 DTP_LABEL_SEARCH = sre_capability_label_key("dtp", "%")
-
 DTP_TENANT_V2_LABEL = sre_capability_label_key("dtp.v2", "tenant")
 DTP_SPEC_V2_LABEL = sre_capability_label_key("dtp.v2", "token-spec")
 
@@ -51,24 +49,14 @@ class Cluster(BaseModel):
     is_hcp: bool
 
     @staticmethod
-    def from_cluster_details(cluster: ClusterDetails) -> Cluster:
+    def from_cluster_details(cluster: ClusterDetails) -> Cluster | None:
         dt_tenant = cluster.labels.get_label_value(DTP_TENANT_V2_LABEL)
         token_spec_name = cluster.labels.get_label_value(DTP_SPEC_V2_LABEL)
-
-        # TODO: remove these fallbacks APPSRE-11584
-        if not dt_tenant:
-            dt_tenant = cluster.labels.get_label_value(DTP_TENANT_LABEL)
-        if not token_spec_name:
-            token_spec_name = cluster.labels.get_label_value(DTP_SPEC_LABEL)
-        if not token_spec_name:
-            """
-            We want to stay backwards compatible.
-            Earlier version of DTP did not set a value for the label.
-            We fall back to a default token in that case.
-
-            Long-term, we want to remove this behavior.
-            """
-            token_spec_name = "hypershift-management-cluster-v1"
+        if not dt_tenant or not token_spec_name:
+            logging.warning(
+                f"[Missing DTP labels] {cluster.ocm_cluster.id=} {cluster.ocm_cluster.subscription.id=} {dt_tenant=} {token_spec_name=}"
+            )
+            return None
         return Cluster(
             id=cluster.ocm_cluster.id,
             external_id=cluster.ocm_cluster.external_id,
@@ -131,10 +119,11 @@ class OCMClient:
 
     def discover_clusters_by_labels(self, label_filter: Filter) -> list[Cluster]:
         return [
-            Cluster.from_cluster_details(cluster)
-            for cluster in discover_clusters_by_labels(
+            cluster
+            for ocm_cluster in discover_clusters_by_labels(
                 ocm_api=self._ocm_client, label_filter=label_filter
             )
+            if (cluster := Cluster.from_cluster_details(ocm_cluster))
         ]
 
     def create_service_log(

{qontract_reconcile-0.10.2.dev97 → qontract_reconcile-0.10.2.dev99}/reconcile/fleet_labeler/dependencies.py

@@ -61,10 +61,10 @@ def _ocm_clients(secret_reader: SecretReaderBase) -> dict[str, OCMClient]:
     for spec in get_fleet_label_specs():
         ocm_base_client = init_ocm_base_client(
             cfg=OCMClientConfig(
-                url=spec.ocm.environment.url,
-                access_token_client_id=spec.ocm.access_token_client_id,
-                access_token_url=spec.ocm.access_token_url,
-                access_token_client_secret=spec.ocm.access_token_client_secret,
+                url=spec.ocm_env.url,
+                access_token_client_id=spec.ocm_env.access_token_client_id,
+                access_token_url=spec.ocm_env.access_token_url,
+                access_token_client_secret=spec.ocm_env.access_token_client_secret,
             ),
             secret_reader=secret_reader,
         )

{qontract_reconcile-0.10.2.dev97 → qontract_reconcile-0.10.2.dev99}/reconcile/fleet_labeler/integration.py

@@ -257,7 +257,7 @@ class FleetLabelerIntegration(QontractReconcileIntegration[NoParams]):
                 f"[{spec.name}] Cluster ID {cluster_id} is matched multiple times by different label matchers:\n{label_matches}"
             )
         metrics.set_duplicate_cluster_matches_gauge(
-            ocm_name=spec.ocm.name,
+            ocm_name=spec.ocm_env.name,
             spec_name=spec.name,
             value=len(clusters_with_duplicate_matches),
         )
@@ -291,7 +291,7 @@ class FleetLabelerIntegration(QontractReconcileIntegration[NoParams]):
                     )
                 )
         metrics.set_label_rendering_error_gauge(
-            ocm_name=spec.ocm.name,
+            ocm_name=spec.ocm_env.name,
             spec_name=spec.name,
             value=label_rendering_errors_cnt,
         )

{qontract_reconcile-0.10.2.dev97 → qontract_reconcile-0.10.2.dev99}/reconcile/fleet_labeler/validate.py

@@ -3,22 +3,9 @@ from collections.abc import Mapping
 
 from reconcile.gql_definitions.fleet_labeler.fleet_labels import (
     FleetLabelsSpecV1,
-    OpenShiftClusterManagerV1,
 )
 
 
-class OCMAccessTokenClientIdMissing(Exception):
-    pass
-
-
-class OCMAccessTokenClientSecretMissing(Exception):
-    pass
-
-
-class OCMAccessTokenUrlMissing(Exception):
-    pass
-
-
 class MatchLabelsNotUniqueError(Exception):
     pass
 
@@ -28,7 +15,6 @@ def validate_label_specs(specs: Mapping[str, FleetLabelsSpecV1]) -> None:
     We cannot catch all potential errors through json schema definition.
     """
     for spec in specs.values():
-        _validate_ocm_token_spec(spec.ocm)
         _validate_match_labels(spec)
         _validate_unique_ocm_managed_label_combo(spec)
 
@@ -63,21 +49,3 @@ def _validate_match_labels(spec: FleetLabelsSpecV1) -> None:
             raise MatchLabelsNotUniqueError(
                 f"The 'matchSubscriptionLabels' combinations must be unique within a spec. Found duplicates in spec {spec.name} for matchers: {duplicates}"
             )
-
-
-def _validate_ocm_token_spec(ocm: OpenShiftClusterManagerV1) -> None:
-    """
-    OCM tokens are optional in the schema. Lets verify they exist.
-    """
-    if not ocm.access_token_client_id:
-        raise OCMAccessTokenClientIdMissing(
-            f"accessTokenClientId missing in ocm spec '{ocm.name}'"
-        )
-    if not ocm.access_token_client_secret:
-        raise OCMAccessTokenClientSecretMissing(
-            f"accessTokenClientSecret missing in ocm spec '{ocm.name}'"
-        )
-    if not ocm.access_token_url:
-        raise OCMAccessTokenUrlMissing(
-            f"accessTokenUrl missing in ocm spec '{ocm.name}'"
-        )

{qontract_reconcile-0.10.2.dev97 → qontract_reconcile-0.10.2.dev99}/reconcile/gql_definitions/fleet_labeler/fleet_labels.py

@@ -34,11 +34,9 @@ query FleetLabelSpecs {
         path
         managedSubscriptionLabelPrefix
         dryRunLabelSynchronization
-        ocm {
+        ocmEnv {
             name
-            environment {
-                url
-            }
+            url
             accessTokenClientId
             accessTokenClientSecret {
                 ... VaultSecret
@@ -75,15 +73,11 @@ class ConfiguredBaseModel(BaseModel):
 
 
 class OpenShiftClusterManagerEnvironmentV1(ConfiguredBaseModel):
-    url: str = Field(..., alias="url")
-
-
-class OpenShiftClusterManagerV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
-    environment: OpenShiftClusterManagerEnvironmentV1 = Field(..., alias="environment")
-    access_token_client_id: Optional[str] = Field(..., alias="accessTokenClientId")
-    access_token_client_secret: Optional[VaultSecret] = Field(..., alias="accessTokenClientSecret")
-    access_token_url: Optional[str] = Field(..., alias="accessTokenUrl")
+    url: str = Field(..., alias="url")
+    access_token_client_id: str = Field(..., alias="accessTokenClientId")
+    access_token_client_secret: VaultSecret = Field(..., alias="accessTokenClientSecret")
+    access_token_url: str = Field(..., alias="accessTokenUrl")
 
 
 class ResourceV1(ConfiguredBaseModel):
@@ -115,7 +109,7 @@ class FleetLabelsSpecV1(ConfiguredBaseModel):
     path: str = Field(..., alias="path")
     managed_subscription_label_prefix: str = Field(..., alias="managedSubscriptionLabelPrefix")
     dry_run_label_synchronization: Optional[bool] = Field(..., alias="dryRunLabelSynchronization")
-    ocm: OpenShiftClusterManagerV1 = Field(..., alias="ocm")
+    ocm_env: OpenShiftClusterManagerEnvironmentV1 = Field(..., alias="ocmEnv")
     label_defaults: list[FleetLabelDefaultV1] = Field(..., alias="labelDefaults")
     clusters: list[FleetClusterV1] = Field(..., alias="clusters")
 

{qontract_reconcile-0.10.2.dev97 → qontract_reconcile-0.10.2.dev99}/reconcile/gql_definitions/introspection.json

@@ -34382,7 +34382,7 @@
                             "deprecationReason": null
                         },
                         {
-                            "name": "ocm",
+                            "name": "ocmEnv",
                             "description": null,
                             "args": [],
                             "type": {
@@ -34390,7 +34390,7 @@
                                 "name": null,
                                 "ofType": {
                                     "kind": "OBJECT",
-                                    "name": "OpenShiftClusterManager_v1",
+                                    "name": "OpenShiftClusterManagerEnvironment_v1",
                                     "ofType": null
                                 }
                             },