From 8f68c2b4f24f4f80e8ae6bf164cf660917fcad98 Mon Sep 17 00:00:00 2001 From: Phil Sphicas Date: Mon, 15 Feb 2021 01:55:38 +0000 Subject: [PATCH] Uplift promenade, remove hyperkube Uplifts promenade to the latest verson. Notably, this removes support for kubelet extraction from the hyperkube image (which has not been possible since Kubernetes v1.16). Complete list of promenade changes since the last uplift: * 5bb5886 Uplift Kubernetes to v1.19.7 * 023e7d4 Uplift etcd to v3.4.13 * e2324e7 Remove remaining hyperkube references * 5323ca2 Deploy with standalone kubernetes images * c7e7294 Remove hyperkube extraction functionality * 0307391 Update cleanup.sh developer script Change-Id: I51766a1b9fb8bb2e86f60370625a2bb81fd9e8f6 --- Pipfile | 2 +- Pipfile.lock | 2 +- requirements.txt | 2 +- vcs-requirements.env | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Pipfile b/Pipfile index 1cd9f0ca..799aaf42 100644 --- a/Pipfile +++ b/Pipfile @@ -28,7 +28,7 @@ pylibyaml = "~=0.1" PyYAML = "~=5.1" deckhand = {git = "https://opendev.org/airship/deckhand.git",ref = "1f0c011a1708c1235a2be65edada7d386cd55d2a"} shipyard-client = {git = "https://opendev.org/airship/shipyard.git",ref = "35e5a7f796a5341e02fb0d3f2d27b41e2fb39131",subdirectory = "src/bin/shipyard_client"} -promenade = {git = "https://opendev.org/airship/promenade.git",ref = "c9862e5749986a671c274bbfad4366cb4609fa89"} +promenade = {git = "https://opendev.org/airship/promenade.git",ref = "5bb58863b694a78b935f2d70d45bd3448f17b6a3"} "oslo.i18n" = "~=3.24.0" "oslo.utils" = ">=3.42.1" six = ">=1.15.0" diff --git a/Pipfile.lock b/Pipfile.lock index 349e0cb8..4338451b 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -722,7 +722,7 @@ }, "promenade": { "git": "https://opendev.org/airship/promenade.git", - "ref": "c9862e5749986a671c274bbfad4366cb4609fa89" + "ref": "5bb58863b694a78b935f2d70d45bd3448f17b6a3" }, "psycopg2-binary": { "hashes": [ diff --git a/requirements.txt b/requirements.txt index 8fd28acd..639fdadd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -28,7 +28,7 @@ fixtures==3.0.0 flake8==3.7.9 futurist==2.2.0; python_version >= '3.6' git+https://opendev.org/airship/deckhand.git@1f0c011a1708c1235a2be65edada7d386cd55d2a#egg=deckhand -git+https://opendev.org/airship/promenade.git@c9862e5749986a671c274bbfad4366cb4609fa89 +git+https://opendev.org/airship/promenade.git@5bb58863b694a78b935f2d70d45bd3448f17b6a3 git+https://opendev.org/airship/shipyard.git@35e5a7f796a5341e02fb0d3f2d27b41e2fb39131#egg=shipyard-client&subdirectory=src/bin/shipyard_client gitdb2==2.0.6; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' gitpython==2.1.15 diff --git a/vcs-requirements.env b/vcs-requirements.env index dacadd50..97e6d4c2 100644 --- a/vcs-requirements.env +++ b/vcs-requirements.env @@ -1,3 +1,3 @@ DECKHAND_VERSION=commit/1f0c011a1708c1235a2be65edada7d386cd55d2a SHIPYARD_VERSION=commit/35e5a7f796a5341e02fb0d3f2d27b41e2fb39131 -PROMENADE_VERSION=commit/c9862e5749986a671c274bbfad4366cb4609fa89 +PROMENADE_VERSION=commit/5bb58863b694a78b935f2d70d45bd3448f17b6a3