From 2600b16694c2c8de0f6d1e53bc4cf710c5cbf2af Mon Sep 17 00:00:00 2001
From: Phil Sphicas <phil.sphicas@att.com>
Date: Wed, 30 Sep 2020 03:08:51 +0000
Subject: [PATCH] Uplift promenade to support non-hyperkube images

Uplift promenade to include templates without /hyperkube references,
allowing the use of standalone apiserver, controller, proxy, and
scheduler images.

Changes in promenade since previous uplift:
* d603386 Remove additional /hyperkube reference
* 8513b46 Update pip package versions in preparation of pip 20.3
* fb36579 kube-apiserver: use HTTP probes instead of exec
* be7b82e kube-apiserver: Allow probe customization
* 8c52be3 Remove /hyperkube prefix
* 9402535 Change helm-toolkit dependency version to ">= 0.1.0"
* b41c315 Accelerate YAML operations with LibYAML
* 14a95e6 Upgrade LibYAML version in container builds
* 6d7df80 Fix bug with block_literal_representer
* 9853fcf fix - pep8 and image build gates
* 9742790 Upgrade etcd to 3.4.3

Change-Id: I48628259f8db26a925f92ef859f82e7928ab786a
---
 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 547861eb..5605e3ab 100644
--- a/Pipfile
+++ b/Pipfile
@@ -28,7 +28,7 @@ pylibyaml = "~=0.1"
 PyYAML = "~=5.1"
 deckhand = {git = "https://opendev.org/airship/deckhand.git",ref = "e7ba6828a0a1ca27fae596f6e0ee5a857f28001d"}
 shipyard-client = {git = "https://opendev.org/airship/shipyard.git",ref = "70410cc478e6aec4abad88c84d68684edfedb376",subdirectory = "src/bin/shipyard_client"}
-promenade = {git = "https://opendev.org/airship/promenade.git",ref = "c302a083a61c22b94b71eccb9a3665d23c6497dc"}
+promenade = {git = "https://opendev.org/airship/promenade.git",ref = "d603386d491e1df52f9d1ee05d60e4263692b9b3"}
 "oslo.i18n" = "~=3.24.0"
 "oslo.utils" = "~=3.40.2"
 six = "~=1.11.0"
diff --git a/Pipfile.lock b/Pipfile.lock
index bde42946..4a212bdc 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -680,7 +680,7 @@
         },
         "promenade": {
             "git": "https://opendev.org/airship/promenade.git",
-            "ref": "c302a083a61c22b94b71eccb9a3665d23c6497dc"
+            "ref": "d603386d491e1df52f9d1ee05d60e4263692b9b3"
         },
         "psycopg2-binary": {
             "hashes": [
diff --git a/requirements.txt b/requirements.txt
index 5c61a5ac..91b7fde0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -28,7 +28,7 @@ fixtures==3.0.0
 flake8==2.6.2
 futurist==2.2.0; python_version >= '3.6'
 git+https://opendev.org/airship/deckhand.git@e7ba6828a0a1ca27fae596f6e0ee5a857f28001d#egg=deckhand
-git+https://opendev.org/airship/promenade.git@c302a083a61c22b94b71eccb9a3665d23c6497dc
+git+https://opendev.org/airship/promenade.git@d603386d491e1df52f9d1ee05d60e4263692b9b3
 git+https://opendev.org/airship/shipyard.git@70410cc478e6aec4abad88c84d68684edfedb376#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 f3d6b1ee..3645bb86 100644
--- a/vcs-requirements.env
+++ b/vcs-requirements.env
@@ -1,3 +1,3 @@
 DECKHAND_VERSION=commit/e7ba6828a0a1ca27fae596f6e0ee5a857f28001d
 SHIPYARD_VERSION=commit/70410cc478e6aec4abad88c84d68684edfedb376
-PROMENADE_VERSION=commit/c302a083a61c22b94b71eccb9a3665d23c6497dc
+PROMENADE_VERSION=commit/d603386d491e1df52f9d1ee05d60e4263692b9b3