Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improved Armada Airflow Operator #3672

Merged
merged 18 commits into from
Jun 21, 2024
Merged

Improved Armada Airflow Operator #3672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f8b1ae1
Syncing out Armada Airflow Operator (#164)
mustafai-gr May 31, 2024
ff89df7
changes
mustafai-gr Jun 11, 2024
e3e3483
Fixing tests
mustafai-gr Jun 12, 2024
1726279
Formatting
mustafai-gr Jun 12, 2024
a72985a
Making integration tests work
mustafai-gr Jun 14, 2024
5082a48
Merge branch 'master' into sendToGitHub/new-airflow-operator
MustafaI Jun 14, 2024
632ae4a
Formatting files
mustafai-gr Jun 14, 2024
7bfb3ae
Formatting, ensuring Armada trigger can cancel
mustafai-gr Jun 14, 2024
c644052
Fixing docs and adding back examples
mustafai-gr Jun 14, 2024
4567160
Fixing docs
mustafai-gr Jun 14, 2024
81fa6f3
Merge branch 'master' of github.com:armadaproject/armada into sendToG…
mustafai-gr Jun 17, 2024
b53972c
Addressing comments, supporting more python versions
mustafai-gr Jun 18, 2024
e03867c
Updating docs
mustafai-gr Jun 18, 2024
c34f712
Merge branch 'master' into sendToGitHub/new-airflow-operator
MustafaI Jun 19, 2024
c89fcc0
Merge branch 'master' into sendToGitHub/new-airflow-operator
MustafaI Jun 20, 2024
20dfe34
Removing airflow operator build script from github workflow check
mustafai-gr Jun 20, 2024
532e131
Merge branch 'master' into sendToGitHub/new-airflow-operator
MustafaI Jun 21, 2024
0d6638d
Merge branch 'master' into sendToGitHub/new-airflow-operator
MustafaI Jun 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/airflow-operator.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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