airship
/
shipyard
Code Issues Proposed changes

Airflow stable 2.8.2 

This PS bumps up Airflow version to the latest
2.8.2 and also bumps up openstack dependences to
Antelope 2023.1

Change-Id: I7bbcbc8f9e6334100f47702f4546f0963d11b2ca
This commit is contained in:
Sergiy Markin 2024-02-26 20:57:24 +00:00
parent 20593bc746
commit 580c42e0ac
9 changed files with 148 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.zuul.yaml
View File

@ -157,7 +157,7 @@
commit: true commit: true
static: static:
- latest - latest
- airflow_2.8.1 - airflow_2.8.2

4
charts/shipyard/Chart.yaml
View File

@ -16,8 +16,8 @@
apiVersion: v1 apiVersion: v1
description: A Helm chart for Shipyard and Airflow description: A Helm chart for Shipyard and Airflow
name: shipyard name: shipyard
version: 0.2.4 version: 0.2.5
appVersion: 2.8.1 appVersion: 2.8.2
keywords: keywords:
- shipyard - shipyard
- airflow - airflow

2
charts/shipyard/values.yaml
View File

@ -994,7 +994,7 @@ pod:
readOnlyRootFilesystem: true readOnlyRootFilesystem: true
allowPrivilegeEscalation: false allowPrivilegeEscalation: false
airflow_worker: airflow_worker:
readOnlyRootFilesystem: true readOnlyRootFilesystem: false
allowPrivilegeEscalation: false allowPrivilegeEscalation: false
airflow_logrotate: airflow_logrotate:
readOnlyRootFilesystem: true readOnlyRootFilesystem: true

59
src/bin/shipyard_airflow/requirements-direct.txt
View File

@ -1,5 +1,5 @@
alembic alembic
apache-airflow[crypto,celery,hive,hdfs,jdbc,postgres]==2.8.1 apache-airflow[crypto,celery,hive,hdfs,jdbc,postgres]==2.8.2
arrow arrow
celery celery
Flask Flask
@ -9,28 +9,10 @@ pytz
falcon falcon
jsonschema jsonschema
networkx networkx
keystoneauth1==4.3.1
keystonemiddleware==9.3.0
kombu kombu
kubernetes kubernetes
marshmallow-sqlalchemy marshmallow-sqlalchemy
mock mock
oslo.cache==2.10.0
oslo.concurrency==4.2.0
oslo.config==8.6.0
oslo.context==4.0.0
oslo.db==11.2.0
oslo.i18n==6.0.0
oslo.log==4.8.0
oslo.messaging==12.13.1
oslo.metrics==0.4.0
oslo.middleware==4.4.0
oslo.policy==3.10.1
oslo.serialization==4.1.0
oslo.service==2.8.0
oslo.upgradecheck==2.1.1
oslo.utils==4.12.3
oslo.versionedobjects==2.4.0
psycopg2-binary psycopg2-binary
pyarrow pyarrow
pylibyaml pylibyaml
@ -46,11 +28,38 @@ ulid
uWSGI uWSGI
Werkzeug Werkzeug
WTForms WTForms
itsdangerous itsdangerous
git+https://opendev.org/airship/deckhand.git@5d2765e513fa55be74aef4456d6b353d24bc7097#egg=deckhand # Openstack Antelope 2023.1
git+https://opendev.org/airship/drydock.git@1e180a3f51fcb1d00c85e5691fde548b934d0572#egg=drydock_provisioner&subdirectory=python # https://releases.openstack.org/antelope/index.html
git+https://opendev.org/airship/armada.git@b3b8d05fe71cf42a3af0cd1bc50110ef989024a9#egg=armada barbican==16.0.0
git+https://opendev.org/airship/promenade.git@1a0ea41f286980bf1ccdb185578d9795983512eb#egg=promenade
python-barbicanclient==5.5.0
python-keystoneclient==5.1.0
keystoneauth1==5.1.2
keystonemiddleware==10.2.0
oslo.cache==3.3.1
oslo.concurrency==5.1.1
oslo.config==9.1.1
oslo.context==5.1.1
oslo.db==12.3.1
oslo.i18n==6.0.0
oslo.log==5.2.0
oslo.messaging==14.2.4
oslo.metrics==0.6.0
oslo.middleware==5.1.1
oslo.policy==4.1.1
oslo.serialization==5.1.1
oslo.service==3.1.1
oslo.upgradecheck==2.1.1
oslo.utils==6.1.0
oslo.versionedobjects==3.1.0
# Airship dependencies
git+https://opendev.org/airship/deckhand.git@32e9950db405b5d1eb74da0c4e8df344a8638eff#egg=deckhand
git+https://opendev.org/airship/drydock.git@6b317dda0518e3366c9835ee99d9691ffba718eb#egg=drydock_provisioner&subdirectory=python
git+https://opendev.org/airship/armada.git@e85f0ccdeb93475aef2f2f4ce3da9f53a00309cd#egg=armada
git+https://opendev.org/airship/promenade.git@d21e3434f641e1f1e7400a44e77fccb5b87a2824#egg=promenade

161
src/bin/shipyard_airflow/requirements-frozen.txt
View File

@ -1,42 +1,40 @@
aiohttp==3.9.1 aiohttp==3.9.3
aiosignal==1.3.1 aiosignal==1.3.1
alembic==1.13.1 alembic==1.13.1
amqp==5.2.0 amqp==5.2.0
annotated-types==0.6.0 anyio==4.3.0
anyio==4.2.0 apache-airflow==2.8.2
apache-airflow==2.8.1
apache-airflow-providers-apache-hdfs==4.3.2 apache-airflow-providers-apache-hdfs==4.3.2
apache-airflow-providers-apache-hive==6.4.1 apache-airflow-providers-apache-hive==7.0.0
apache-airflow-providers-celery==3.5.1 apache-airflow-providers-celery==3.6.0
apache-airflow-providers-common-io==1.2.0 apache-airflow-providers-common-io==1.3.0
apache-airflow-providers-common-sql==1.10.0 apache-airflow-providers-common-sql==1.11.0
apache-airflow-providers-ftp==3.7.0 apache-airflow-providers-ftp==3.7.0
apache-airflow-providers-http==4.8.0 apache-airflow-providers-http==4.9.1
apache-airflow-providers-imap==3.5.0 apache-airflow-providers-imap==3.5.0
apache-airflow-providers-jdbc==4.2.1 apache-airflow-providers-jdbc==4.2.2
apache-airflow-providers-postgres==5.10.0 apache-airflow-providers-postgres==5.10.1
apache-airflow-providers-sqlite==3.7.0 apache-airflow-providers-sqlite==3.7.1
apispec==6.4.0 apispec==6.4.0
argcomplete==3.2.1 argcomplete==3.2.2
Armada @ git+https://opendev.org/airship/armada.git@b3b8d05fe71cf42a3af0cd1bc50110ef989024a9 Armada @ git+https://opendev.org/airship/armada.git@6f06dc09606e94bd6e7322a6d71c1ce5fdd33b0b
arrow==1.3.0 arrow==1.3.0
asgiref==3.7.2 asgiref==3.7.2
async-timeout==4.0.3 async-timeout==4.0.3
attrs==23.2.0 attrs==23.2.0
autopage==0.5.2 autopage==0.5.2
Babel==2.14.0 Babel==2.14.0
backoff==2.2.1
backports.zoneinfo==0.2.1 backports.zoneinfo==0.2.1
barbican==14.0.2 barbican==16.0.0
bcrypt==4.1.2 bcrypt==4.1.2
Beaker==1.12.1 Beaker==1.12.1
billiard==4.2.0 billiard==4.2.0
blinker==1.7.0 blinker==1.7.0
cachelib==0.9.0 cachelib==0.9.0
cachetools==5.3.2 cachetools==5.3.2
castellan==4.3.0 castellan==4.4.0
celery==5.3.6 celery==5.3.6
certifi==2023.11.17 certifi==2024.2.2
cffi==1.16.0 cffi==1.16.0
charset-normalizer==3.3.2 charset-normalizer==3.3.2
click==8.1.7 click==8.1.7
@ -50,50 +48,50 @@ colorama==0.4.6
colorlog==4.8.0 colorlog==4.8.0
ConfigUpdater==3.2 ConfigUpdater==3.2
connexion==2.14.2 connexion==2.14.2
cron-descriptor==1.4.0 cron-descriptor==1.4.3
croniter==2.0.1 croniter==2.0.1
cryptography==41.0.7 cryptography==41.0.7
debtcollector==3.0.0 debtcollector==3.0.0
Deckhand @ git+https://opendev.org/airship/deckhand.git@5d2765e513fa55be74aef4456d6b353d24bc7097 Deckhand @ git+https://opendev.org/airship/deckhand.git@fd58230f6e31ede4925bab0325105eb5b05ad1a8
decorator==5.1.1 decorator==5.1.1
deepdiff==6.7.1 deepdiff==6.7.1
Deprecated==1.2.14 Deprecated==1.2.14
dill==0.3.1.1 dill==0.3.1.1
dnspython==2.4.2 dnspython==2.6.1
docopt==0.6.2 docopt==0.6.2
docutils==0.20.1 docutils==0.20.1
dogpile.cache==1.3.2 dogpile.cache==1.3.2
drydock-provisioner @ git+https://opendev.org/airship/drydock.git@1e180a3f51fcb1d00c85e5691fde548b934d0572#subdirectory=python drydock-provisioner @ git+https://opendev.org/airship/drydock.git@816a4bbe366e2c1d58530986df05f99d7d9a7beb#subdirectory=python
email-validator==1.3.1 email-validator==1.3.1
eventlet==0.34.3 eventlet==0.35.2
exceptiongroup==1.2.0 exceptiongroup==1.2.0
falcon==3.1.3 falcon==3.1.3
fastavro==1.9.3 fastavro==1.9.4
fasteners==0.19 fasteners==0.19
fixtures==4.1.0 fixtures==4.1.0
Flask==2.2.5 Flask==2.2.5
Flask-AppBuilder==4.3.10 Flask-AppBuilder==4.3.11
Flask-Babel==2.0.0 Flask-Babel==2.0.0
Flask-Caching==2.1.0 Flask-Caching==2.1.0
Flask-JWT-Extended==4.6.0 Flask-JWT-Extended==4.6.0
Flask-Limiter==3.5.0 Flask-Limiter==3.5.1
Flask-Login==0.6.3 Flask-Login==0.6.3
Flask-Session==0.5.0 Flask-Session==0.5.0
Flask-SQLAlchemy==2.5.1 Flask-SQLAlchemy==2.5.1
Flask-WTF==1.2.1 Flask-WTF==1.2.1
flower==2.0.1 flower==2.0.1
frozenlist==1.4.1 frozenlist==1.4.1
fsspec==2023.12.2 fsspec==2024.2.0
future==0.18.3 future==1.0.0
futurist==3.0.0 futurist==3.0.0
gitdb==4.0.11 gitdb==4.0.11
GitPython==3.1.41 GitPython==3.1.42
google-auth==2.26.2 google-auth==2.28.1
google-re2==1.1 google-re2==1.1
googleapis-common-protos==1.62.0 googleapis-common-protos==1.62.0
graphviz==0.20.1 graphviz==0.20.1
greenlet==3.0.3 greenlet==3.0.3
grpcio==1.60.0 grpcio==1.62.0
gssapi==1.8.3 gssapi==1.8.3
gunicorn==21.2.0 gunicorn==21.2.0
h11==0.14.0 h11==0.14.0
@ -114,63 +112,64 @@ JayDeBeApi==1.2.3
Jinja2==3.1.3 Jinja2==3.1.3
JPype1==1.5.0 JPype1==1.5.0
jsonpath-ng==1.6.1 jsonpath-ng==1.6.1
jsonpickle==3.0.2 jsonpickle==3.0.3
jsonschema==4.20.0 jsonschema==4.21.1
jsonschema-specifications==2023.12.1 jsonschema-specifications==2023.12.1
keystoneauth1==4.3.1 keystoneauth1==5.1.2
keystonemiddleware==9.3.0 keystonemiddleware==10.2.0
kombu==5.3.5 kombu==5.3.5
krb5==0.5.1 krb5==0.5.1
kubernetes==23.6.0 kubernetes==29.0.0
lazy-object-proxy==1.10.0 lazy-object-proxy==1.10.0
ldap3==2.9.1 ldap3==2.9.1
limits==3.7.0 limits==3.9.0
linkify-it-py==2.0.2 linkify-it-py==2.0.3
lockfile==0.12.2 lockfile==0.12.2
logutils==0.3.5 logutils==0.3.5
Mako==1.3.0 Mako==1.3.2
Markdown==3.5.2
markdown-it-py==3.0.0 markdown-it-py==3.0.0
MarkupSafe==2.1.3 MarkupSafe==2.1.5
marshmallow==3.20.2 marshmallow==3.20.2
marshmallow-oneofschema==3.0.1 marshmallow-oneofschema==3.1.1
marshmallow-sqlalchemy==0.26.1 marshmallow-sqlalchemy==0.26.1
mdit-py-plugins==0.4.0 mdit-py-plugins==0.4.0
mdurl==0.1.2 mdurl==0.1.2
microversion-parse==1.0.1
mock==5.1.0 mock==5.1.0
more-itertools==10.2.0
msgpack==1.0.7 msgpack==1.0.7
multidict==6.0.4 multidict==6.0.5
netaddr==1.2.1 netaddr==1.2.1
netifaces==0.11.0 netifaces==0.11.0
networkx==3.1 networkx==3.1
numpy==1.24.4 numpy==1.24.4
oauthlib==3.2.2 oauthlib==3.2.2
opentelemetry-api==1.22.0 opentelemetry-api==1.23.0
opentelemetry-exporter-otlp==1.22.0 opentelemetry-exporter-otlp==1.23.0
opentelemetry-exporter-otlp-proto-common==1.22.0 opentelemetry-exporter-otlp-proto-common==1.23.0
opentelemetry-exporter-otlp-proto-grpc==1.22.0 opentelemetry-exporter-otlp-proto-grpc==1.23.0
opentelemetry-exporter-otlp-proto-http==1.22.0 opentelemetry-exporter-otlp-proto-http==1.23.0
opentelemetry-proto==1.22.0 opentelemetry-proto==1.23.0
opentelemetry-sdk==1.22.0 opentelemetry-sdk==1.23.0
opentelemetry-semantic-conventions==0.43b0 opentelemetry-semantic-conventions==0.44b0
ordered-set==4.1.0 ordered-set==4.1.0
os-service-types==1.7.0 os-service-types==1.7.0
oslo.cache==2.10.0 oslo.cache==3.3.1
oslo.concurrency==4.2.0 oslo.concurrency==5.1.1
oslo.config==8.6.0 oslo.config==9.1.1
oslo.context==4.0.0 oslo.context==5.1.1
oslo.db==11.2.0 oslo.db==12.3.1
oslo.i18n==6.0.0 oslo.i18n==6.0.0
oslo.log==4.8.0 oslo.log==5.2.0
oslo.messaging==12.13.1 oslo.messaging==14.2.4
oslo.metrics==0.4.0 oslo.metrics==0.6.0
oslo.middleware==4.4.0 oslo.middleware==5.1.1
oslo.policy==3.10.1 oslo.policy==4.1.1
oslo.serialization==4.1.0 oslo.serialization==5.1.1
oslo.service==2.8.0 oslo.service==3.1.1
oslo.upgradecheck==2.1.1 oslo.upgradecheck==2.1.1
oslo.utils==4.12.3 oslo.utils==6.1.0
oslo.versionedobjects==2.4.0 oslo.versionedobjects==3.1.0
packaging==23.2 packaging==23.2
pandas==2.0.3 pandas==2.0.3
Paste==3.7.1 Paste==3.7.1
@ -182,15 +181,15 @@ pecan==1.5.1
pendulum==3.0.0 pendulum==3.0.0
pip==23.2.1 pip==23.2.1
pkgutil_resolve_name==1.3.10 pkgutil_resolve_name==1.3.10
pluggy==1.3.0 pluggy==1.4.0
ply==3.11 ply==3.11
prettytable==3.10.0 prettytable==3.10.0
prison==0.2.1 prison==0.2.1
promenade @ git+https://opendev.org/airship/promenade.git@1a0ea41f286980bf1ccdb185578d9795983512eb promenade @ git+https://opendev.org/airship/promenade.git@14375e658bc06328042b1dc934eefcebf60210fd
prometheus-client==0.19.0 prometheus_client==0.20.0
prompt-toolkit==3.0.43 prompt-toolkit==3.0.43
protobuf==4.25.2 protobuf==4.25.3
psutil==5.9.7 psutil==5.9.8
psycopg2-binary==2.9.9 psycopg2-binary==2.9.9
pure-sasl==0.6.2 pure-sasl==0.6.2
py==1.11.0 py==1.11.0
@ -199,28 +198,26 @@ pyasn1==0.5.1
pyasn1-modules==0.3.0 pyasn1-modules==0.3.0
pycadf==3.1.1 pycadf==3.1.1
pycparser==2.21 pycparser==2.21
pydantic==2.5.3
pydantic_core==2.14.6
Pygments==2.17.2 Pygments==2.17.2
PyHive==0.7.0 PyHive==0.7.0
PyJWT==2.8.0 PyJWT==2.8.0
pylibyaml==0.1.0 pylibyaml==0.1.0
pyOpenSSL==23.3.0 pyOpenSSL==24.0.0
pyparsing==3.1.1 pyparsing==3.1.1
pyperclip==1.8.2 pyperclip==1.8.2
pyspnego==0.10.2 pyspnego==0.10.2
python-barbicanclient==5.4.0 python-barbicanclient==5.5.0
python-daemon==3.0.1 python-daemon==3.0.1
python-dateutil==2.8.2 python-dateutil==2.8.2
python-keystoneclient==5.3.0 python-keystoneclient==5.1.0
python-memcached==1.62 python-memcached==1.62
python-mimeparse==1.6.0 python-mimeparse==1.6.0
python-nvd3==0.15.0 python-nvd3==0.15.0
python-slugify==8.0.1 python-slugify==8.0.4
python3-memcached==1.51 python3-memcached==1.51
pytz==2023.3.post1 pytz==2024.1
PyYAML==6.0.1 PyYAML==6.0.1
referencing==0.32.1 referencing==0.33.0
regex==2023.12.25 regex==2023.12.25
repoze.lru==0.7 repoze.lru==0.7
requests==2.31.0 requests==2.31.0
@ -228,14 +225,14 @@ requests-kerberos==0.14.0
requests-oauthlib==1.3.1 requests-oauthlib==1.3.1
requests-toolbelt==1.0.0 requests-toolbelt==1.0.0
resolver==0.2.1 resolver==0.2.1
responses==0.24.1 responses==0.25.0
retry==0.9.2 retry==0.9.2
rfc3339-validator==0.1.4 rfc3339-validator==0.1.4
rfc3986==1.5.0 rfc3986==1.5.0
rich==13.7.0 rich==13.7.0
rich-argparse==1.4.0 rich-argparse==1.4.0
Routes==2.5.1 Routes==2.5.1
rpds-py==0.17.1 rpds-py==0.18.0
rsa==4.9 rsa==4.9
selector==0.10.1 selector==0.10.1
setproctitle==1.3.3 setproctitle==1.3.3
@ -266,8 +263,8 @@ time-machine==2.13.0
tornado==6.4 tornado==6.4
types-python-dateutil==2.8.19.20240106 types-python-dateutil==2.8.19.20240106
typing_extensions==4.9.0 typing_extensions==4.9.0
tzdata==2023.4 tzdata==2024.1
uc-micro-py==1.0.2 uc-micro-py==1.0.3
ulid==1.1 ulid==1.1
unicodecsv==0.14.1 unicodecsv==0.14.1
universal-pathlib==0.1.4 universal-pathlib==0.1.4

2
src/bin/shipyard_airflow/tox.ini
View File

@ -17,7 +17,7 @@ allowlist_externals=
sh sh
deps= deps=
-r{toxinidir}/requirements-direct.txt -r{toxinidir}/requirements-direct.txt
-c https://raw.githubusercontent.com/apache/airflow/constraints-2.8.1/constraints-3.8.txt -c https://raw.githubusercontent.com/apache/airflow/constraints-2.8.2/constraints-3.8.txt
commands= commands=
rm -f {toxinidir}/requirements-frozen.txt rm -f {toxinidir}/requirements-frozen.txt
sh -c "pip freeze --all | grep -vE 'shipyard_airflow|pyinotify|pkg-resources' > requirements-frozen.txt" sh -c "pip freeze --all | grep -vE 'shipyard_airflow|pyinotify|pkg-resources' > requirements-frozen.txt"

12
src/bin/shipyard_client/requirements-direct.txt
View File

@ -17,7 +17,6 @@
arrow arrow
click click
click-default-group click-default-group
keystoneauth1==4.3.1
requests requests
PTable PTable
pylibyaml pylibyaml
@ -29,3 +28,14 @@ MarkupSafe
pbr pbr
python-dateutil python-dateutil
Werkzeug Werkzeug
# Openstack Antelope 2023.1
# https://releases.openstack.org/antelope/index.html
python-keystoneclient==5.1.0
keystoneauth1==5.1.2
oslo.config==9.1.1
oslo.i18n==6.0.0
oslo.serialization==5.1.1
oslo.utils==6.1.0

22
src/bin/shipyard_client/requirements-frozen.txt
View File

@ -1,29 +1,43 @@
arrow==1.3.0 arrow==1.3.0
certifi==2023.11.17 certifi==2024.2.2
charset-normalizer==3.3.2 charset-normalizer==3.3.2
click==8.1.7 click==8.1.7
click-default-group==1.2.4 click-default-group==1.2.4
debtcollector==3.0.0
Flask==2.2.5 Flask==2.2.5
idna==3.6 idna==3.6
importlib-metadata==6.11.0 importlib-metadata==6.11.0
iso8601==2.1.0 iso8601==2.1.0
itsdangerous==2.1.2 itsdangerous==2.1.2
Jinja2==3.1.3 Jinja2==3.1.3
keystoneauth1==4.3.1 keystoneauth1==5.1.2
MarkupSafe==2.1.3 MarkupSafe==2.1.5
msgpack==1.0.7
netaddr==1.2.1
netifaces==0.11.0
os-service-types==1.7.0 os-service-types==1.7.0
oslo.config==9.1.1
oslo.i18n==6.0.0
oslo.serialization==5.1.1
oslo.utils==6.1.0
packaging==23.2
pbr==6.0.0 pbr==6.0.0
pip==23.2.1 pip==23.2.1
PTable==0.9.2 PTable==0.9.2
pylibyaml==0.1.0 pylibyaml==0.1.0
pyparsing==3.1.1
python-dateutil==2.8.2 python-dateutil==2.8.2
python-keystoneclient==5.1.0
pytz==2024.1
PyYAML==6.0.1 PyYAML==6.0.1
requests==2.31.0 requests==2.31.0
rfc3986==1.5.0
setuptools==68.2.2 setuptools==68.2.2
six==1.16.0 six==1.16.0
stevedore==5.1.0 stevedore==5.2.0
types-python-dateutil==2.8.19.20240106 types-python-dateutil==2.8.19.20240106
urllib3==1.26.18 urllib3==1.26.18
Werkzeug==2.2.3 Werkzeug==2.2.3
wheel==0.41.2 wheel==0.41.2
wrapt==1.16.0
zipp==3.17.0 zipp==3.17.0

2
src/bin/shipyard_client/tox.ini
View File

@ -18,7 +18,7 @@ allowlist_externals=
sh sh
deps= deps=
-r{toxinidir}/requirements-direct.txt -r{toxinidir}/requirements-direct.txt
-c https://raw.githubusercontent.com/apache/airflow/constraints-2.8.1/constraints-3.8.txt -c https://raw.githubusercontent.com/apache/airflow/constraints-2.8.2/constraints-3.8.txt
commands= commands=
rm -f {toxinidir}/requirements-frozen.txt rm -f {toxinidir}/requirements-frozen.txt
sh -c "pip freeze --all | grep -vE 'shipyard_airflow|pyinotify|pkg-resources' > requirements-frozen.txt" sh -c "pip freeze --all | grep -vE 'shipyard_airflow|pyinotify|pkg-resources' > requirements-frozen.txt"