From 0036b77a28b4ae455a7e24b7e12e704c42f54fd4 Mon Sep 17 00:00:00 2001
From: Khue Doan <khuedoan98@gmail.com>
Date: Sun, 13 Jun 2021 19:06:53 +0700
Subject: [PATCH] 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 929bbd5f..7b04df92 100644
--- a/infra/bootstrap.tf
+++ b/infra/bootstrap.tf
@@ -16,3 +16,13 @@ resource "helm_release" "argocd" {
   create_namespace = true
   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
+}