Airflow upgrade to 3.0.2

Change-Id: I0f03efa3396a15cbdef3572583b35979df612b5c
2025-05-01 21:48:20 +00:00
parent 4fb2cbdc7c
commit e3d34aa2c3
9 changed files with 72 additions and 72 deletions
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -146,7 +146,7 @@
      flannel_version: v0.25.4
      metallb_setup: false
      metallb_version: "0.13.12"
-      helm_version: "v3.17.3"
+      helm_version: "v3.18.3"
      crictl_version: "v1.30.1"
      zuul_osh_infra_relative_path: ../openstack-helm
      gate_scripts_relative_path: ../openstack-helm
@@ -160,7 +160,7 @@
    parent: armada-base
    vars:
      site: airskiff
-      HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.17.3-linux-amd64.tar.gz
+      HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.18.3-linux-amd64.tar.gz
      HTK_COMMIT: 49c117443391cec75e0bd52bb4a9d033325927ad
      OSH_COMMIT: 49c117443391cec75e0bd52bb4a9d033325927ad
      CLONE_ARMADA: false
@@ -201,7 +201,7 @@
          commit: true
        static:
          - latest
-          - airflow_2.10.4
+          - airflow_3.0.2


 - secret:
--- a/2
+++ b/2
@@ -35,7 +35,7 @@ IMAGE_ALIAS              := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${I
 UBUNTU_BASE_IMAGE ?=

 # Helm binary download url
-HELM_ARTIFACT_URL ?= https://get.helm.sh/helm-v3.17.3-linux-amd64.tar.gz
+HELM_ARTIFACT_URL ?= https://get.helm.sh/helm-v3.18.3-linux-amd64.tar.gz

 # VERSION INFO
 GIT_COMMIT = $(shell git rev-parse HEAD)
--- a/charts/armada/Chart.yaml
+++ b/charts/armada/Chart.yaml
@@ -15,7 +15,7 @@
 apiVersion: v1
 description: A Helm chart for Armada
 name: armada
-version: 0.1.0
+version: 0.1.1
 keywords:
 - armada
 home: https://airshipit.org
--- a/charts/armada/values.yaml
+++ b/charts/armada/values.yaml
@@ -31,14 +31,14 @@ labels:

 images:
  tags:
-    api: 'quay.io/airshipit/armada:latest-ubuntu_focal'
-    operator: 'quay.io/airshipit/armada-operator:latest-ubuntu_focal'
-    dep_check: 'quay.io/stackanetes/kubernetes-entrypoint:v0.3.1'
-    ks_endpoints: 'docker.io/openstackhelm/heat:newton'
-    ks_service: 'docker.io/openstackhelm/heat:newton'
-    ks_user: 'docker.io/openstackhelm/heat:newton'
-    image_repo_sync: docker.io/docker:17.07.0
-    test: 'quay.io/airshipit/armada:latest-ubuntu_focal'
+    api: 'quay.io/airshipit/armada:latest-ubuntu_jammy'
+    operator: 'quay.io/airshipit/armada-operator:latest-ubuntu_jammy'
+    dep_check: 'quay.io/stackanetes/kubernetes-entrypoint:latest-ubuntu_jammy'
+    ks_endpoints: 'quay.io/airshipit/heat:2024.1-ubuntu_jammy'
+    ks_service: 'quay.io/airshipit/heat:2024.1-ubuntu_jammy'
+    ks_user: 'quay.io/airshipit/heat:2024.1-ubuntu_jammy'
+    image_repo_sync: 'quay.io/airshipit/docker:27.5.0'
+    test: 'quay.io/airshipit/armada:latest-ubuntu_jammy'
  pull_policy: "IfNotPresent"
  local_registry:
    active: false
--- a/images/armada/Dockerfile.ubuntu_jammy
+++ b/images/armada/Dockerfile.ubuntu_jammy
@@ -16,7 +16,7 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc
      org.opencontainers.image.vendor='The Airship Authors' \
      org.opencontainers.image.licenses='Apache-2.0'

-ENV DEBIAN_FRONTEND noninteractive
+ENV DEBIAN_FRONTEND=noninteractive
 ENV LANG=C.UTF-8
 ENV LC_ALL=C.UTF-8

@@ -89,7 +89,7 @@ COPY . ./
 COPY --from=armada_go /usr/local/bin/armada /usr/local/bin/armada-go

 # Setting the version explicitly for PBR
-ENV PBR_VERSION 0.8.0
+ENV PBR_VERSION=0.8.0

 RUN \
    chown -R armada:users . && \
--- a/requirements-frozen.txt
+++ b/requirements-frozen.txt
@@ -1,51 +1,51 @@
-alembic==1.14.0
+alembic==1.16.1
 amqp==5.3.1
-attrs==24.2.0
+attrs==25.3.0
 autopage==0.5.2
 barbican==18.0.0
-bcrypt==4.2.1
-cachetools==5.5.0
-castellan==5.2.0
-certifi==2024.8.30
+bcrypt==4.3.0
+cachetools==5.5.2
+castellan==5.3.0
+certifi==2025.4.26
 cffi==1.17.1
-charset-normalizer==3.4.0
-click==8.1.7
-cliff==4.8.0
-cmd2==2.5.8
+charset-normalizer==3.4.2
+click==8.2.1
+cliff==4.10.0
+cmd2==2.6.1
 cryptography==42.0.8
 debtcollector==3.0.0
-decorator==5.1.1
-deepdiff==8.1.1
+decorator==5.2.1
+deepdiff==8.5.0
 dnspython==2.7.0
-dogpile.cache==1.3.3
-eventlet==0.38.1
+dogpile.cache==1.4.0
+durationpy==0.10
+eventlet==0.40.0
 falcon==4.0.2
 fasteners==0.19
-futurist==3.0.0
-gitdb==4.0.11
-GitPython==3.1.43
-google-auth==2.36.0
-greenlet==3.1.1
+futurist==3.1.1
+gitdb==4.0.12
+GitPython==3.1.44
+google-auth==2.40.2
+greenlet==3.2.2
 idna==3.10
 iso8601==2.1.0
-Jinja2==3.1.4
-jsonschema==4.23.0
-jsonschema-specifications==2023.12.1
+Jinja2==3.1.6
+jsonschema==4.24.0
+jsonschema-specifications==2025.4.1
 keystoneauth1==5.6.0
 keystonemiddleware==10.6.0
-kombu==5.4.2
-kubernetes==30.1.0
+kombu==5.5.4
+kubernetes==31.0.0
 ldap3==2.9.1
-logutils==0.3.5
-Mako==1.3.8
+Mako==1.3.10
 MarkupSafe==3.0.2
 microversion-parse==2.0.0
-mock==5.1.0
+mock==5.2.0
 msgpack==1.1.0
 netaddr==1.3.0
 netifaces==0.11.0
 oauthlib==3.2.2
-orderly-set==5.2.3
+orderly-set==5.4.1
 os-service-types==1.7.0
 oslo.cache==3.7.0
 oslo.concurrency==6.0.0
@@ -63,57 +63,57 @@ oslo.service==3.4.1
 oslo.upgradecheck==2.3.0
 oslo.utils==7.1.0
 oslo.versionedobjects==3.3.0
-packaging==24.2
+packaging==25.0
 Paste==3.10.1
 PasteDeploy==3.1.0
-pbr==6.1.0
-pecan==1.5.1
-pip==24.1
-prettytable==3.12.0
-prometheus_client==0.21.1
+pbr==6.1.1
+pecan==1.6.0
+pip==24.3.1
+prettytable==3.16.0
+prometheus_client==0.22.1
 py==1.11.0
 pyasn1==0.6.1
-pyasn1_modules==0.4.0
-pycadf==4.0.0
+pyasn1_modules==0.4.1
+pycadf==4.0.1
 pycparser==2.22
 PyJWT==2.10.1
 pylibyaml==0.1.0
-pyOpenSSL==24.3.0
-pyparsing==3.2.0
+pyOpenSSL==25.1.0
+pyparsing==3.2.3
 pyperclip==1.9.0
 python-barbicanclient==5.7.0
 python-dateutil==2.9.0.post0
 python-keystoneclient==5.4.0
 python-memcached==1.62
-pytz==2024.2
 PyYAML==6.0.2
-referencing==0.35.1
+referencing==0.36.2
 repoze.lru==0.7
 requests==2.32.3
-requests-oauthlib==1.3.1
-responses==0.25.3
+requests-oauthlib==2.0.0
+responses==0.25.7
 retry==0.9.2
 rfc3986==2.0.0
 Routes==2.5.1
-rpds-py==0.22.3
-rsa==4.9
-setuptools==70.1.0
+rpds-py==0.25.1
+rsa==4.9.1
+setuptools==75.8.0
 six==1.17.0
-smmap==5.0.1
+smmap==5.0.2
 SQLAlchemy==1.4.54
 statsd==4.0.1
-stevedore==5.4.0
-testresources==2.0.1
+stevedore==5.4.1
+testresources==2.0.2
 testscenarios==0.5.0
 testtools==2.7.2
-typing_extensions==4.12.2
-tzdata==2024.2
-urllib3==2.2.3
-uWSGI==2.0.28
+tomli==2.2.1
+typing_extensions==4.13.2
+tzdata==2025.2
+urllib3==2.4.0
+uWSGI==2.0.30
 vine==5.1.0
 wcwidth==0.2.13
 WebOb==1.8.9
 websocket-client==1.8.0
-wheel==0.43.0
-wrapt==1.17.0
+wheel==0.45.1
+wrapt==1.17.2
 yappi==1.6.10
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -10,7 +10,7 @@ pyflakes
 sphinx-rtd-theme==0.5.0
 stestr==4.1.0
 testrepository==0.0.20
-testresources==2.0.1
+testresources==2.0.2
 testscenarios==0.5.0
 # testtools==2.5.0
 # tox>=3.28.0, <4.0.0
--- a/tools/helm_install.sh
+++ b/tools/helm_install.sh
@@ -17,7 +17,7 @@
 set -x

 HELM=$1
-HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://get.helm.sh/helm-v3.17.3-linux-amd64.tar.gz"}
+HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://get.helm.sh/helm-v3.18.3-linux-amd64.tar.gz"}


 function install_helm_binary {
--- a/tox.ini
+++ b/tox.ini
@@ -38,7 +38,7 @@ allowlist_externals=
  sh
 deps=
  -r{toxinidir}/requirements-direct.txt
-  -c https://raw.githubusercontent.com/apache/airflow/constraints-2.10.4/constraints-3.10.txt
+  -c https://raw.githubusercontent.com/apache/airflow/constraints-3.0.2/constraints-3.10.txt
 commands=
  rm -f requirements-frozen.txt
  sh -c "pip freeze --all | grep -vE 'armada|pyinotify|pkg-resources==0.0.0' > requirements-frozen.txt"