Skip to content

PGRM-436 | Fix composer-2.10.1-airflow-2.9.3 support #389

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

Merged
merged 3 commits into from
Mar 11, 2025
Merged

PGRM-436 | Fix composer-2.10.1-airflow-2.9.3 support #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
641570a
PGRM-436 | Extend DAG failed import fallbacks
allegro-lukasz-dragan Mar 10, 2025
a02219d
PGRM-436 | Update Changelog and version
allegro-lukasz-dragan Mar 10, 2025
adb5b4b
Merge branch 'PGRM-436--add-new-kubernetes-pod-lib-support' into PGRM…
allegro-lukasz-dragan Mar 11, 2025
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# BigFlow changelog

## Version 1.11.1

### Changed

* Made DAG failed import fallbacks more robust.

## Version 1.11.0

### Added
Expand Down
2 changes: 1 addition & 1 deletion bigflow/_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '1.11.0'
__version__ = '1.11.1'
18 changes: 12 additions & 6 deletions bigflow/dagbuilder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,23 +57,29 @@ def generate_dag_file(
import datetime
from airflow import DAG
from airflow import version

try:
from airflow.kubernetes.secret import Secret
from airflow.providers.cncf.kubernetes.operators.kubernetes_pod import KubernetesPodOperator
except ImportError:
# Fallback to older Airflow
from airflow.contrib.kubernetes.secret import Secret

try:
from airflow.providers.cncf.kubernetes.operators.pod import KubernetesPodOperator
except ImportError:
# Fallback to older Airflow
try:
from airflow.contrib.operators.kubernetes_pod_operator import KubernetesPodOperator
# Fallback to older Airflow
from airflow.providers.cncf.kubernetes.operators.kubernetes_pod import KubernetesPodOperator
except ImportError:
from airflow.providers.cncf.kubernetes.operators.pod import KubernetesPodOperator

# Fallback to even older Airflow
from airflow.contrib.operators.kubernetes_pod_operator import KubernetesPodOperator

# To deploy BigFlow project, following requirements options are needed: (airflow 1.x + composer 1.x) or (airflow 2.x + composer >= 2.1.0)
IS_COMPOSER_2_X = version.version >= '2.0.0'
IS_AIRFLOW_2_3_X = version.version >= '2.3.0'
namespace = 'composer-user-workloads' if IS_COMPOSER_2_X else 'default'

default_args = dict(
owner='airflow',
depends_on_past={workflow.depends_on_past!r},
Expand Down
12 changes: 9 additions & 3 deletions test/dagbuilder/my_daily_workflow__dag.py.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,20 @@ from airflow import version

try:
from airflow.kubernetes.secret import Secret
from airflow.providers.cncf.kubernetes.operators.kubernetes_pod import KubernetesPodOperator
except ImportError:
# Fallback to older Airflow
from airflow.contrib.kubernetes.secret import Secret

try:
from airflow.providers.cncf.kubernetes.operators.pod import KubernetesPodOperator
except ImportError:
# Fallback to older Airflow
try:
from airflow.contrib.operators.kubernetes_pod_operator import KubernetesPodOperator
# Fallback to older Airflow
from airflow.providers.cncf.kubernetes.operators.kubernetes_pod import KubernetesPodOperator
except ImportError:
from airflow.providers.cncf.kubernetes.operators.pod import KubernetesPodOperator
# Fallback to even older Airflow
from airflow.contrib.operators.kubernetes_pod_operator import KubernetesPodOperator

# To deploy BigFlow project, following requirements options are needed: (airflow 1.x + composer 1.x) or (airflow 2.x + composer >= 2.1.0)
IS_COMPOSER_2_X = version.version >= '2.0.0'
Expand Down
12 changes: 9 additions & 3 deletions test/dagbuilder/my_parametrized_env_workflow__dag.py.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,20 @@ from airflow import version

try:
from airflow.kubernetes.secret import Secret
from airflow.providers.cncf.kubernetes.operators.kubernetes_pod import KubernetesPodOperator
except ImportError:
# Fallback to older Airflow
from airflow.contrib.kubernetes.secret import Secret

try:
from airflow.providers.cncf.kubernetes.operators.pod import KubernetesPodOperator
except ImportError:
# Fallback to older Airflow
try:
from airflow.contrib.operators.kubernetes_pod_operator import KubernetesPodOperator
# Fallback to older Airflow
from airflow.providers.cncf.kubernetes.operators.kubernetes_pod import KubernetesPodOperator
except ImportError:
from airflow.providers.cncf.kubernetes.operators.pod import KubernetesPodOperator
# Fallback to even older Airflow
from airflow.contrib.operators.kubernetes_pod_operator import KubernetesPodOperator

# To deploy BigFlow project, following requirements options are needed: (airflow 1.x + composer 1.x) or (airflow 2.x + composer >= 2.1.0)
IS_COMPOSER_2_X = version.version >= '2.0.0'
Expand Down
12 changes: 9 additions & 3 deletions test/dagbuilder/my_parametrized_workflow__dag.py.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,20 @@ from airflow import version

try:
from airflow.kubernetes.secret import Secret
from airflow.providers.cncf.kubernetes.operators.kubernetes_pod import KubernetesPodOperator
except ImportError:
# Fallback to older Airflow
from airflow.contrib.kubernetes.secret import Secret

try:
from airflow.providers.cncf.kubernetes.operators.pod import KubernetesPodOperator
except ImportError:
# Fallback to older Airflow
try:
from airflow.contrib.operators.kubernetes_pod_operator import KubernetesPodOperator
# Fallback to older Airflow
from airflow.providers.cncf.kubernetes.operators.kubernetes_pod import KubernetesPodOperator
except ImportError:
from airflow.providers.cncf.kubernetes.operators.pod import KubernetesPodOperator
# Fallback to even older Airflow
from airflow.contrib.operators.kubernetes_pod_operator import KubernetesPodOperator

# To deploy BigFlow project, following requirements options are needed: (airflow 1.x + composer 1.x) or (airflow 2.x + composer >= 2.1.0)
IS_COMPOSER_2_X = version.version >= '2.0.0'
Expand Down
12 changes: 9 additions & 3 deletions test/dagbuilder/my_workflow__dag.py.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,20 @@ from airflow import version

try:
from airflow.kubernetes.secret import Secret
from airflow.providers.cncf.kubernetes.operators.kubernetes_pod import KubernetesPodOperator
except ImportError:
# Fallback to older Airflow
from airflow.contrib.kubernetes.secret import Secret

try:
from airflow.providers.cncf.kubernetes.operators.pod import KubernetesPodOperator
except ImportError:
# Fallback to older Airflow
try:
from airflow.contrib.operators.kubernetes_pod_operator import KubernetesPodOperator
# Fallback to older Airflow
from airflow.providers.cncf.kubernetes.operators.kubernetes_pod import KubernetesPodOperator
except ImportError:
from airflow.providers.cncf.kubernetes.operators.pod import KubernetesPodOperator
# Fallback to even older Airflow
from airflow.contrib.operators.kubernetes_pod_operator import KubernetesPodOperator

# To deploy BigFlow project, following requirements options are needed: (airflow 1.x + composer 1.x) or (airflow 2.x + composer >= 2.1.0)
IS_COMPOSER_2_X = version.version >= '2.0.0'
Expand Down
Loading