qontract-reconcile 0.10.2.dev77__tar.gz → 0.10.2.dev79__tar.gz

{qontract_reconcile-0.10.2.dev77 → qontract_reconcile-0.10.2.dev79}/PKG-INFO

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

@@ -187,4 +187,4 @@ class FleetLabelerIntegration(QontractReconcileIntegration[NoParams]):
         desired_content = self._render_yaml_file(
             current_content, cluster_ids_to_delete, sorted_clusters_to_add
         )
-        vcs.open_merge_request(path=spec.path, content=desired_content)
+        vcs.open_merge_request(path=f"data{spec.path}", content=desired_content)

{qontract_reconcile-0.10.2.dev77 → qontract_reconcile-0.10.2.dev79}/reconcile/fleet_labeler/merge_request.py

@@ -24,7 +24,7 @@ class FleetLabelerUpdates(MergeRequestBase):
     ):
         self._path = path
         self._content = content
-        self.name = f"[Fleet Labeler] Update cluster inventory for {path}"
+        self._title = f"[Fleet Labeler] Update cluster inventory for {path}"
 
         super().__init__()
 
@@ -32,11 +32,11 @@ class FleetLabelerUpdates(MergeRequestBase):
 
     @property
     def title(self) -> str:
-        return self.name
+        return self._title
 
     @property
     def description(self) -> str:
-        return self.name
+        return self._title
 
     def process(self, gitlab_cli: GitLabApi) -> None:
         msg = "update cluster inventory"

{qontract_reconcile-0.10.2.dev77 → qontract_reconcile-0.10.2.dev79}/reconcile/gql_definitions/common/saas_files.py

@@ -293,15 +293,6 @@ query SaasFiles {
           }
           name
         }
-        image {
-          org {
-            name
-            instance {
-              url
-            }
-          }
-          name
-        }
         images {
           org {
             name
@@ -517,20 +508,6 @@ 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")
@@ -542,8 +519,7 @@ class SaasResourceTemplateTargetV2(ConfiguredBaseModel):
     parameters: Optional[Json] = Field(..., alias="parameters")
     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")
+    images: Optional[list[SaasResourceTemplateTargetImageV1]] = Field(..., alias="images")
     disable: Optional[bool] = Field(..., alias="disable")
     delete: Optional[bool] = Field(..., alias="delete")
 

{qontract_reconcile-0.10.2.dev77 → qontract_reconcile-0.10.2.dev79}/reconcile/gql_definitions/introspection.json

@@ -22391,18 +22391,6 @@
                             "isDeprecated": false,
                             "deprecationReason": null
                         },
-                        {
-                            "name": "image",
-                            "description": null,
-                            "args": [],
-                            "type": {
-                                "kind": "OBJECT",
-                                "name": "SaasResourceTemplateTargetImage_v1",
-                                "ofType": null
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
-                        },
                         {
                             "name": "disable",
                             "description": null,

{qontract_reconcile-0.10.2.dev77 → qontract_reconcile-0.10.2.dev79}/reconcile/typed_queries/saas_files.py

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

{qontract_reconcile-0.10.2.dev77 → qontract_reconcile-0.10.2.dev79}/reconcile/utils/saasherder/interfaces.py

@@ -323,9 +323,6 @@ class SaasResourceTemplateTarget(HasParameters, HasSecretParameters, Protocol):
     @property
     def upstream(self) -> SaasResourceTemplateTargetUpstream | None: ...
 
-    @property
-    def image(self) -> SaasResourceTemplateTargetImage | None: ...
-
     @property
     def images(self) -> Sequence[SaasResourceTemplateTargetImage] | None: ...
 

{qontract_reconcile-0.10.2.dev77 → qontract_reconcile-0.10.2.dev79}/reconcile/utils/saasherder/saasherder.py

@@ -560,7 +560,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
         resource_template_name: str,
         target: SaasResourceTemplateTarget,
     ) -> None:
-        if target.image and target.upstream:
+        if target.images and target.upstream:
             logging.error(
                 f"[{saas_file_name}/{resource_template_name}] image used with upstream"
             )
@@ -572,7 +572,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
         resource_template_name: str,
         target: SaasResourceTemplateTarget,
     ) -> None:
-        if target.image and is_commit_sha(target.ref):
+        if target.images and is_commit_sha(target.ref):
             logging.error(
                 f"[{saas_file_name}/{resource_template_name}] "
                 f'Attempt to use the "image" directive with commit sha: {target.ref}. '
@@ -1440,7 +1440,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
             for target in rt.targets:
                 try:
                     # don't trigger if there is a linked upstream job or container image
-                    if target.upstream or target.image:
+                    if target.upstream or target.images:
                         continue
 
                     desired_commit_sha = self._get_commit_sha(
@@ -1620,12 +1620,8 @@ 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 or target.images):
+                    if not 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,
@@ -1634,7 +1630,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                     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 []
+                    all_images = target.images or []
                     image_registries = [
                         f"{image.org.instance.url}/{image.org.name}/{image.name}"
                         for image in all_images