qontract-reconcile 0.10.2.dev258__tar.gz → 0.10.2.dev259__tar.gz

{qontract_reconcile-0.10.2.dev258 → qontract_reconcile-0.10.2.dev259}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev258
+Version: 0.10.2.dev259
 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.dev258 → qontract_reconcile-0.10.2.dev259}/reconcile/database_access_manager.py

@@ -13,6 +13,7 @@ from typing import (
 )
 
 from pydantic import BaseModel
+from sretoolbox.container.image import Image
 
 from reconcile import openshift_base, queries
 from reconcile import openshift_resources_base as orb
@@ -52,7 +53,6 @@ QONTRACT_INTEGRATION_VERSION = make_semver(0, 1, 0)
 SUPPORTED_ENGINES = ["postgres"]
 
 JOB_DEADLINE_IN_SECONDS = 60
-JOB_PSQL_ENGINE_VERSION = "15.4-alpine"
 
 
 def get_database_access_namespaces(
@@ -227,9 +227,8 @@ def get_db_engine(resource: NamespaceTerraformResourceRDSV1) -> str:
 
 class JobData(BaseModel):
     engine: str
-    engine_version: str
     name_suffix: str
-    image_repository: str
+    image: str
     service_account_name: str
     rds_admin_secret_name: str
     script_secret_name: str
@@ -239,8 +238,11 @@ class JobData(BaseModel):
 def get_job_spec(job_data: JobData) -> OpenshiftResource:
     job_name = f"dbam-{job_data.name_suffix}"
 
+    image_tag = Image(job_data.image).tag
+    image_pull_policy = "Always" if image_tag == "latest" else "IfNotPresent"
+
     if job_data.engine == "postgres":
-        command = "/usr/local/bin/psql"
+        command = "/usr/bin/psql"
 
     job = {
         "apiVersion": "batch/v1",
@@ -269,7 +271,8 @@ def get_job_spec(job_data: JobData) -> OpenshiftResource:
                     "containers": [
                         {
                             "name": job_name,
-                            "image": f"{job_data.image_repository}/{job_data.engine}:{job_data.engine_version}",
+                            "image": f"{job_data.image}",
+                            "imagePullPolicy": image_pull_policy,
                             "command": [
                                 command,
                             ],
@@ -415,7 +418,7 @@ class JobStatus(BaseModel):
 def _populate_resources(
     db_access: DatabaseAccessV1,
     engine: str,
-    image_repository: str,
+    job_image: str,
     pull_secret: dict[Any, Any],
     admin_secret_name: str,
     resource_prefix: str,
@@ -479,9 +482,8 @@ def _populate_resources(
             resource=get_job_spec(
                 JobData(
                     engine=engine,
-                    engine_version=JOB_PSQL_ENGINE_VERSION,
                     name_suffix=db_access.name,
-                    image_repository=image_repository,
+                    image=job_image,
                     service_account_name=resource_prefix,
                     rds_admin_secret_name=admin_secret_name,
                     script_secret_name=script_secret_name,
@@ -620,10 +622,15 @@ def _process_db_access(
         if not sql_query_settings:
             raise KeyError("sqlQuery settings are required")
 
+        job_image = (
+            sql_query_settings.get("jobImage")
+            or "quay.io/app-sre/debug-container:latest"
+        )
+
         managed_resources = _populate_resources(
             db_access,
             engine,
-            sql_query_settings["imageRepository"],
+            job_image,
             sql_query_settings["pullSecret"],
             admin_secret_name,
             resource_prefix,

{qontract_reconcile-0.10.2.dev258 → qontract_reconcile-0.10.2.dev259}/reconcile/gql_definitions/introspection.json

@@ -25826,6 +25826,18 @@
                             "isDeprecated": false,
                             "deprecationReason": null
                         },
+                        {
+                            "name": "jobImage",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "String",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
                         {
                             "name": "pullSecret",
                             "description": null,

{qontract_reconcile-0.10.2.dev258 → qontract_reconcile-0.10.2.dev259}/reconcile/queries.py

@@ -87,7 +87,7 @@ APP_INTERFACE_SETTINGS_QUERY = """
       }
     }
     sqlQuery {
-      imageRepository
+      jobImage
       pullSecret {
         path
         version

{qontract_reconcile-0.10.2.dev258 → qontract_reconcile-0.10.2.dev259}/reconcile/sql_query.py

@@ -11,6 +11,7 @@ from textwrap import indent
 from typing import Any
 
 import jinja2
+from sretoolbox.container.image import Image
 
 from reconcile import (
     openshift_base,
@@ -81,35 +82,36 @@ spec:
     metadata:
       name: {{ JOB_NAME }}
     spec:
-      {% if PULL_SECRET is not none %}
+      {%- if PULL_SECRET is not none %}
       imagePullSecrets:
       - name: {{ PULL_SECRET }}
-      {% endif %}
+      {%- endif %}
       restartPolicy: Never
       serviceAccountName: {{ SVC_NAME }}
       containers:
       - name: {{ JOB_NAME }}
-        image: {{ IMAGE_REPOSITORY }}/{{ ENGINE }}:{{ENGINE_VERSION}}
+        image: {{ JOB_IMAGE }}
+        imagePullPolicy: {{ JOB_IMAGE_PULL_POLICY }}
         command:
           - /bin/bash
         args:
           - '-c'
           - '{{ COMMAND }}'
         env:
-          {% for key, value in DB_CONN.items() %}
-          {% if value is none %}
+          {%- for key, value in DB_CONN.items() %}
+          {%- if value is none %}
           # When value is not provided, we get it from the secret
           - name: {{ key }}
             valueFrom:
               secretKeyRef:
                 name: {{ SECRET_NAME }}
                 key: {{ key }}
-          {% else %}
+          {%- else %}
           # When value is provided, we get just use it
           - name: {{ key }}
             value: {{ value }}
-          {% endif %}
-          {% endfor %}
+          {%- endif %}
+          {%- endfor %}
         resources:
           requests:
             memory: "{{ REQUESTS_MEM }}"
@@ -125,10 +127,10 @@ spec:
         - name: configs
           projected:
             sources:
-            {% for cm in CONFIG_MAPS %}
+            {%- for cm in CONFIG_MAPS %}
             - configMap:
                 name: {{ cm }}
-          {% endfor %}
+            {%- endfor %}
 """
 
 
@@ -187,7 +189,6 @@ def get_tf_resource_info(
             "cluster": spec.cluster_name,
             "output_resource_name": spec.output_resource_name,
             "engine": values.get("engine", "postgres"),
-            "engine_version": values.get("engine_version", "latest"),
         }
     return None
 
@@ -412,7 +413,7 @@ def encrypted_closing_message(recipient: str) -> list[str]:
 
 def process_template(
     query: dict[str, Any],
-    image_repository: str,
+    job_image: str,
     use_pull_secret: bool,
     config_map_names: list[str],
     service_account_name: str,
@@ -422,7 +423,7 @@ def process_template(
 
     :param query: the query dictionary containing the parameters
                   to be used in the Template
-    :param image_repository: docker image repo url
+    :param job_image: docker image repo url
     :param use_pull_secret: add imagePullSecrets to Job
     :param config_map_names: ConfigMap names to mount in Job
 
@@ -451,16 +452,18 @@ def process_template(
     command += engine_cmd_map[engine](sqlqueries_file="/tmp/queries")
     command += make_output_cmd(output=output, recipient=query.get("recipient", ""))
 
+    job_image_tag = Image(job_image).tag
+    job_image_pull_policy = "Always" if job_image_tag == "latest" else "IfNotPresent"
+
     template_to_render = JOB_TEMPLATE
     render_kwargs = {
         "JOB_NAME": query["name"],
         "CONFIG_MAPS_MOUNT_PATH": CONFIG_MAPS_MOUNT_PATH,
         "QUERY_NAME": query["name"],
         "QONTRACT_INTEGRATION": QONTRACT_INTEGRATION,
-        "IMAGE_REPOSITORY": image_repository,
+        "JOB_IMAGE": job_image,
+        "JOB_IMAGE_PULL_POLICY": job_image_pull_policy,
         "SECRET_NAME": query["output_resource_name"],
-        "ENGINE": engine,
-        "ENGINE_VERSION": query["engine_version"],
         "DB_CONN": query["db_conn"],
         "CONFIG_MAPS": config_map_names,
         "COMMAND": command,
@@ -588,7 +591,7 @@ def _build_common_resource_labels(query: dict[str, Any]) -> dict[str, str]:
 
 def _build_openshift_resources(
     query: dict[str, Any],
-    image_repository: str,
+    job_image: str,
     pull_secret: dict[str, Any] | None,
     secret_reader: SecretReaderBase,
 ) -> list[OpenshiftResource]:
@@ -649,7 +652,7 @@ def _build_openshift_resources(
     # Job (sql executer)
     job_yaml = process_template(
         query,
-        image_repository=image_repository,
+        job_image=job_image,
         use_pull_secret=bool(pull_secret),
         config_map_names=[cm["metadata"]["name"] for cm in config_map_resources],
         service_account_name=svc["metadata"]["name"],
@@ -702,14 +705,14 @@ def _initialize_resource_types(
 
 def _reconstruct_for_metrics(
     query: dict[str, Any],
-    image_repository: str,
+    job_image: str,
     pull_secret: dict[str, Any] | None,
     ri: ResourceInventory,
     secret_reader: SecretReaderBase,
 ) -> None:
     openshift_resources = _build_openshift_resources(
         query,
-        image_repository,
+        job_image,
         pull_secret,
         secret_reader,
     )
@@ -767,7 +770,7 @@ def _process_existing_query(
     enable_deletion: bool,
     settings: dict[str, Any],
     state: State,
-    image_repository: str,
+    job_image: str,
     pull_secret: dict[str, Any],
     ri: ResourceInventory,
     secret_reader: SecretReaderBase,
@@ -776,7 +779,7 @@ def _process_existing_query(
         case QueryStatus.ACTIVE:
             _reconstruct_for_metrics(
                 query,
-                image_repository,
+                job_image,
                 pull_secret,
                 ri,
                 secret_reader,
@@ -803,13 +806,13 @@ def _process_new_query(
     dry_run: bool,
     settings: dict[str, Any],
     state: State,
-    image_repository: str,
+    job_image: str,
     pull_secret: dict[str, Any],
     ri: ResourceInventory,
     secret_reader: SecretReaderBase,
 ) -> None:
     openshift_resources = _build_openshift_resources(
-        query, image_repository, pull_secret, secret_reader
+        query, job_image, pull_secret, secret_reader
     )
 
     cluster = query["cluster"]
@@ -855,12 +858,12 @@ def run(
         mail_address=smtp_settings.mail_address,
         timeout=smtp_settings.timeout or DEFAULT_SMTP_TIMEOUT,
     )
-    image_repository = "quay.io/app-sre"
+    job_image = "quay.io/app-sre/debug-container:latest"
 
     sql_query_settings = settings.get("sqlQuery")
     pull_secret: dict[str, Any] = {}
     if sql_query_settings:
-        image_repository = sql_query_settings["imageRepository"]
+        job_image = sql_query_settings.get("jobImage") or job_image
         pull_secret = sql_query_settings["pullSecret"]
 
     queries_list = collect_queries(secret_reader=secret_reader, smtp_client=smtp_client)
@@ -874,7 +877,7 @@ def run(
                 enable_deletion,
                 settings,
                 state,
-                image_repository,
+                job_image,
                 pull_secret,
                 ri,
                 secret_reader,
@@ -885,7 +888,7 @@ def run(
                 dry_run,
                 settings,
                 state,
-                image_repository,
+                job_image,
                 pull_secret,
                 ri,
                 secret_reader,