From ffcef8ac9de04f0050706a17028724f5b85ed27c Mon Sep 17 00:00:00 2001
From: John Dietz <john@kubefirst.com>
Date: Thu, 29 Feb 2024 12:41:39 -0500
Subject: [PATCH] feat: ingress split on flappy-kray and addition of ingress on
 goldilocks (#121)

* fix: ingress split on flappy-kray and addition of ingress on goldilocks

* fix: linting fixes

* svc correction

* namespace correction for goldilocks ingress

* adding finalizers
---
 .../components/flappy-kray/application.yaml   | 26 -------------------
 .../components/flappy-kray/ingress.yaml       | 26 +++++++++++++++++++
 goldilocks/components/goldilocks/ingress.yaml | 26 +++++++++++++++++++
 goldilocks/goldilocks.yaml                    |  2 ++
 metrics-server/metrics-server.yaml            |  2 ++
 .../vertical-pod-autoscaler.yaml              |  2 ++
 6 files changed, 58 insertions(+), 26 deletions(-)
 create mode 100644 flappy-kray/components/flappy-kray/ingress.yaml
 create mode 100644 goldilocks/components/goldilocks/ingress.yaml

diff --git a/flappy-kray/components/flappy-kray/application.yaml b/flappy-kray/components/flappy-kray/application.yaml
index 5237611..f4e63d2 100644
--- a/flappy-kray/components/flappy-kray/application.yaml
+++ b/flappy-kray/components/flappy-kray/application.yaml
@@ -29,29 +29,3 @@ spec:
     automated:
       prune: true
       selfHeal: true
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt-prod
-    argocd.argoproj.io/sync-wave: '1'
-  name: flappy-kray
-  namespace: argocd
-spec:
-  ingressClassName: nginx
-  rules:
-    - host: flappy-kray.<DOMAIN_NAME>
-      http:
-        paths:
-          - backend:
-              service:
-                name: flappy-kray
-                port:
-                  number: 80
-            path: /
-            pathType: Prefix
-  tls:
-    - hosts:
-        - flappy-kray.<DOMAIN_NAME>
-      secretName: flappy-kray-tls
diff --git a/flappy-kray/components/flappy-kray/ingress.yaml b/flappy-kray/components/flappy-kray/ingress.yaml
new file mode 100644
index 0000000..482b768
--- /dev/null
+++ b/flappy-kray/components/flappy-kray/ingress.yaml
@@ -0,0 +1,26 @@
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt-prod
+    argocd.argoproj.io/sync-wave: '1'
+  name: flappy-kray
+  namespace: argocd
+spec:
+  ingressClassName: nginx
+  rules:
+    - host: flappy-kray.<DOMAIN_NAME>
+      http:
+        paths:
+          - backend:
+              service:
+                name: flappy-kray
+                port:
+                  number: 80
+            path: /
+            pathType: Prefix
+  tls:
+    - hosts:
+        - flappy-kray.<DOMAIN_NAME>
+      secretName: flappy-kray-tls
diff --git a/goldilocks/components/goldilocks/ingress.yaml b/goldilocks/components/goldilocks/ingress.yaml
new file mode 100644
index 0000000..c7a2272
--- /dev/null
+++ b/goldilocks/components/goldilocks/ingress.yaml
@@ -0,0 +1,26 @@
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt-prod
+    argocd.argoproj.io/sync-wave: '1'
+  name: goldilocks
+  namespace: goldilocks
+spec:
+  ingressClassName: nginx
+  rules:
+    - host: goldilocks.<DOMAIN_NAME>
+      http:
+        paths:
+          - backend:
+              service:
+                name: <CLUSTER_NAME>-goldilocks-dashboard
+                port:
+                  number: 80
+            path: /
+            pathType: Prefix
+  tls:
+    - hosts:
+        - goldilocks.<DOMAIN_NAME>
+      secretName: goldilocks-tls
diff --git a/goldilocks/goldilocks.yaml b/goldilocks/goldilocks.yaml
index e7365aa..19cc021 100644
--- a/goldilocks/goldilocks.yaml
+++ b/goldilocks/goldilocks.yaml
@@ -4,6 +4,8 @@ kind: Application
 metadata:
   name: <CLUSTER_NAME>-goldilocks-components
   namespace: argocd
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/sync-wave: '100'
 spec:
diff --git a/metrics-server/metrics-server.yaml b/metrics-server/metrics-server.yaml
index 39306b5..aa6cf2b 100644
--- a/metrics-server/metrics-server.yaml
+++ b/metrics-server/metrics-server.yaml
@@ -4,6 +4,8 @@ kind: Application
 metadata:
   name: <CLUSTER_NAME>-metrics-server-components
   namespace: argocd
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
   annotations:
     argocd.argoproj.io/sync-wave: '100'
 spec:
diff --git a/vertical-pod-autoscaler/vertical-pod-autoscaler.yaml b/vertical-pod-autoscaler/vertical-pod-autoscaler.yaml
index 061537a..42e5cec 100644
--- a/vertical-pod-autoscaler/vertical-pod-autoscaler.yaml
+++ b/vertical-pod-autoscaler/vertical-pod-autoscaler.yaml
@@ -6,6 +6,8 @@ metadata:
   namespace: argocd
   annotations:
     argocd.argoproj.io/sync-wave: '100'
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
 spec:
   project: default
   source: