From 7739d75450babaebad296c23dcc03aa141508cac Mon Sep 17 00:00:00 2001
From: Victor Barba Martin <victor.barba@navigaglobal.com>
Date: Sun, 31 Oct 2021 17:25:56 +0100
Subject: [PATCH] add aplications to kustomization

---
 k8s/applications/applications.yaml    |  1 -
 k8s/applications/external-dns.yaml    |  5 ++---
 k8s/applications/haproxy-ingress.yaml |  5 ++---
 k8s/applications/ingress-nginx.yaml   |  5 ++---
 k8s/applications/kustomization.yaml   |  1 -
 k8s/applications/metrics-server.yaml  |  5 ++---
 terraform/kubernetes.tf               | 12 ++++++++++++
 7 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/k8s/applications/applications.yaml b/k8s/applications/applications.yaml
index e255b4c..da94f2d 100644
--- a/k8s/applications/applications.yaml
+++ b/k8s/applications/applications.yaml
@@ -2,7 +2,6 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: applications
-  namespace: argocd
 spec:
   destination:
     name: ''
diff --git a/k8s/applications/external-dns.yaml b/k8s/applications/external-dns.yaml
index 0fbe0bb..ba2f451 100644
--- a/k8s/applications/external-dns.yaml
+++ b/k8s/applications/external-dns.yaml
@@ -3,9 +3,6 @@ kind: Application
 metadata:
   name: external-dns
 spec:
-  syncPolicy:
-    syncOptions:
-    - CreateNamespace=true 
   destination:
     name: ''
     namespace: external-dns
@@ -16,6 +13,8 @@ spec:
     targetRevision: HEAD
   project: default
   syncPolicy:
+    syncOptions:
+      - CreateNamespace=true 
     automated: 
       prune: true 
       allowEmpty: false
diff --git a/k8s/applications/haproxy-ingress.yaml b/k8s/applications/haproxy-ingress.yaml
index dea2add..924f2ac 100644
--- a/k8s/applications/haproxy-ingress.yaml
+++ b/k8s/applications/haproxy-ingress.yaml
@@ -3,9 +3,6 @@ kind: Application
 metadata:
   name: haproxy-ingress
 spec:
-  syncPolicy:
-    syncOptions:
-    - CreateNamespace=true 
   destination:
     name: ''
     namespace: haproxy-ingress
@@ -21,6 +18,8 @@ spec:
         prometheus-port: "9105"
   project: default
   syncPolicy:
+    syncOptions:
+      - CreateNamespace=true 
     automated: 
       prune: true 
       allowEmpty: false
diff --git a/k8s/applications/ingress-nginx.yaml b/k8s/applications/ingress-nginx.yaml
index 37b373c..8221c40 100644
--- a/k8s/applications/ingress-nginx.yaml
+++ b/k8s/applications/ingress-nginx.yaml
@@ -3,9 +3,6 @@ kind: Application
 metadata:
   name: ingress-nginx
 spec:
-  syncPolicy:
-    syncOptions:
-    - CreateNamespace=true 
   destination:
     name: ''
     namespace: ingress-nginx
@@ -17,6 +14,8 @@ spec:
     chart: ingress-nginx
   project: default
   syncPolicy:
+    syncOptions:
+      - CreateNamespace=true 
     automated: 
       prune: true 
       allowEmpty: false
diff --git a/k8s/applications/kustomization.yaml b/k8s/applications/kustomization.yaml
index fd48675..862ebbc 100644
--- a/k8s/applications/kustomization.yaml
+++ b/k8s/applications/kustomization.yaml
@@ -4,7 +4,6 @@ kind: Kustomization
 namespace: argocd
 
 resources:
-  - applications.yaml
   - haproxy-ingress.yaml
   - argocd.yaml
   - cert-manager.yaml
diff --git a/k8s/applications/metrics-server.yaml b/k8s/applications/metrics-server.yaml
index 56a98ee..5de4849 100644
--- a/k8s/applications/metrics-server.yaml
+++ b/k8s/applications/metrics-server.yaml
@@ -3,9 +3,6 @@ kind: Application
 metadata:
   name: metrics-server
 spec:
-  syncPolicy:
-    syncOptions:
-    - CreateNamespace=true 
   destination:
     name: ''
     namespace: metrics-server
@@ -24,6 +21,8 @@ spec:
           kubelet-insecure-tls: true
   project: default
   syncPolicy:
+    syncOptions:
+      - CreateNamespace=true 
     automated: 
       prune: true 
       allowEmpty: false
diff --git a/terraform/kubernetes.tf b/terraform/kubernetes.tf
index 9fcb6cd..c5767fa 100644
--- a/terraform/kubernetes.tf
+++ b/terraform/kubernetes.tf
@@ -62,9 +62,21 @@ data "kustomization_build" "argocd" {
   path       = "../k8s/argocd/overlays/staging"
 }
 
+data "kustomization_build" "applications" {
+  depends_on = [kubernetes_namespace.argocd]
+  path       = "../k8s/applications"
+}
+
 resource "kustomization_resource" "argocd" {
   depends_on = [kubernetes_namespace.argocd]
   for_each   = data.kustomization_build.argocd.ids
 
   manifest = data.kustomization_build.argocd.manifests[each.value]
 }
+
+resource "kustomization_resource" "applications" {
+  depends_on = [kustomization_resource.applications]
+  for_each   = data.kustomization_build.applications.ids
+
+  manifest = data.kustomization_build.applications.manifests[each.value]
+}