From 1a9a5a90739115e73a86d88e98cfd91aa221e5df Mon Sep 17 00:00:00 2001
From: Victor Barba Martin <victor.barba@navigaglobal.com>
Date: Tue, 16 Nov 2021 17:19:58 +0100
Subject: [PATCH] add argocd helm

---
 k8s/applications/templates/argocd.yaml                       | 5 ++++-
 k8s/{argocd => argocd-old}/base/kustomization.yaml           | 0
 k8s/{argocd => argocd-old}/overlays/staging/hostname.yaml    | 0
 .../overlays/staging/kustomization.yaml                      | 0
 k8s/{argocd-helm => argocd}/Chart.yaml                       | 0
 k8s/{argocd-helm => argocd}/templates/ingress.yaml           | 0
 k8s/{argocd-helm => argocd}/values-staging.yaml              | 0
 7 files changed, 4 insertions(+), 1 deletion(-)
 rename k8s/{argocd => argocd-old}/base/kustomization.yaml (100%)
 rename k8s/{argocd => argocd-old}/overlays/staging/hostname.yaml (100%)
 rename k8s/{argocd => argocd-old}/overlays/staging/kustomization.yaml (100%)
 rename k8s/{argocd-helm => argocd}/Chart.yaml (100%)
 rename k8s/{argocd-helm => argocd}/templates/ingress.yaml (100%)
 rename k8s/{argocd-helm => argocd}/values-staging.yaml (100%)

diff --git a/k8s/applications/templates/argocd.yaml b/k8s/applications/templates/argocd.yaml
index d760fd7..2a57770 100644
--- a/k8s/applications/templates/argocd.yaml
+++ b/k8s/applications/templates/argocd.yaml
@@ -8,7 +8,10 @@ spec:
     namespace: argocd
     server: 'https://kubernetes.default.svc'
   source:
-    path: k8s/argocd/overlays/{{ .Values.environment }}
+    helm:
+      valueFiles:
+      - values-{{ .Values.environment }}.yaml
+    path: k8s/argocd
     repoURL: 'git@bitbucket.org:jamkazam/video-iac.git'
     targetRevision: HEAD
   project: default
diff --git a/k8s/argocd/base/kustomization.yaml b/k8s/argocd-old/base/kustomization.yaml
similarity index 100%
rename from k8s/argocd/base/kustomization.yaml
rename to k8s/argocd-old/base/kustomization.yaml
diff --git a/k8s/argocd/overlays/staging/hostname.yaml b/k8s/argocd-old/overlays/staging/hostname.yaml
similarity index 100%
rename from k8s/argocd/overlays/staging/hostname.yaml
rename to k8s/argocd-old/overlays/staging/hostname.yaml
diff --git a/k8s/argocd/overlays/staging/kustomization.yaml b/k8s/argocd-old/overlays/staging/kustomization.yaml
similarity index 100%
rename from k8s/argocd/overlays/staging/kustomization.yaml
rename to k8s/argocd-old/overlays/staging/kustomization.yaml
diff --git a/k8s/argocd-helm/Chart.yaml b/k8s/argocd/Chart.yaml
similarity index 100%
rename from k8s/argocd-helm/Chart.yaml
rename to k8s/argocd/Chart.yaml
diff --git a/k8s/argocd-helm/templates/ingress.yaml b/k8s/argocd/templates/ingress.yaml
similarity index 100%
rename from k8s/argocd-helm/templates/ingress.yaml
rename to k8s/argocd/templates/ingress.yaml
diff --git a/k8s/argocd-helm/values-staging.yaml b/k8s/argocd/values-staging.yaml
similarity index 100%
rename from k8s/argocd-helm/values-staging.yaml
rename to k8s/argocd/values-staging.yaml