update to support single macaroon reference

-shared volume for containers in same pod
-lookup configmap based on label for separate pods

Author: macgyver13

resources/charts/bitcoincore/charts/lnd/templates/configmap.yaml

@@ -4,6 +4,7 @@ metadata:
   name: {{ include "lnd.fullname" . }}
   labels:
     {{- include "lnd.labels" . | nindent 4 }}
+    role: macaroon-ref
 data:
   lnd.conf: |
     {{- .Values.baseConfig | nindent 4 }}
@@ -37,7 +38,7 @@ data:
     AwEHoUQDQgAEBVltIvaTlAQI/3FFatTqVflZuZdRJ0SmRMSJrFLPtp0fxE7hmteS
     t6gjQriy90fP8j9OJXBNAjt915kLY4zVvg==
     -----END EC PRIVATE KEY-----
-
+  MACAROON_HEX: 0201036c6e6402f801030a1062beabbf2a614b112128afa0c0b4fdd61201301a160a0761646472657373120472656164120577726974651a130a04696e666f120472656164120577726974651a170a08696e766f69636573120472656164120577726974651a210a086d616361726f6f6e120867656e6572617465120472656164120577726974651a160a076d657373616765120472656164120577726974651a170a086f6666636861696e120472656164120577726974651a160a076f6e636861696e120472656164120577726974651a140a057065657273120472656164120577726974651a180a067369676e6572120867656e657261746512047265616400000620b17be53e367290871681055d0de15587f6d1cd47d1248fe2662ae27f62cfbdc6
 ---
 apiVersion: v1
 kind: ConfigMap

resources/plugins/simln/charts/simln/templates/configmap.yaml

@@ -17,5 +17,9 @@ data:
     IQDPofN0fEl5gTwCYhk3nZbjMqJhZ8BsSJ6K8XRhxr7zbwIhAPsgQCFOqUWg632O
     NEO53OQ6CIqnpxSskjsFNH4ZBQOE
     -----END CERTIFICATE-----
-  admin.macaroon.hex: |
-    0201036c6e6402f801030a1062beabbf2a614b112128afa0c0b4fdd61201301a160a0761646472657373120472656164120577726974651a130a04696e666f120472656164120577726974651a170a08696e766f69636573120472656164120577726974651a210a086d616361726f6f6e120867656e6572617465120472656164120577726974651a160a076d657373616765120472656164120577726974651a170a086f6666636861696e120472656164120577726974651a160a076f6e636861696e120472656164120577726974651a140a057065657273120472656164120577726974651a180a067369676e6572120867656e657261746512047265616400000620b17be53e367290871681055d0de15587f6d1cd47d1248fe2662ae27f62cfbdc6
+{{- $configMaps := lookup "v1" "ConfigMap" .Release.Namespace "" }}
+{{- range $configMaps.items }}
+  {{- if and .metadata.labels (hasKey .metadata.labels "role") (eq (index .metadata.labels "role") "macaroon-ref") }}
+  admin.macaroon.hex: {{ index .data "MACAROON_HEX" | quote }}
+  {{- end }}
+{{- end }}

test/data/ln/node-defaults.yaml

@@ -1,6 +1,4 @@
-# Enable caddy, collectLogs and metricsExport to activate publish lnd-exporter metrics
-caddy:
-  enabled: false
+# enable collectLogs and metricsExport to activate publish lnd-exporter metrics
 
 #Core configs
 image:
@@ -22,11 +20,13 @@ lnd:
   prometheusMetricsPort: 9332
   extraContainers:
     - name: lnd-exporter
-      image: bitdonkey/lnd-exporter:0.1.2
+      image: bitdonkey/lnd-exporter:0.1.3
       imagePullPolicy: IfNotPresent
+      volumeMounts:
+        - mountPath: /macaroon.hex
+          name: config
+          subPath: MACAROON_HEX
       env:
-        - name: ADMIN_MACAROON_HEX
-          value: 0201036c6e6402f801030a1062beabbf2a614b112128afa0c0b4fdd61201301a160a0761646472657373120472656164120577726974651a130a04696e666f120472656164120577726974651a170a08696e766f69636573120472656164120577726974651a210a086d616361726f6f6e120867656e6572617465120472656164120577726974651a160a076d657373616765120472656164120577726974651a170a086f6666636861696e120472656164120577726974651a160a076f6e636861696e120472656164120577726974651a140a057065657273120472656164120577726974651a180a067369676e6572120867656e657261746512047265616400000620b17be53e367290871681055d0de15587f6d1cd47d1248fe2662ae27f62cfbdc6
         - name: METRICS
           value: >
             lnd_balance_channels=parse("/v1/balance/channels","balance") 

test/data/logging/network.yaml

@@ -18,11 +18,13 @@ nodes:
       prometheusMetricsPort: 9332
       extraContainers:
         - name: lnd-exporter
-          image: bitdonkey/lnd-exporter:0.1.2
+          image: bitdonkey/lnd-exporter:0.1.3
           imagePullPolicy: IfNotPresent
+          volumeMounts:
+            - mountPath: /macaroon.hex
+              name: config
+              subPath: MACAROON_HEX
           env:
-            - name: ADMIN_MACAROON_HEX
-              value: 0201036c6e6402f801030a1062beabbf2a614b112128afa0c0b4fdd61201301a160a0761646472657373120472656164120577726974651a130a04696e666f120472656164120577726974651a170a08696e766f69636573120472656164120577726974651a210a086d616361726f6f6e120867656e6572617465120472656164120577726974651a160a076d657373616765120472656164120577726974651a170a086f6666636861696e120472656164120577726974651a160a076f6e636861696e120472656164120577726974651a140a057065657273120472656164120577726974651a180a067369676e6572120867656e657261746512047265616400000620b17be53e367290871681055d0de15587f6d1cd47d1248fe2662ae27f62cfbdc6
             - name: METRICS
               value: >
                 lnd_block_height=parse("/v1/getinfo","block_height")