Merge pull request #5 from Camillarhi/circuitbreaker4

Circuitbreaker4

Author: Camillarhi

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

@@ -38,6 +38,17 @@ data:
     t6gjQriy90fP8j9OJXBNAjt915kLY4zVvg==
     -----END EC PRIVATE KEY-----
 
+  MACAROON_HEX: |
+    0201036c6e6402f801030a1062beabbf2a614b112128afa0c0b4fdd61201301a160a0
+    761646472657373120472656164120577726974651a130a04696e666f120472656164
+    120577726974651a170a08696e766f69636573120472656164120577726974651a210
+    a086d616361726f6f6e120867656e6572617465120472656164120577726974651a16
+    0a076d657373616765120472656164120577726974651a170a086f6666636861696e1
+    20472656164120577726974651a160a076f6e636861696e1204726561641205777269
+    74651a140a057065657273120472656164120577726974651a180a067369676e65721
+    20867656e657261746512047265616400000620b17be53e367290871681055d0de155
+    87f6d1cd47d1248fe2662ae27f62cfbdc6
+    
 ---
 apiVersion: v1
 kind: ConfigMap

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

@@ -26,16 +26,21 @@ spec:
       command:
         - sh
         - -c
-        - |
-          cp /root/.lnd/tls.cert /root/.lnd/tls_copy.cert
-          chmod 644 /root/.lnd/tls_copy.cert
+        - |          
+          # Read the hex-encoded macaroon from the ConfigMap
+          HEX_MACAROON=$(cat /config/MACAROON_HEX)
+
+          # Convert the hex-encoded macaroon to binary format
+          echo "$HEX_MACAROON" | xxd -r -p > /shared-data/admin.macaroon
+
+          # Ensure the file has the correct permissions
+          chmod 644 /shared-data/admin.macaroon
       volumeMounts:
-        - name: lnd-data
-          mountPath: /root/.lnd
+        - name: shared-data
+          mountPath: /shared-data
         - name: config
-          mountPath: /root/.lnd/tls.cert
-          subPath: tls.cert
-  {{- end }}
+          mountPath: /config
+          
   containers:
     - name: {{ .Chart.Name }}
       securityContext:
@@ -61,8 +66,8 @@ spec:
       resources:
         {{- toYaml .Values.resources | nindent 8 }}
       volumeMounts:
-        - name: lnd-data
-          mountPath: /root/.lnd
+        - mountPath: /shared-data
+          name: shared-data
         {{- with .Values.volumeMounts }}
           {{- toYaml . | nindent 8 }}
         {{- end }}
@@ -79,7 +84,7 @@ spec:
     {{- toYaml . | nindent 4 }}
     {{- end }}
   volumes:
-    - name: lnd-data
+    - name: shared-data
       emptyDir: {}
     {{- with .Values.volumes }}
       {{- toYaml . | nindent 4 }}

resources/networks/hello/network.yaml

@@ -34,36 +34,20 @@ nodes:
           push_amt: 50000
       extraContainers:
         - name: circuitbreaker
-          securityContext:
-            privileged: true
-            capabilities:
-              add:
-                - NET_ADMIN
-                - NET_RAW
           image: camillarhi/circuitbreaker:latest
           imagePullPolicy: IfNotPresent
           args:
             - "--network=regtest"
             - "--rpcserver=localhost:10009"
-            - "--tlscertpath=/root/.lnd/tls_copy.cert"
-            - "--macaroonpath=/root/.lnd/data/chain/bitcoin/regtest/admin.macaroon"
+            - "--tlscertpath=/tls.cert"
+            - "--macaroonpath=/shared-data/admin.macaroon"
             - "--httplisten=0.0.0.0:9235"
           volumeMounts:
-            - name: lnd-data
-              mountPath: /root/.lnd
-          readinessProbe:
-            exec:
-              command:
-                - /bin/sh
-                - -c
-                - |
-                  # Check if tls.cert exists and is readable
-                  test -f /root/.lnd/tls.cert && echo "tls.cert found" || exit 1
-                  # Check if admin.macaroon exists and is readable
-                  test -f /root/.lnd/data/chain/bitcoin/regtest/admin.macaroon && echo "macaroon found" || exit 1
-            initialDelaySeconds: 10
-            periodSeconds: 5
-            timeoutSeconds: 1
+            - name: shared-data
+              mountPath: /shared-data
+            - name: config
+              mountPath: /tls.cert
+              subPath: tls.cert
 
   - name: tank-0004
     addnode: