From 47e77091eb0f3ebd56e7654a322512bf76cdb8b7 Mon Sep 17 00:00:00 2001
From: Pierre Mavro <pmavro@qovery.com>
Date: Tue, 11 May 2021 15:07:05 +0200
Subject: [PATCH] fix: fixed DO deployment issues due to recent feature flags

---
 lib/digitalocean/bootstrap/helm-cert-manager.j2.tf  | 2 ++
 lib/digitalocean/bootstrap/helm-grafana.j2.tf       | 2 +-
 lib/digitalocean/bootstrap/helm-qovery-engine.j2.tf | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/digitalocean/bootstrap/helm-cert-manager.j2.tf b/lib/digitalocean/bootstrap/helm-cert-manager.j2.tf
index 2e1a683a..c45f88fd 100644
--- a/lib/digitalocean/bootstrap/helm-cert-manager.j2.tf
+++ b/lib/digitalocean/bootstrap/helm-cert-manager.j2.tf
@@ -104,7 +104,9 @@ resource "helm_release" "cert_manager" {
 
   depends_on = [
     digitalocean_kubernetes_cluster.kubernetes_cluster,
+    {% if metrics_history_enabled %}
     helm_release.prometheus_operator,
+    {% endif %}
   ]
 }
 
diff --git a/lib/digitalocean/bootstrap/helm-grafana.j2.tf b/lib/digitalocean/bootstrap/helm-grafana.j2.tf
index 49651354..87f3c743 100644
--- a/lib/digitalocean/bootstrap/helm-grafana.j2.tf
+++ b/lib/digitalocean/bootstrap/helm-grafana.j2.tf
@@ -40,7 +40,7 @@ resource "helm_release" "grafana" {
 
   depends_on = [
     digitalocean_kubernetes_cluster.kubernetes_cluster,
-    {% if metrics_history_enabled %
+    {% if metrics_history_enabled %}
     helm_release.prometheus_operator,
     {% endif %}
     helm_release.q_storageclass,
diff --git a/lib/digitalocean/bootstrap/helm-qovery-engine.j2.tf b/lib/digitalocean/bootstrap/helm-qovery-engine.j2.tf
index cc71b744..3fc1aff8 100644
--- a/lib/digitalocean/bootstrap/helm-qovery-engine.j2.tf
+++ b/lib/digitalocean/bootstrap/helm-qovery-engine.j2.tf
@@ -10,7 +10,6 @@ resource "helm_release" "qovery_engine_resources" {
   create_namespace = true
   max_history = 50
   timeout = 600
-  recreate_pods = true
 
   // need kubernetes 1.18, should be well tested before activating it
   set {