qontract-reconcile 0.10.2.dev41__tar.gz → 0.10.2.dev43__tar.gz

{qontract_reconcile-0.10.2.dev41 → qontract_reconcile-0.10.2.dev43}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev41
+Version: 0.10.2.dev43
 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.dev41 → qontract_reconcile-0.10.2.dev43}/reconcile/gql_definitions/common/saas_files.py

@@ -302,6 +302,15 @@ query SaasFiles {
           }
           name
         }
+        images {
+          org {
+            name
+            instance {
+              url
+            }
+          }
+          name
+        }
         disable
         delete
       }
@@ -508,6 +517,20 @@ class SaasResourceTemplateTargetImageV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
 
 
+class SaasResourceTemplateTargetV2_SaasResourceTemplateTargetImageV1_QuayOrgV1_QuayInstanceV1(ConfiguredBaseModel):
+    url: str = Field(..., alias="url")
+
+
+class SaasResourceTemplateTargetV2_SaasResourceTemplateTargetImageV1_QuayOrgV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+    instance: SaasResourceTemplateTargetV2_SaasResourceTemplateTargetImageV1_QuayOrgV1_QuayInstanceV1 = Field(..., alias="instance")
+
+
+class SaasResourceTemplateTargetV2_SaasResourceTemplateTargetImageV1(ConfiguredBaseModel):
+    org: SaasResourceTemplateTargetV2_SaasResourceTemplateTargetImageV1_QuayOrgV1 = Field(..., alias="org")
+    name: str = Field(..., alias="name")
+
+
 class SaasResourceTemplateTargetV2(ConfiguredBaseModel):
     path: Optional[str] = Field(..., alias="path")
     name: Optional[str] = Field(..., alias="name")
@@ -520,6 +543,7 @@ class SaasResourceTemplateTargetV2(ConfiguredBaseModel):
     secret_parameters: Optional[list[SaasResourceTemplateTargetV2_SaasSecretParametersV1]] = Field(..., alias="secretParameters")
     upstream: Optional[SaasResourceTemplateTargetUpstreamV1] = Field(..., alias="upstream")
     image: Optional[SaasResourceTemplateTargetImageV1] = Field(..., alias="image")
+    images: Optional[list[SaasResourceTemplateTargetV2_SaasResourceTemplateTargetImageV1]] = Field(..., alias="images")
     disable: Optional[bool] = Field(..., alias="disable")
     delete: Optional[bool] = Field(..., alias="delete")
 

{qontract_reconcile-0.10.2.dev41 → qontract_reconcile-0.10.2.dev43}/reconcile/gql_definitions/introspection.json

@@ -3755,6 +3755,57 @@
                             },
                             "isDeprecated": false,
                             "deprecationReason": null
+                        },
+                        {
+                            "name": "managed_dynatrace_token_provider_labels_v1",
+                            "description": null,
+                            "args": [
+                                {
+                                    "name": "name",
+                                    "description": null,
+                                    "type": {
+                                        "kind": "SCALAR",
+                                        "name": "String",
+                                        "ofType": null
+                                    },
+                                    "defaultValue": null
+                                },
+                                {
+                                    "name": "path",
+                                    "description": null,
+                                    "type": {
+                                        "kind": "SCALAR",
+                                        "name": "String",
+                                        "ofType": null
+                                    },
+                                    "defaultValue": null
+                                },
+                                {
+                                    "name": "filter",
+                                    "description": null,
+                                    "type": {
+                                        "kind": "SCALAR",
+                                        "name": "JSON",
+                                        "ofType": null
+                                    },
+                                    "defaultValue": null
+                                }
+                            ],
+                            "type": {
+                                "kind": "LIST",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "NON_NULL",
+                                    "name": null,
+                                    "ofType": {
+                                        "kind": "OBJECT",
+                                        "name": "ManagedDynatraceTokenProviderLabels_v1",
+                                        "ofType": null
+                                    }
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
                         }
                     ],
                     "inputFields": null,
@@ -5568,6 +5619,11 @@
                             "name": "AppChangelog_v1",
                             "ofType": null
                         },
+                        {
+                            "kind": "OBJECT",
+                            "name": "ManagedDynatraceTokenProviderLabels_v1",
+                            "ofType": null
+                        },
                         {
                             "kind": "OBJECT",
                             "name": "DatabaseAccess_v1",
@@ -22295,6 +22351,26 @@
                             "isDeprecated": false,
                             "deprecationReason": null
                         },
+                        {
+                            "name": "images",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "LIST",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "NON_NULL",
+                                    "name": null,
+                                    "ofType": {
+                                        "kind": "OBJECT",
+                                        "name": "SaasResourceTemplateTargetImage_v1",
+                                        "ofType": null
+                                    }
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
                         {
                             "name": "image",
                             "description": null,
@@ -34204,6 +34280,249 @@
                     "enumValues": null,
                     "possibleTypes": null
                 },
+                {
+                    "kind": "OBJECT",
+                    "name": "ManagedDynatraceTokenProviderLabels_v1",
+                    "description": null,
+                    "fields": [
+                        {
+                            "name": "schema",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "path",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "name",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "description",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "String",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "ocm",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "OBJECT",
+                                    "name": "OpenShiftClusterManager_v1",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "labelDefaults",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "LIST",
+                                    "name": null,
+                                    "ofType": {
+                                        "kind": "NON_NULL",
+                                        "name": null,
+                                        "ofType": {
+                                            "kind": "OBJECT",
+                                            "name": "DynatraceTokenProviderLabelDefault_v1",
+                                            "ofType": null
+                                        }
+                                    }
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "clusters",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "LIST",
+                                    "name": null,
+                                    "ofType": {
+                                        "kind": "NON_NULL",
+                                        "name": null,
+                                        "ofType": {
+                                            "kind": "OBJECT",
+                                            "name": "OpenShiftClusterManagerUpgradePolicyCluster_v1",
+                                            "ofType": null
+                                        }
+                                    }
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        }
+                    ],
+                    "inputFields": null,
+                    "interfaces": [
+                        {
+                            "kind": "INTERFACE",
+                            "name": "DatafileObject_v1",
+                            "ofType": null
+                        }
+                    ],
+                    "enumValues": null,
+                    "possibleTypes": null
+                },
+                {
+                    "kind": "OBJECT",
+                    "name": "DynatraceTokenProviderLabelDefault_v1",
+                    "description": null,
+                    "fields": [
+                        {
+                            "name": "name",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "matchLabels",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "JSON",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "labelTemplate",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "OBJECT",
+                                "name": "DynatraceTokenProviderLabelTemplate_v1",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        }
+                    ],
+                    "inputFields": null,
+                    "interfaces": [],
+                    "enumValues": null,
+                    "possibleTypes": null
+                },
+                {
+                    "kind": "OBJECT",
+                    "name": "DynatraceTokenProviderLabelTemplate_v1",
+                    "description": null,
+                    "fields": [
+                        {
+                            "name": "path",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "OBJECT",
+                                "name": "Resource_v1",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "type",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "String",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "variables",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "JSON",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        }
+                    ],
+                    "inputFields": null,
+                    "interfaces": [],
+                    "enumValues": null,
+                    "possibleTypes": null
+                },
                 {
                     "kind": "OBJECT",
                     "name": "__Schema",
@@ -38529,6 +38848,81 @@
                     "enumValues": null,
                     "possibleTypes": null
                 },
+                {
+                    "kind": "OBJECT",
+                    "name": "DynatraceTokenProviderCluster_v1",
+                    "description": null,
+                    "fields": [
+                        {
+                            "name": "name",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "serverUrl",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "serverId",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "labels",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "JSON",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        }
+                    ],
+                    "inputFields": null,
+                    "interfaces": [],
+                    "enumValues": null,
+                    "possibleTypes": null
+                },
                 {
                     "kind": "OBJECT",
                     "name": "NamespaceCNAsset_v1",

{qontract_reconcile-0.10.2.dev41 → qontract_reconcile-0.10.2.dev43}/reconcile/typed_queries/saas_files.py

@@ -26,6 +26,7 @@ from reconcile.gql_definitions.common.saas_files import (
     SaasResourceTemplateTargetPromotionV1,
     SaasResourceTemplateTargetUpstreamV1,
     SaasResourceTemplateTargetV2,
+    SaasResourceTemplateTargetV2_SaasResourceTemplateTargetImageV1,
     SaasResourceTemplateTargetV2_SaasSecretParametersV1,
     SaasResourceTemplateV2_SaasSecretParametersV1,
     SaasSecretParametersV1,
@@ -65,6 +66,9 @@ class SaasResourceTemplateTarget(ConfiguredBaseModel):
     ) = Field(..., alias="secretParameters")
     upstream: SaasResourceTemplateTargetUpstreamV1 | None = Field(..., alias="upstream")
     image: SaasResourceTemplateTargetImageV1 | None = Field(..., alias="image")
+    images: (
+        list[SaasResourceTemplateTargetV2_SaasResourceTemplateTargetImageV1] | None
+    ) = Field(..., alias="images")
     disable: bool | None = Field(..., alias="disable")
     delete: bool | None = Field(..., alias="delete")
 

{qontract_reconcile-0.10.2.dev41 → qontract_reconcile-0.10.2.dev43}/reconcile/utils/saasherder/interfaces.py

@@ -326,6 +326,9 @@ class SaasResourceTemplateTarget(HasParameters, HasSecretParameters, Protocol):
     @property
     def image(self) -> SaasResourceTemplateTargetImage | None: ...
 
+    @property
+    def images(self) -> Sequence[SaasResourceTemplateTargetImage] | None: ...
+
     def uid(
         self, parent_saas_file_name: str, parent_resource_template_name: str
     ) -> str: ...

{qontract_reconcile-0.10.2.dev41 → qontract_reconcile-0.10.2.dev43}/reconcile/utils/saasherder/models.py

@@ -113,14 +113,15 @@ class TriggerSpecUpstreamJob(TriggerSpecBase):
 
 @dataclass
 class TriggerSpecContainerImage(TriggerSpecBase):
-    image: str
+    images: Sequence[str]
     reason: str | None = None
 
     @property
     def state_key(self) -> str:
+        image_key = "/".join(sorted(self.images))
         key = (
             f"{self.saas_file_name}/{self.resource_template_name}/{self.cluster_name}/"
-            f"{self.namespace_name}/{self.env_name}/{self.image}"
+            f"{self.namespace_name}/{self.env_name}/{image_key}"
         )
         return key
 

{qontract_reconcile-0.10.2.dev41 → qontract_reconcile-0.10.2.dev43}/reconcile/utils/saasherder/saasherder.py

@@ -102,6 +102,10 @@ Resource = dict[str, Any]
 Resources = list[Resource]
 
 
+class TriggerSpecContainerImageError(Exception):
+    pass
+
+
 class SaasHerder:  # pylint: disable=too-many-public-methods
     """Wrapper around SaaS deployment actions."""
 
@@ -1616,25 +1620,36 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
         for rt in saas_file.resource_templates:
             for target in rt.targets:
                 try:
-                    if not target.image:
+                    if not (target.image or target.images):
                         continue
+                    if target.image and target.images:
+                        raise TriggerSpecContainerImageError(
+                            '"image" and "images" are mutually exclusive. Do not set both in the same saas target.'
+                        )
                     commit_sha = self._get_commit_sha(
                         url=rt.url,
                         ref=target.ref,
                         github=github,
                     )
-                    desired_image_tag = commit_sha[: rt.hash_length or self.hash_length]
-                    # don't trigger if image doesn't exist
-                    image_registry = f"{target.image.org.instance.url}/{target.image.org.name}/{target.image.name}"
-                    image_uri = f"{image_registry}:{desired_image_tag}"
                     image_auth = self._initiate_image_auth(saas_file)
+                    desired_image_tag = commit_sha[: rt.hash_length or self.hash_length]
+
+                    all_images = [target.image] if target.image else target.images or []
+                    image_registries = [
+                        f"{image.org.instance.url}/{image.org.name}/{image.name}"
+                        for image in all_images
+                    ]
                     error_prefix = f"[{saas_file.name}/{rt.name}] {target.ref}:"
-                    image = self._get_image(
-                        image_uri, saas_file.image_patterns, image_auth, error_prefix
-                    )
-                    if not image:
+                    if not all(
+                        self._get_image(
+                            image=f"{image}:{desired_image_tag}",
+                            image_patterns=saas_file.image_patterns,
+                            image_auth=image_auth,
+                            error_prefix=error_prefix,
+                        )
+                        for image in image_registries
+                    ):
                         continue
-
                     trigger_spec = TriggerSpecContainerImage(
                         saas_file_name=saas_file.name,
                         env_name=target.namespace.environment.name,
@@ -1643,12 +1658,16 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                         resource_template_name=rt.name,
                         cluster_name=target.namespace.cluster.name,
                         namespace_name=target.namespace.name,
-                        image=image_registry,
+                        images=image_registries,
                         state_content=desired_image_tag,
                     )
                     if self.include_trigger_trace:
+                        image_uris = ", ".join(
+                            f"{image}:{desired_image_tag}"
+                            for image in sorted(image_registries)
+                        )
                         trigger_spec.reason = (
-                            f"{rt.url}/commit/{commit_sha} build {image_uri}"
+                            f"{rt.url}/commit/{commit_sha} build {image_uris}"
                         )
                     if not self.state:
                         raise Exception("state is not initialized")