diff --git a/argo/kustomize-helm-with-rewrite/generate.sh b/argo/kustomize-helm-with-rewrite/generate.sh index 99d40568..6d6c7cdd 100644 --- a/argo/kustomize-helm-with-rewrite/generate.sh +++ b/argo/kustomize-helm-with-rewrite/generate.sh @@ -9,8 +9,9 @@ cp parameters.yaml /tmp/$ARGOCD_APP_NAME-parameters.yaml if [ -d chart ]; then CHART=chart -elif [ -f chart -a "$PARAM_CHART" = "." ]; then +elif [ -f chart -o "$PARAM_CHART" = "." ]; then CHART=$(cat chart) + helm show values $CHART > values-base.yaml elif [ -n "$PARAM_CHART" ]; then CHART=$PARAM_CHART else @@ -18,6 +19,7 @@ else fi [ -f chart/values.yaml ] && VALUES="-f chart/values.yaml" +[ -f values-base.yaml ] && VALUES="$VALUES -f values-base.yaml" [ -f values.yaml ] && VALUES="$VALUES -f values.yaml" [ -f values-$PARAM_ENV.yaml ] && VALUES="$VALUES -f values-$PARAM_ENV.yaml" VALUES="$VALUES -f parameters.yaml" diff --git a/argo/kustomize-helm-with-rewrite/init.sh b/argo/kustomize-helm-with-rewrite/init.sh index 1ae3a962..99be1a0c 100644 --- a/argo/kustomize-helm-with-rewrite/init.sh +++ b/argo/kustomize-helm-with-rewrite/init.sh @@ -2,6 +2,8 @@ export HOME=/tmp +helm repo add oceanbox --password $OCEANBOX_HELM_ACCESS_TOKEN oceanbox https://gitlab.com/api/v4/projects/54396343/packages/helm/stabl + helm repo add bitnami https://charts.bitnami.com/bitnami helm repo add cerbos https://download.cerbos.dev/helm-charts helm repo add dapr https://dapr.github.io/helm-charts/