From 5b81fafebf48c6f20808bc85fae2303f23382808 Mon Sep 17 00:00:00 2001
From: Cedric Verstraeten <cverstraeten@uug.ai>
Date: Sun, 1 Dec 2024 19:21:00 +0100
Subject: [PATCH] introduce wait for job service + helm charts per overlay

---
 .gitignore                                    |  2 +-
 .../hub/kerberos-hub-import-database-job.yaml |  4 +-
 base/kustomization.yaml                       | 20 ----------
 overlays/standalone/kustomization.yaml        | 39 +++++++++++--------
 4 files changed, 26 insertions(+), 39 deletions(-)

diff --git a/.gitignore b/.gitignore
index f9a1065..a55e846 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-base/charts
\ No newline at end of file
+**/charts
\ No newline at end of file
diff --git a/base/hub/kerberos-hub-import-database-job.yaml b/base/hub/kerberos-hub-import-database-job.yaml
index 1399766..ee327f8 100644
--- a/base/hub/kerberos-hub-import-database-job.yaml
+++ b/base/hub/kerberos-hub-import-database-job.yaml
@@ -3,11 +3,13 @@ kind: Job
 metadata:
   name: hub-import-database-job
 spec:
-  backoffLimit: 4 # Number of retries before considering a Job as failed
   ttlSecondsAfterFinished: 60  # Job will be deleted 60 seconds after completion
   template:
     spec:
       initContainers:
+      - name: wait-for-mongodb-before-starup
+        image: busybox
+        command:  ["sh", "-c", "until nc -z mongodb.mongodb 27017 > /dev/null; do echo Waiting for master.; sleep 2; done;"]
       - name: copy-config
         image: busybox
         command: ['sh', '-c', 'echo "$IMPORT_FILE" > /data/hub-import.js']
diff --git a/base/kustomization.yaml b/base/kustomization.yaml
index 4b28cf3..1e64265 100644
--- a/base/kustomization.yaml
+++ b/base/kustomization.yaml
@@ -2,26 +2,6 @@ helmCharts:
   - name: openebs
     releaseName: openebs
     repo: https://openebs.github.io/charts
-  - name: mongodb
-    releaseName: mongodb
-    namespace: mongodb
-    repo: oci://registry-1.docker.io/bitnamicharts
-    valuesFile: mongodb/mongodb-values.yaml
-  - name: rabbitmq
-    releaseName: rabbitmq
-    namespace: rabbitmq
-    repo: oci://registry-1.docker.io/bitnamicharts
-    valuesFile: rabbitmq/rabbitmq-values.yaml
-  - name: vernemq
-    releaseName: vernemq
-    namespace: vernemq
-    repo: https://vernemq.github.io/docker-vernemq
-    valuesFile: vernemq/vernemq-values.yaml
-  - name: hub
-    releaseName: hub
-    namespace: kerberos-hub
-    repo: https://charts.kerberos.io
-    valuesFile: hub/kerberos-hub-values.yaml
 
 resources:
   - namespaces.yaml
diff --git a/overlays/standalone/kustomization.yaml b/overlays/standalone/kustomization.yaml
index 03befbc..6cadbba 100644
--- a/overlays/standalone/kustomization.yaml
+++ b/overlays/standalone/kustomization.yaml
@@ -2,20 +2,25 @@ metadata:
   name: standalone
 resources:
   - ../../base
-patches:
-  - target:
-      kind: Ingress
-      name: hub-api-ingress
-    patch: |-
-      - op: replace
-        path: /spec/tls/0/secretName
-        value: pr54-api
-      - op: replace
-        path: /spec/tls/0/hosts/0
-        value: pr54.api.kerberos.lol
-      - op: replace
-        path: /spec/rules/0/host
-        value: pr54.api.kerberos.lol
-      - op: replace
-        path: /spec/rules/0/http/paths/0/backend/service/name
-        value: pr54-hub-api-svc
\ No newline at end of file
+
+helmCharts:
+  - name: mongodb
+    releaseName: mongodb
+    namespace: mongodb
+    repo: oci://registry-1.docker.io/bitnamicharts
+    valuesFile: ../../base/mongodb/mongodb-values.yaml
+  - name: rabbitmq
+    releaseName: rabbitmq
+    namespace: rabbitmq
+    repo: oci://registry-1.docker.io/bitnamicharts
+    valuesFile: ../../base/rabbitmq/rabbitmq-values.yaml
+  - name: vernemq
+    releaseName: vernemq
+    namespace: vernemq
+    repo: https://vernemq.github.io/docker-vernemq
+    valuesFile: ../../base/vernemq/vernemq-values.yaml
+  - name: hub
+    releaseName: hub
+    namespace: kerberos-hub
+    repo: https://charts.kerberos.io
+    valuesFile: ../../base/hub/kerberos-hub-values.yaml
\ No newline at end of file