per @dweomer, update build-chart script to fail correctly if specifie…

…d version does not exist Signed-off-by: Brian Downs <[email protected]>
rancher · Sep 10, 2020 · 1361a32 · 1361a32
1 parent 28655a3
commit 1361a32
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/charts/build-chart.sh b/charts/build-chart.sh
@@ -1,15 +1,20 @@
 #!/usr/bin/env bash
+
 set -eux -o pipefail
+
 : "${CHART_FILE?required}"
+: "${CHART_NAME:="$(basename "${CHART_FILE%%-chart.yml}")"}"
+: "${CHART_URL:="${CHART_REPO:="https://rke2-charts.rancher.io"}/assets/${CHART_NAME}/${CHART_NAME}-${CHART_VERSION:="v0.0.0"}.tgz"}"
+curl -fsSL "${CHART_URL}" -o "${CHART_TMP:=$(mktemp)}"
 cat <<-EOF > "${CHART_FILE}"
 apiVersion: helm.cattle.io/v1
 kind: HelmChart
 metadata:
-  name: "${CHART_NAME:="$(basename "${CHART_FILE%%-chart.yml}")"}"
+  name: "${CHART_NAME}"
   namespace: "${CHART_NAMESPACE:="kube-system"}"
   annotations:
-    helm.cattle.io/chart-url: "${CHART_URL:="${CHART_REPO:="https://rke2-charts.rancher.io"}/assets/${CHART_NAME}/${CHART_NAME}-${CHART_VERSION:="v0.0.0"}.tgz"}"
+    helm.cattle.io/chart-url: "${CHART_URL}"
 spec:
   bootstrap: ${CHART_BOOTSTRAP:=false}
-  chartContent: $(curl -fsSL "${CHART_URL}" | base64 -w0)
+  chartContent: $(base64 -w0 < "${CHART_TMP}")
 EOF