From d1fca990cf43ef2036bc1e78a1055f9241a3d944 Mon Sep 17 00:00:00 2001 From: Sean Eagan Date: Mon, 11 Mar 2019 15:57:09 -0500 Subject: [PATCH] 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: I7b9085aacc1201baa0bf2ca73f9f2127a646a7b2 --- tools/helm_tk.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/helm_tk.sh b/tools/helm_tk.sh index 90b5d347..5ccd3bab 100755 --- a/tools/helm_tk.sh +++ b/tools/helm_tk.sh @@ -22,6 +22,9 @@ HELM=${1} HELM_PIDFILE=${2} 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 if [[ -s ${HELM_PIDFILE} ]]; then @@ -67,8 +70,9 @@ fi { 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 + git reset --hard "${HTK_STABLE_COMMIT}" make helm-toolkit }