From c85fe8242918ed86b80c50c3df7964b6548b7774 Mon Sep 17 00:00:00 2001
From: Jonas Juselius <jonas.juselius@oceanbox.io>
Date: Tue, 30 Jan 2024 19:31:55 +0100
Subject: [PATCH] refactor: move stuff around mostly

---
 busynix/applicationset.yaml                             | 2 +-
 dex/application.yaml                                    | 7 +++----
 geoserver/application.yaml                              | 7 +++----
 redis/application.yaml                                  | 8 ++++++++
 k1/redis-nodeport.yaml => redis/manifests/nodeport.yaml | 0
 {k1 => wordpress}/oceanbox-wp.yaml                      | 0
 6 files changed, 15 insertions(+), 9 deletions(-)
 rename k1/redis-nodeport.yaml => redis/manifests/nodeport.yaml (100%)
 rename {k1 => wordpress}/oceanbox-wp.yaml (100%)

diff --git a/busynix/applicationset.yaml b/busynix/applicationset.yaml
index 72c4e9d0..e542f305 100644
--- a/busynix/applicationset.yaml
+++ b/busynix/applicationset.yaml
@@ -17,10 +17,10 @@ spec:
     metadata:
       name: '{{ env }}-busynix'
     spec:
+      project: atlantis
       destination:
         namespace: oceanbox
         server: '{{ cluster }}'
-      project: atlantis
       source:
         path: busynix
         plugin:
diff --git a/dex/application.yaml b/dex/application.yaml
index bc9ccad9..3ebdeb89 100644
--- a/dex/application.yaml
+++ b/dex/application.yaml
@@ -5,6 +5,9 @@ metadata:
   namespace: argocd
 spec:
   project: atlantis
+  destination:
+    server: https://kubernetes.default.svc
+    namespace: atlantis
   source:
     repoURL: https://charts.dexidp.io
     targetRevision: 0.16.0
@@ -65,7 +68,3 @@ spec:
         serviceMonitor:
           enabled: true
 
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: atlantis
-
diff --git a/geoserver/application.yaml b/geoserver/application.yaml
index 8c817d1c..448a2b26 100644
--- a/geoserver/application.yaml
+++ b/geoserver/application.yaml
@@ -5,6 +5,9 @@ metadata:
   namespace: argocd
 spec:
   project: gis
+  destination:
+    server: https://kubernetes.default.svc
+    namespace: geoserver
   source:
     repoURL: https://gitlab.com/oceanbox/charts.git
     targetRevision: HEAD
@@ -20,7 +23,3 @@ spec:
         string: "--skip-tests"
       - name: chart
         string: ncsa/geoserver
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: geoserver
-
diff --git a/redis/application.yaml b/redis/application.yaml
index 908e4e73..b27c6cfe 100644
--- a/redis/application.yaml
+++ b/redis/application.yaml
@@ -14,4 +14,12 @@ spec:
     chart: redis
     helm:
       values: |
+        architecture: replication
+        auth:
+          enabled: true
+          sentinel: true
+          password: ""
+          existingSecret: ""
+          existingSecretPasswordKey: ""
+          usePasswordFiles: false
 
diff --git a/k1/redis-nodeport.yaml b/redis/manifests/nodeport.yaml
similarity index 100%
rename from k1/redis-nodeport.yaml
rename to redis/manifests/nodeport.yaml
diff --git a/k1/oceanbox-wp.yaml b/wordpress/oceanbox-wp.yaml
similarity index 100%
rename from k1/oceanbox-wp.yaml
rename to wordpress/oceanbox-wp.yaml