From 5fb1e8442869eb2baae3b2dcb35e65ed2f09c9bb Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Thu, 1 Feb 2024 11:04:24 +0100 Subject: [PATCH] fix: make generate.sh more robust --- argo/kustomize-helm-with-rewrite/generate.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/argo/kustomize-helm-with-rewrite/generate.sh b/argo/kustomize-helm-with-rewrite/generate.sh index d7635571..35f63985 100644 --- a/argo/kustomize-helm-with-rewrite/generate.sh +++ b/argo/kustomize-helm-with-rewrite/generate.sh @@ -11,8 +11,10 @@ if [ -d chart ]; then CHART=chart elif [ -f chart -a "$PARAM_CHART" = "." ]; then CHART=$(cat chart) -else +elif [ -n "$PARAM_CHART" ]; then CHART=$PARAM_CHART +else + CHART="." fi [ -f chart/values.yaml ] && VALUES="-f chart/values.yaml" @@ -21,6 +23,7 @@ fi VALUES="$VALUES -f parameters.yaml" mkdir -p base +echo "helm template $PARAM_FLAGS $VALUES $ARGOCD_APP_NAME $CHART" > /tmp/$ARGOCD_APP_NAME-helm.sh helm template $PARAM_FLAGS $VALUES $ARGOCD_APP_NAME $CHART > ./base/_manifest.yaml sed -i "$PARAM_REWRITE" ./base/_manifest.yaml