firefly-iii: Use a single Data Importer instance

Tabitha has decided not to use Firefly to manage her finances.  We've
mostly consolidated our expenses and income now, which I manage in my
Firefly account.  In fact, the Ingress for Firefly III itself always
sets the `Remote-User: dustin` header, so only my account is accessible
anyway.  Thus, there is no longer any reason to have two Data Importer
instances.

firefly-iii/importer-ingress.yaml

@@ -1,11 +1,11 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: firefly-iii-importer-dustin
+  name: firefly-iii-importer
   labels:
-    app.kubernetes.io/name: firefly-iii-importer-dustin
+    app.kubernetes.io/name: firefly-iii-importer
     app.kubernetes.io/component: firefly-iii-importer
-    app.kubernetes.io/instance: dustin
+    app.kubernetes.io/instance: firefly-iii
     app.kubernetes.io/part-of: firefly-iii-importer
   annotations:
     cert-manager.io/cluster-issuer: zerossl
@@ -23,53 +23,16 @@ spec:
   ingressClassName: nginx
   tls:
   - hosts:
-    - '*.import.firefly.pyrocufflink.blue'
+    - 'firefly-importer.pyrocufflink.blue'
-    secretName: firefly-import-cert
   rules:
-  - host: dustin.import.firefly.pyrocufflink.blue
+  - host: firefly-importer.pyrocufflink.blue
     http:
       paths:
       - path: /
         pathType: Prefix
         backend:
           service:
-            name: firefly-iii-importer-dustin
+            name: firefly-iii-importer
-            port:
-              name: http
-
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: firefly-iii-importer-tabitha
-  labels:
-    app.kubernetes.io/name: firefly-iii-importer-tabitha
-    app.kubernetes.io/component: firefly-iii-importer
-    app.kubernetes.io/instance: tabitha
-    app.kubernetes.io/part-of: firefly-iii-importer
-  annotations:
-    nginx.ingress.kubernetes.io/proxy-buffer-size: "8k"
-    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;
-spec:
-  ingressClassName: nginx
-  tls:
-  - hosts:
-    - '*.import.firefly.pyrocufflink.blue'
-    secretName: firefly-import-cert
-  rules:
-  - host: tabitha.import.firefly.pyrocufflink.blue
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: firefly-iii-importer-tabitha
             port:
               name: http
 

firefly-iii/importer.yaml

@@ -4,9 +4,9 @@ metadata:
   labels:
     app.kubernetes.io/component: firefly-iii-importer
     app.kubernetes.io/instance: firefly-iii
-    app.kubernetes.io/name: firefly-iii-importer-dustin
+    app.kubernetes.io/name: firefly-iii-importer
     app.kubernetes.io/part-of: firefly-iii
-  name: firefly-iii-importer-dustin
+  name: firefly-iii-importer
 spec:
   ports:
   - port: 8080
@@ -14,50 +14,30 @@ spec:
   selector:
     app.kubernetes.io/component: firefly-iii-importer
     app.kubernetes.io/instance: firefly-iii
-    app.kubernetes.io/name: firefly-iii-importer-dustin
+    app.kubernetes.io/name: firefly-iii-importer
 
 ---
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app.kubernetes.io/component: firefly-iii-importer
-    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
-spec:
-  ports:
-  - port: 8080
-    name: http
-  selector:
-    app.kubernetes.io/component: firefly-iii-importer
-    app.kubernetes.io/instance: firefly-iii
-    app.kubernetes.io/name: firefly-iii-importer-tabitha
-
----
-
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/component: firefly-iii-importer
     app.kubernetes.io/instance: firefly-iii
-    app.kubernetes.io/name: firefly-iii-importer-dustin
+    app.kubernetes.io/name: firefly-iii-importer
     app.kubernetes.io/part-of: firefly-iii
-  name: firefly-iii-importer-dustin
+  name: firefly-iii-importer
 spec:
   selector:
     matchLabels:
       app.kubernetes.io/component: firefly-iii-importer
       app.kubernetes.io/instance: firefly-iii
-      app.kubernetes.io/name: firefly-iii-importer-dustin
+      app.kubernetes.io/name: firefly-iii-importer
   template:
     metadata:
       labels:
         app.kubernetes.io/component: firefly-iii-importer
         app.kubernetes.io/instance: firefly-iii
-        app.kubernetes.io/name: firefly-iii-importer-dustin
+        app.kubernetes.io/name: firefly-iii-importer
         app.kubernetes.io/part-of: firefly-iii-importer
     spec:
       containers:
@@ -83,47 +63,3 @@ spec:
         ports:
         - containerPort: 8080
           name: http
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app.kubernetes.io/component: firefly-iii-importer
-    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
-spec:
-  selector:
-    matchLabels:
-      app.kubernetes.io/component: firefly-iii-importer
-      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: firefly-iii
-        app.kubernetes.io/name: firefly-iii-importer-tabitha
-        app.kubernetes.io/part-of: firefly-iii-importer
-    spec:
-      containers:
-      - name: firefly-iii
-        image: docker.io/fireflyiii/data-importer:version-1.2.2
-        envFrom:
-        - configMapRef:
-            name: firefly-iii-importer
-            optional: true
-        env:
-        - name: FIREFLY_III_URL
-          value: http://firefly-iii:8080
-        - name: FIREFLY_III_ACCESS_TOKEN
-          valueFrom:
-            secretKeyRef:
-              name: firefly-iii-importer
-              key: tabitha.access-token
-        ports:
-        - containerPort: 8080
-          name: http
-