From 7dcada80f108d47524d04b9259c4321684ba555c Mon Sep 17 00:00:00 2001 From: Phil Sphicas Date: Sun, 13 Mar 2022 22:19:52 -0700 Subject: [PATCH] Uplift Armada client, enable socket keepalives Connections from airflow-worker can be long-lived (e.g. when applying large Armada manifests), and are prone to disconnection due to network inactivity. This change uplifts the Armada client to enable socket keepalives in order to avoid this issue. (Promenade is also uplifted to address a requirements conflict.) Change-Id: I067a5edbbdff06f45394e772ebb16d5012987b6c --- images/airflow/requirements.txt | 2 +- src/bin/shipyard_airflow/requirements.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/airflow/requirements.txt b/images/airflow/requirements.txt index e9c10e52..1d5ebce1 100644 --- a/images/airflow/requirements.txt +++ b/images/airflow/requirements.txt @@ -41,4 +41,4 @@ vine<5.0.0a1,>=1.1.3 # Dependencies for other UCP components git+https://opendev.org/airship/deckhand.git@1f0c011a1708c1235a2be65edada7d386cd55d2a#egg=deckhand git+https://opendev.org/airship/drydock.git@96db568d4b28f5f163efbf606854243614a6c821#egg=drydock_provisioner&subdirectory=python -git+https://opendev.org/airship/armada.git@0c3aff1ba1f0e836e3dd56de81b2ee560e11c179#egg=armada +git+https://opendev.org/airship/armada.git@416eff4e52f72169c3ebf49a8ffca36086692b7a#egg=armada diff --git a/src/bin/shipyard_airflow/requirements.txt b/src/bin/shipyard_airflow/requirements.txt index 0e600c47..a92dbc7b 100644 --- a/src/bin/shipyard_airflow/requirements.txt +++ b/src/bin/shipyard_airflow/requirements.txt @@ -57,5 +57,5 @@ tabulate==0.8.03 # Dependencies for other UCP components git+https://opendev.org/airship/deckhand.git@1f0c011a1708c1235a2be65edada7d386cd55d2a#egg=deckhand git+https://opendev.org/airship/drydock.git@96db568d4b28f5f163efbf606854243614a6c821#egg=drydock_provisioner&subdirectory=python -git+https://opendev.org/airship/armada.git@0c3aff1ba1f0e836e3dd56de81b2ee560e11c179#egg=armada -git+https://opendev.org/airship/promenade.git@9cd261294bb77c42375ab02606c2f18bff081c26#egg=promenade +git+https://opendev.org/airship/armada.git@416eff4e52f72169c3ebf49a8ffca36086692b7a#egg=armada +git+https://opendev.org/airship/promenade.git@59e1f8af83f25bebc07b3545238f89fe4cb7354f#egg=promenade