Skip to content

Commit

Permalink
Improved Armada Airflow Operator (#3672)
Browse files Browse the repository at this point in the history
* Syncing out Armada Airflow Operator (#164)

* changes

* Fixing tests

* Formatting

* Making integration tests work

* Formatting files

* Formatting, ensuring Armada trigger can cancel

* Fixing docs and adding back examples

* Fixing docs

* Addressing comments, supporting more python versions

* Updating docs

* Removing airflow operator build script from github workflow check

---------

Co-authored-by: Mustafa Ilyas <Mustafa.Ilyas@gresearch.co.uk>
  • Loading branch information
MustafaI and mustafai-gr committed Jun 21, 2024
1 parent 5daee4a commit ef2c3ec
Show file tree
Hide file tree
Showing 46 changed files with 2,575 additions and 3,093 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/airflow-operator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ on:
- 'internal/jobservice/*'
- 'pkg/api/*.proto'
- 'pkg/api/jobservice/*.proto'
- 'scripts/build-airflow-operator.sh'
- 'scripts/build-python-client.sh'
- 'third_party/airflow/**'
- './magefiles/tests.go'
Expand All @@ -37,7 +36,6 @@ on:
- 'internal/jobservice/*'
- 'pkg/api/*.proto'
- 'pkg/api/jobservice/*.proto'
- 'scripts/build-airflow-operator.sh'
- 'scripts/build-python-client.sh'
- 'third_party/airflow/**'

Expand Down
2 changes: 1 addition & 1 deletion build/airflow-operator/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG PLATFORM=x86_64
ARG BASE_IMAGE=python:3.8.18-bookworm
ARG BASE_IMAGE=python:3.10.14-bookworm
FROM --platform=$PLATFORM ${BASE_IMAGE}

RUN mkdir /proto
Expand Down
2 changes: 1 addition & 1 deletion developer/env/docker/server.env
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ARMADA_QUEUECACHEREFRESHPERIOD="1s"
ARMADA_CORSALLOWEDORIGINS="http://localhost:3000,http://localhost:10000,http://example.com:10000"

ARMADA_QUERYAPI_POSTGRES_CONNECTION_HOST=postgres
1 change: 1 addition & 0 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ services:
depends_on:
- lookoutv2-migration
- eventingester
- lookoutingesterv2
working_dir: /app
env_file:
- developer/env/docker/server.env
Expand Down
Loading

0 comments on commit ef2c3ec

Please sign in to comment.