From 6a5f2fb6025bfd342842d3cd7e5dd97cb382d680 Mon Sep 17 00:00:00 2001
From: Khue Doan <khuedoan98@gmail.com>
Date: Sun, 13 Jun 2021 19:06:53 +0700
Subject: [PATCH 1/3] Move Longhorn back to infra layer

Due to race condition
---
 apps/kustomization.yaml      |  1 -
 apps/resources/longhorn.yaml | 21 ---------------------
 infra/bootstrap.tf           | 10 ++++++++++
 3 files changed, 10 insertions(+), 22 deletions(-)
 delete mode 100644 apps/resources/longhorn.yaml

diff --git a/apps/kustomization.yaml b/apps/kustomization.yaml
index 8ef4298b..32300992 100644
--- a/apps/kustomization.yaml
+++ b/apps/kustomization.yaml
@@ -6,7 +6,6 @@ resources:
 - resources/cert-manager.yaml
 - resources/descheduler.yaml
 - resources/kured.yaml
-- resources/longhorn.yaml
 - resources/metallb.yaml
 - resources/nginx.yaml
 - resources/node-problem-detector.yaml
diff --git a/apps/resources/longhorn.yaml b/apps/resources/longhorn.yaml
deleted file mode 100644
index 7d89a59a..00000000
--- a/apps/resources/longhorn.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: longhorn
-spec:
-  destination:
-    name: in-cluster
-    namespace: longhorn-system
-    server: ''
-  source:
-    path: ''
-    repoURL: 'https://charts.longhorn.io'
-    targetRevision: 1.1.0
-    chart: longhorn
-  project: default
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-    syncOptions:
-      - CreateNamespace=true
diff --git a/infra/bootstrap.tf b/infra/bootstrap.tf
index 15d0930c..f47ec763 100644
--- a/infra/bootstrap.tf
+++ b/infra/bootstrap.tf
@@ -18,3 +18,13 @@ resource "helm_release" "argocd" {
 
   wait = true
 }
+
+resource "helm_release" "longhorn" {
+  name             = "longhorn"
+  repository       = "https://charts.longhorn.io"
+  chart            = "longhorn"
+  version          = "1.1.1"
+  namespace        = "longhorn"
+  create_namespace = true
+  wait             = true
+}

From 4d49bf68d4b2ecf89065c5c8c6c731f40fe36385 Mon Sep 17 00:00:00 2001
From: Khue Doan <khuedoan98@gmail.com>
Date: Sun, 13 Jun 2021 18:53:56 +0700
Subject: [PATCH 2/3] Fix incompatible descheduler version

---
 apps/resources/descheduler.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/resources/descheduler.yaml b/apps/resources/descheduler.yaml
index 49619cdf..a90bde46 100644
--- a/apps/resources/descheduler.yaml
+++ b/apps/resources/descheduler.yaml
@@ -10,7 +10,7 @@ spec:
   source:
     path: ''
     repoURL: 'https://kubernetes-sigs.github.io/descheduler/'
-    targetRevision: 0.21.0
+    targetRevision: 0.20.0
     chart: descheduler
   project: default
   syncPolicy:

From edcb392b2287cbcd398366815a570beb30c53950 Mon Sep 17 00:00:00 2001
From: Khue Doan <khuedoan98@gmail.com>
Date: Sun, 13 Jun 2021 16:46:26 +0700
Subject: [PATCH 3/3] Upgrade ArgoCD

---
 infra/bootstrap.tf | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/infra/bootstrap.tf b/infra/bootstrap.tf
index f47ec763..7b04df92 100644
--- a/infra/bootstrap.tf
+++ b/infra/bootstrap.tf
@@ -8,15 +8,13 @@ provider "helm" {
 }
 
 resource "helm_release" "argocd" {
-  name       = "argocd"
-  repository = "https://argoproj.github.io/argo-helm"
-  chart      = "argo-cd"
-  version    = "3.1.2"
-
+  name             = "argocd"
+  repository       = "https://argoproj.github.io/argo-helm"
+  chart            = "argo-cd"
+  version          = "3.6.8"
   namespace        = "argocd"
   create_namespace = true
-
-  wait = true
+  wait             = true
 }
 
 resource "helm_release" "longhorn" {