From 561b23541fce97e96e167123fc7f205b296a10b4 Mon Sep 17 00:00:00 2001 From: Maurice Faber Date: Fri, 13 Nov 2020 22:41:46 +0100 Subject: [PATCH] revert: skip-cleanup not working as expected, drone re-enabled --- bin/otomi | 4 ++-- helmfile.d/helmfile-30.admin.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/otomi b/bin/otomi index 67ebef23ee..5fc000c5d0 100755 --- a/bin/otomi +++ b/bin/otomi @@ -305,13 +305,13 @@ function execute() { sync) validate_cluster_env set -o pipefail - drun helmfile -e $CLOUD-$CLUSTER $@ sync --skip-cleanup --skip-deps | grep -Ev $helmfileOutputHide + drun helmfile -e $CLOUD-$CLUSTER $@ sync --skip-deps | grep -Ev $helmfileOutputHide ;; template) check_kube_context=0 validate_cluster_env set -o pipefail - drun helmfile -e $CLOUD-$CLUSTER --skip-cleanup --quiet $@ template --skip-deps | grep -Ev $helmfileOutputHide + drun helmfile -e $CLOUD-$CLUSTER --quiet $@ template --skip-deps | grep -Ev $helmfileOutputHide ;; rotate-keys) check_sops_file diff --git a/helmfile.d/helmfile-30.admin.yaml b/helmfile.d/helmfile-30.admin.yaml index b5eb7e600b..1977772d96 100644 --- a/helmfile.d/helmfile-30.admin.yaml +++ b/helmfile.d/helmfile-30.admin.yaml @@ -7,11 +7,11 @@ bases: releases: - name: drone - installed: {{ $c | get "drone.enabled" false }} + installed: {{ $c | get "drone.enabled" true }} namespace: team-admin <<: *default - name: drone-admit-members - installed: {{ and ($c | get "drone.enabled" false) (eq ($c | get "drone.sourceControl.provider") "github") }} + installed: {{ and ($c | get "drone.enabled" true) (eq ($c | get "drone.sourceControl.provider") "github") }} namespace: team-admin chart: ../charts/drone-admit-members values: