build: support helm-toolkit pinning

This pins the version of helm-toolkit used in the build due to
a breaking change in helm-toolkit.

Once helm 2.13.1 is released with this fix [0] we can update to use
it, and update the helm-toolkit pin to "master".

[0]: https://github.com/helm/helm/pull/5411

Change-Id: I827f1145c6d670cc955b82155455455a4f3ca486
This commit is contained in:
Sean Eagan 2019-03-11 16:17:41 -05:00
parent ea6b129606
commit c3d4a464cb
1 changed files with 5 additions and 1 deletions

View File

@ -20,6 +20,9 @@ HELM=${1}
HELM_PIDFILE=${2} HELM_PIDFILE=${2}
SERVE_DIR=$(mktemp -d) SERVE_DIR=$(mktemp -d)
# TODO: Set this back to "master" when uplifting armada to helm 2.13.1.
HTK_STABLE_COMMIT=${HTK_COMMIT:-"d6996b8004db35acad7d51412b0b3216189e745f"}
${HELM} init --client-only ${HELM} init --client-only
if [[ -s ${HELM_PIDFILE} ]]; then if [[ -s ${HELM_PIDFILE} ]]; then
@ -65,8 +68,9 @@ fi
{ {
cd "${SERVE_DIR}" cd "${SERVE_DIR}"
git clone --depth 1 https://git.openstack.org/openstack/openstack-helm-infra.git || true git clone https://git.openstack.org/openstack/openstack-helm-infra.git || true
cd openstack-helm-infra cd openstack-helm-infra
git reset --hard "${HTK_STABLE_COMMIT}"
make helm-toolkit make helm-toolkit
} }