WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit a956239

Browse files
jschefflamoghrajesh
authored andcommitted
Drop Airflow 2 Support in Edge Provider (apache#59143)
* Drop Airflow 2 Support in Edge Provider * Fix pytests * Add note about support in changelog
1 parent 4d30601 commit a956239

36 files changed

+138
-1877
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,8 @@ repos:
268268
^.*openapi.*\.yaml$|
269269
^\.pre-commit-config\.yaml$|
270270
^.*reproducible_build\.yaml$|
271-
^.*pnpm-lock\.yaml$
271+
^.*pnpm-lock\.yaml$|
272+
^.*-generated\.yaml$
272273
- repo: https://github.com/ikamensh/flynt
273274
rev: 97be693bf18bc2f050667dd282d243e2824b81e2 # frozen: 1.0.6
274275
hooks:

.rat-excludes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ www-hash.txt
313313
*generated.*
314314
/src/airflow/providers/keycloak/auth_manager/openapi/v2-keycloak-auth-manager-generated.yaml
315315
/src/airflow/providers/edge3/plugins/www/*
316-
/src/airflow/providers/edge3/openapi/v2-edge-generated.yaml
316+
/src/airflow/providers/edge3/worker_api/v2-edge-generated.yaml
317317
/src/airflow/providers/fab/auth_manager/api_fastapi/openapi/v2-fab-auth-manager-generated.yaml
318318
/src/airflow/providers/fab/www/static/dist/*
319319
/any/dag_id=dag_for_testing_redis_task_handler/run_id=test/task_id=task_for_testing_redis_log_handler/attempt=1.log

dev/breeze/src/airflow_breeze/global_constants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@ def get_airflow_extras():
736736
{
737737
"python-version": "3.10",
738738
"airflow-version": "2.11.0",
739-
"remove-providers": "common.messaging fab git keycloak",
739+
"remove-providers": "common.messaging edge3 fab git keycloak",
740740
"run-unit-tests": "true",
741741
},
742742
{

go-sdk/pkg/edgeapi/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727

2828
//go:generate -command openapi-gen go run github.com/ashb/oapi-resty-codegen@latest --config oapi-codegen.yml
2929

30-
//go:generate openapi-gen https://raw.githubusercontent.com/apache/airflow/refs/tags/providers-edge3/1.3.0/providers/edge3/src/airflow/providers/edge3/openapi/v2-edge-generated.yaml
30+
//go:generate openapi-gen https://raw.githubusercontent.com/apache/airflow/refs/tags/providers-edge3/1.3.0/providers/edge3/src/airflow/providers/edge3/worker_api/v2-edge-generated.yaml
3131

3232
func WithEdgeAPIJWTKey(key []byte) ClientOption {
3333
return func(c *Client) error {

providers/edge3/.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ repos:
3737
files: |
3838
(?x)
3939
^src/airflow/providers/edge3/plugins/www/.*\.(js|ts|tsx|yaml|css|json)$|
40-
^src/airflow/providers/edge3/openapi/v2-edge-generated.yaml$
40+
^src/airflow/providers/edge3/worker_api/v2-edge-generated.yaml$
4141
exclude: |
4242
(?x)
4343
^src/airflow/providers/edge3/plugins/www/node-modules/.*|

providers/edge3/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Requirements
6565
========================================== ====================
6666
PIP package Version required
6767
========================================== ====================
68-
``apache-airflow`` ``>=2.11.0,!=3.1.0``
68+
``apache-airflow`` ``>=3.0.0,!=3.1.0``
6969
``apache-airflow-providers-common-compat`` ``>=1.10.0``
7070
``pydantic`` ``>=2.11.0``
7171
``retryhttp`` ``>=1.2.0,!=1.3.0``

providers/edge3/docs/architecture.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ deployed outside of the central Airflow cluster is connected via HTTP(s) to the
6363
* **Workers** (Central) - Execute the assigned tasks - most standard setup has local or centralized workers, e.g. via Celery
6464
* **Edge Workers** - Special workers which pull tasks via HTTP(s) as provided as feature via this provider package
6565
* **Scheduler** - Responsible for adding the necessary tasks to the queue. The EdgeExecutor is running as a module inside the scheduler.
66-
* **API server** (webserver in Airflow 2.x) - HTTP REST API Server provides access to Dag/task status information. The required end-points are
66+
* **API server** - HTTP REST API Server provides access to Dag/task status information. The required end-points are
6767
provided by the Edge provider plugin. The Edge Worker uses this API to pull tasks and send back the results.
6868
* **Database** - Contains information about the status of tasks, Dags, Variables, connections, etc.
6969

@@ -77,7 +77,7 @@ In detail the parts of the Edge provider are deployed as follows:
7777
need to set the ``executor`` configuration option in the ``airflow.cfg`` file to
7878
``airflow.providers.edge3.executors.EdgeExecutor``. For more details see :doc:`edge_executor`. Note that also
7979
multiple executors can be used in parallel together with the EdgeExecutor.
80-
* **API server** (webserver in Airflow 2.x) - The API server is providing REST endpoints to the web UI as well
80+
* **API server** - The API server is providing REST endpoints to the web UI as well
8181
as serves static files. The Edge provider adds a plugin that provides additional REST API for the Edge Worker
8282
as well as UI elements to manage workers (not available in Airflow 3.0).
8383
The API server is responsible for handling requests from the Edge Worker and sending back the results. To

providers/edge3/docs/changelog.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,14 @@
2727
Changelog
2828
---------
2929

30+
.. warning::
31+
This release of the Edge3 provider drops support for Airflow versions below 3.0.0.
32+
33+
The support for Airflow 2.10-2.11 was experimental and GA for the provider is only for Airflow 3.0+.
34+
Productive operation was not intended in Airflow 2.x, therefore the support for Airflow 2.x is now dropped
35+
earlier than the usual release support policy would indicate.
36+
37+
3038
1.6.0
3139
.....
3240

providers/edge3/docs/deployment.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ process as and wait until all running tasks are completed. Also in a console you
113113
If you want to monitor the remote activity and worker, use the UI plugin which
114114
is included in the provider package and install it on the api-server / webserver and use the
115115
"Admin" - "Edge Worker Hosts" and "Edge Worker Jobs" pages.
116-
(Note: The plugin is not available on Airflow 3.0 UI, it is only in 2.x and 3.1++)
116+
(Note: The plugin is not available on Airflow 3.0 UI, it is only in 3.1++)
117117

118118
If you want to check status of the worker via CLI you can use the command
119119

@@ -150,7 +150,7 @@ Worker status can be checked via the web UI in the "Admin" - "Edge Worker" page.
150150

151151
.. note::
152152

153-
Airflow 3.0 does not support UI plugins. The UI plugin is only available in Airflow 2.10 and in 3.1 and newer.
153+
Airflow 3.0 does not support UI plugins. The UI plugin is only available in Airflow 3.1 and newer.
154154
Alternatively you can use the CLI commands as described in :ref:`deployment:maintenance-mgmt-cli`.
155155

156156

providers/edge3/docs/index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,12 @@ For the minimum Airflow version supported, see ``Requirements`` below.
108108
Requirements
109109
------------
110110

111-
The minimum Apache Airflow version supported by this provider distribution is ``2.11.0``.
111+
The minimum Apache Airflow version supported by this provider distribution is ``3.0.0``.
112112

113113
========================================== ====================
114114
PIP package Version required
115115
========================================== ====================
116-
``apache-airflow`` ``>=2.11.0,!=3.1.0``
116+
``apache-airflow`` ``>=3.0.0,!=3.1.0``
117117
``apache-airflow-providers-common-compat`` ``>=1.10.0``
118118
``pydantic`` ``>=2.11.0``
119119
``retryhttp`` ``>=1.2.0,!=1.3.0``

0 commit comments

Comments
 (0)