Merge branch 'main' into fharper/vpa

konstructio · Feb 29, 2024 · 33dad29 · 33dad29
2 parents a15050c + ffcef8a
commit 33dad29
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 26 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -6,6 +6,8 @@ metadata:
   namespace: argocd
   annotations:
     argocd.argoproj.io/sync-wave: '100'
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
 spec:
   project: default
   source: