astronomer / astro-cli / 39356298300

61%

main: 45%

push

github

Deploy Airflow 2 projects to Astro from a generated build (#2380)

* Deploy Airflow 2 projects to Astro from a generated build

astro deploy and astro package astro refused an Airflow 2 pin ("only
Airflow 3 is supported in this release"), while Docker mode and APC
deploys already built it. The refusal was only the pure resolver's: an
Airflow 2 image is tagged by runtime version, so naming one needs the
runtime catalog.

RuntimeImageForPython now builds Airflow 2 as LocalRuntimeImageWith
does, through one shared airflow2Image: the 2.7 floor, then
quay.io/astronomer/astro-runtime:<[tool.astro] runtime>, else the
catalog's newest runtime for the pin. With neither a runtime nor a
readable catalog it refuses, naming [tool.astro] runtime. Deploy and
package pick this up with no call-site change, and every later step
(the runtime checks, the Airflow 2 DAG upload, the label read) already
handled Airflow 2.

astro init now records the build a pin-only 1.x Dockerfile is FROM
(astro-runtime:12.6.0) as [tool.astro] runtime. Its tag names no
Airflow minor, so the pin is "2", and without the build the next
deploy would move the project to the newest Airflow 2. With the build
recorded the Dockerfile has nothing left to say and is retired, as an
Airflow 3 one is. A floating tag or a flavor keeps today's note.

Addresses #2379.

Co-Authored-By: Claude <noreply@anthropic.com>

* Hold Airflow 2 builds to the 2.7 floor, and fix review findings

- airflow2Image refuses a [tool.astro] runtime below 9 (Airflow 2.7):
  beside a bare "2" pin the pin floor said nothing about it. A 1.x
  conversion no longer records such a build; it keeps today's note.
- Deploy and `astro package astro` read the catalog through a new
  runtimecatalog.ImageCatalog at the default timeout: an Airflow 2 base
  with no runtime named has no fallback, unlike the Python choice the
  3s Catalog was sized for.
- The downgrade fix for a generated Airflow 2 base names the pin when
  the pin names a minor, ... (continued)

17 of 37 new or added lines in 5 files covered. (45.95%)

41058 of 68028 relevant lines covered (60.35%)

368.34 hits per line