From c317931f9ce758638a91e362065be2a30d0963da Mon Sep 17 00:00:00 2001
From: "Dustin C. Hatch" <dustin@hatch.name>
Date: Sat, 14 Oct 2023 07:40:14 -0500
Subject: [PATCH] firefly-iii: Set instance label for Argo CD

Argo CD wants every resource managed by an application to have that
application's name as the value of the `app.kubernetes.io/instance`
label.
---
 firefly-iii/importer.yaml      | 20 ++++++++++----------
 firefly-iii/ingress.yaml       |  3 ++-
 firefly-iii/kustomization.yaml |  4 ++++
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/firefly-iii/importer.yaml b/firefly-iii/importer.yaml
index 830da03..401f0db 100644
--- a/firefly-iii/importer.yaml
+++ b/firefly-iii/importer.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   labels:
     app.kubernetes.io/component: firefly-iii-importer
-    app.kubernetes.io/instance: dustin
+    app.kubernetes.io/instance: firefly-iii
     app.kubernetes.io/name: firefly-iii-importer-dustin
     app.kubernetes.io/part-of: firefly-iii
   name: firefly-iii-importer-dustin
@@ -13,7 +13,7 @@ spec:
     name: http
   selector:
     app.kubernetes.io/component: firefly-iii-importer
-    app.kubernetes.io/instance: dustin
+    app.kubernetes.io/instance: firefly-iii
     app.kubernetes.io/name: firefly-iii-importer-dustin
 
 ---
@@ -22,7 +22,7 @@ kind: Service
 metadata:
   labels:
     app.kubernetes.io/component: firefly-iii-importer
-    app.kubernetes.io/instance: tabitha
+    app.kubernetes.io/instance: firefly-iii
     app.kubernetes.io/name: firefly-iii-importer-tabitha
     app.kubernetes.io/part-of: firefly-iii
   name: firefly-iii-importer-tabitha
@@ -32,7 +32,7 @@ spec:
     name: http
   selector:
     app.kubernetes.io/component: firefly-iii-importer
-    app.kubernetes.io/instance: tabitha
+    app.kubernetes.io/instance: firefly-iii
     app.kubernetes.io/name: firefly-iii-importer-tabitha
 
 ---
@@ -42,7 +42,7 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/component: firefly-iii-importer
-    app.kubernetes.io/instance: dustin
+    app.kubernetes.io/instance: firefly-iii
     app.kubernetes.io/name: firefly-iii-importer-dustin
     app.kubernetes.io/part-of: firefly-iii
   name: firefly-iii-importer-dustin
@@ -50,13 +50,13 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/component: firefly-iii-importer
-      app.kubernetes.io/instance: dustin
+      app.kubernetes.io/instance: firefly-iii
       app.kubernetes.io/name: firefly-iii-importer-dustin
   template:
     metadata:
       labels:
         app.kubernetes.io/component: firefly-iii-importer
-        app.kubernetes.io/instance: dustin
+        app.kubernetes.io/instance: firefly-iii
         app.kubernetes.io/name: firefly-iii-importer-dustin
         app.kubernetes.io/part-of: firefly-iii-importer
     spec:
@@ -85,7 +85,7 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/component: firefly-iii-importer
-    app.kubernetes.io/instance: tabitha
+    app.kubernetes.io/instance: firefly-iii
     app.kubernetes.io/name: firefly-iii-importer-tabitha
     app.kubernetes.io/part-of: firefly-iii
   name: firefly-iii-importer-tabitha
@@ -93,13 +93,13 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/component: firefly-iii-importer
-      app.kubernetes.io/instance: tabitha
+      app.kubernetes.io/instance: firefly-iii
       app.kubernetes.io/name: firefly-iii-importer-tabitha
   template:
     metadata:
       labels:
         app.kubernetes.io/component: firefly-iii-importer
-        app.kubernetes.io/instance: tabitha
+        app.kubernetes.io/instance: firefly-iii
         app.kubernetes.io/name: firefly-iii-importer-tabitha
         app.kubernetes.io/part-of: firefly-iii-importer
     spec:
diff --git a/firefly-iii/ingress.yaml b/firefly-iii/ingress.yaml
index fb8102d..d810e93 100644
--- a/firefly-iii/ingress.yaml
+++ b/firefly-iii/ingress.yaml
@@ -13,9 +13,10 @@ metadata:
     nginx.ingress.kubernetes.io/auth-method: GET
     nginx.ingress.kubernetes.io/auth-url: http://authelia.authelia.svc.cluster.local:9091/api/verify
     nginx.ingress.kubernetes.io/auth-signin: https://auth.pyrocufflink.blue/?rm=$request_method
-    nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
     nginx.ingress.kubernetes.io/auth-snippet: |
       proxy_set_header X-Forwarded-Method $request_method;
+    nginx.ingress.kubernetes.io/configuration-snippet: |
+      proxy_set_header Remote-User dustin;
 spec:
   ingressClassName: nginx
   tls:
diff --git a/firefly-iii/kustomization.yaml b/firefly-iii/kustomization.yaml
index 060c697..9e6e787 100644
--- a/firefly-iii/kustomization.yaml
+++ b/firefly-iii/kustomization.yaml
@@ -1,6 +1,10 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
+labels:
+- pairs:
+    app.kubernetes.io/instance: firefly-iii
+
 namespace: firefly-iii
 
 resources: