diff --git a/bin/helmify b/bin/helmify index 2206531d..55d7ca2b 100755 --- a/bin/helmify +++ b/bin/helmify @@ -7,11 +7,6 @@ manifests=${4:-manifests} outdir=${5:-_manifests} build() { - if [ ! -e "$manifests" ]; then - echo "nothing to do here..." 1>&2 - exit 0 - fi - mkdir -p $outdir/templates echo "generating $outdir/Chart.yaml" 1>&2 @@ -26,7 +21,7 @@ EOF if [ -d $manifests ]; then cp -r $manifests/* $outdir/templates -else +elif [ -f $manifests ]; then cp $manifests $outdir/templates fi } diff --git a/helmfile.d/atlantis.yaml.gotmpl b/helmfile.d/atlantis.yaml.gotmpl index e0b91216..120abbb1 100644 --- a/helmfile.d/atlantis.yaml.gotmpl +++ b/helmfile.d/atlantis.yaml.gotmpl @@ -1,17 +1,13 @@ bases: - ../envs/environments.yaml.gotmpl -repositories: -- name: atlantis - url: ../charts/atlantis - commonLabels: tier: atlantis releases: - name: atlantis namespace: {{ .Environment.Name }}-atlantis - chart: atlantis/atlantis + chart: ../charts/atlantis condition: atlantis.enabled values: - ../values/atlantis/values/atlantis.yaml.gotmpl @@ -24,6 +20,7 @@ releases: namespace: {{ .Environment.Name }}-atlantis chart: _atlantis-manifests condition: atlantis.enabled + missingFileHandler: Info values: - ../values/values-{{ requiredEnv "CLUSTER_NAME" }}.yaml - ../values/atlantis/values.yaml.gotmpl @@ -36,12 +33,13 @@ releases: - '{{`{{ if eq .Event.Name "prepare" }}build{{ else }}clean{{ end }}`}}' - '{{`{{ .Release.Chart }}`}}' - '{{`{{ .Environment.Name }}`}}' - - ../values/atlantis/atlantis-manifests + - ../values/atlantis/manifests - _atlantis-manifests - name: atlantis-app namespace: argocd chart: _atlantis-app condition: atlantis.enabled + missingFileHandler: Info values: - ../values/values-{{ requiredEnv "CLUSTER_NAME" }}.yaml - ../values/atlantis/values.yaml.gotmpl