Browse Source

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
changes/25/642825/1
Sean Eagan 2 months ago
parent
commit
c3d4a464cb
1 changed files with 5 additions and 1 deletions
  1. 5
    1
      tools/helm_tk.sh

+ 5
- 1
tools/helm_tk.sh View File

@@ -20,6 +20,9 @@ HELM=${1}
20 20
 HELM_PIDFILE=${2}
21 21
 SERVE_DIR=$(mktemp -d)
22 22
 
23
+# TODO: Set this back to "master" when uplifting armada to helm 2.13.1.
24
+HTK_STABLE_COMMIT=${HTK_COMMIT:-"d6996b8004db35acad7d51412b0b3216189e745f"}
25
+
23 26
 ${HELM} init --client-only
24 27
 
25 28
 if [[ -s ${HELM_PIDFILE} ]]; then
@@ -65,8 +68,9 @@ fi
65 68
 
66 69
 {
67 70
     cd "${SERVE_DIR}"
68
-    git clone --depth 1 https://git.openstack.org/openstack/openstack-helm-infra.git || true
71
+    git clone https://git.openstack.org/openstack/openstack-helm-infra.git || true
69 72
     cd openstack-helm-infra
73
+    git reset --hard "${HTK_STABLE_COMMIT}"
70 74
 
71 75
     make helm-toolkit
72 76
 }

Loading…
Cancel
Save