Skip to content

Commit 2406805

Browse files
committed
ln: same macaroon and cert for all nodes
1 parent 6a4b46a commit 2406805

File tree

7 files changed

+106
-3
lines changed

7 files changed

+106
-3
lines changed

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,27 @@ data:
1717
alias={{ include "lnd.fullname" . }}
1818
externalhosts={{ include "lnd.fullname" . }}
1919
tlsextradomain={{ include "lnd.fullname" . }}
20+
tls.cert: |
21+
-----BEGIN CERTIFICATE-----
22+
MIIB8TCCAZagAwIBAgIUJDsR6mmY+TaO9pCfjtotlbOkzJMwCgYIKoZIzj0EAwIw
23+
MjEfMB0GA1UECgwWbG5kIGF1dG9nZW5lcmF0ZWQgY2VydDEPMA0GA1UEAwwGd2Fy
24+
bmV0MB4XDTI0MTExMTE2NTM1MFoXDTM0MTEwOTE2NTM1MFowMjEfMB0GA1UECgwW
25+
bG5kIGF1dG9nZW5lcmF0ZWQgY2VydDEPMA0GA1UEAwwGd2FybmV0MFkwEwYHKoZI
26+
zj0CAQYIKoZIzj0DAQcDQgAEBVltIvaTlAQI/3FFatTqVflZuZdRJ0SmRMSJrFLP
27+
tp0fxE7hmteSt6gjQriy90fP8j9OJXBNAjt915kLY4zVvqOBiTCBhjAOBgNVHQ8B
28+
Af8EBAMCAqQwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zAd
29+
BgNVHQ4EFgQU5d8QMrwhLgTkDjWA+eXZGz+dybUwLwYDVR0RBCgwJoIJbG9jYWxo
30+
b3N0ggEqhwR/AAABhxAAAAAAAAAAAAAAAAAAAAABMAoGCCqGSM49BAMCA0kAMEYC
31+
IQDPofN0fEl5gTwCYhk3nZbjMqJhZ8BsSJ6K8XRhxr7zbwIhAPsgQCFOqUWg632O
32+
NEO53OQ6CIqnpxSskjsFNH4ZBQOE
33+
-----END CERTIFICATE-----
34+
tls.key: |
35+
-----BEGIN EC PRIVATE KEY-----
36+
MHcCAQEEIIcFtWTLQv5JaRRxdkPKkO98OrvgeztbZ7h8Ev/4UbE4oAoGCCqGSM49
37+
AwEHoUQDQgAEBVltIvaTlAQI/3FFatTqVflZuZdRJ0SmRMSJrFLPtp0fxE7hmteS
38+
t6gjQriy90fP8j9OJXBNAjt915kLY4zVvg==
39+
-----END EC PRIVATE KEY-----
40+
2041
---
2142
apiVersion: v1
2243
kind: ConfigMap

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,15 @@ spec:
3232
- name: p2p
3333
containerPort: {{ .Values.P2PPort }}
3434
protocol: TCP
35+
- name: rest
36+
containerPort: {{ .Values.RestPort }}
37+
protocol: TCP
3538
livenessProbe:
3639
{{- toYaml .Values.livenessProbe | nindent 8 }}
3740
readinessProbe:
3841
{{- toYaml .Values.readinessProbe | nindent 8 }}
42+
startupProbe:
43+
{{- toYaml .Values.startupProbe | nindent 8 }}
3944
resources:
4045
{{- toYaml .Values.resources | nindent 8 }}
4146
volumeMounts:
@@ -45,6 +50,12 @@ spec:
4550
- mountPath: /root/.lnd/lnd.conf
4651
name: config
4752
subPath: lnd.conf
53+
- mountPath: /root/.lnd/tls.key
54+
name: tlskey
55+
subPath: tls.key
56+
- mountPath: /root/.lnd/tls.cert
57+
name: tlscert
58+
subPath: tls.cert
4859
{{- if .Values.circuitBreaker }}
4960
- name: circuitbreaker
5061
image: pinheadmz/circuitbreaker:278737d
@@ -57,6 +68,12 @@ spec:
5768
- configMap:
5869
name: {{ include "lnd.fullname" . }}
5970
name: config
71+
- configMap:
72+
name: {{ include "lnd.fullname" . }}
73+
name: tlskey
74+
- configMap:
75+
name: {{ include "lnd.fullname" . }}
76+
name: tlscert
6077
{{- with .Values.nodeSelector }}
6178
nodeSelector:
6279
{{- toYaml . | nindent 4 }}

resources/charts/bitcoincore/charts/lnd/values.yaml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ service:
3333

3434
RPCPort: 10009
3535
P2PPort: 9735
36+
RestPort: 8080
3637

3738
ingress:
3839
enabled: false
@@ -80,7 +81,18 @@ readinessProbe:
8081
tcpSocket:
8182
port: 10009
8283
timeoutSeconds: 1
83-
84+
startupProbe:
85+
failureThreshold: 10
86+
periodSeconds: 10
87+
successThreshold: 1
88+
timeoutSeconds: 10
89+
exec:
90+
command:
91+
- /bin/sh
92+
- -c
93+
- |
94+
PHRASE=`curl --silent --insecure https://localhost:8080/v1/genseed | grep -o '\[[^]]*\]'`
95+
curl --insecure https://localhost:8080/v1/initwallet --data "{\"macaroon_root_key\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\", \"wallet_password\":\"AAAAAAAAAAA=\", \"cipher_seed_mnemonic\": $PHRASE}"
8496
8597
# Additional volumes on the output Deployment definition.
8698
volumes: []
@@ -102,8 +114,7 @@ tolerations: []
102114
affinity: {}
103115

104116
baseConfig: |
105-
noseedbackup=true
106-
norest=true
117+
norest=false
107118
debuglevel=debug
108119
accept-keysend=true
109120
bitcoin.active=true

resources/scripts/ssl/cert-gen.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/bash
2+
3+
# Generate the private key using the P-256 curve
4+
openssl ecparam -name prime256v1 -genkey -noout -out tls.key
5+
6+
# Generate the self-signed certificate using the configuration file
7+
# Expires in ten years, 2034
8+
openssl req -x509 -new -nodes -key tls.key -days 3650 -out tls.cert -config openssl-config.cnf
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
[ req ]
2+
distinguished_name = req_distinguished_name
3+
req_extensions = req_ext
4+
x509_extensions = v3_ca
5+
prompt = no
6+
7+
[ req_distinguished_name ]
8+
O = lnd autogenerated cert
9+
CN = warnet
10+
11+
[ req_ext ]
12+
keyUsage = critical, digitalSignature, keyEncipherment, keyCertSign
13+
extendedKeyUsage = serverAuth
14+
basicConstraints = critical, CA:true
15+
subjectKeyIdentifier = hash
16+
17+
[ v3_ca ]
18+
keyUsage = critical, digitalSignature, keyEncipherment, keyCertSign
19+
extendedKeyUsage = serverAuth
20+
basicConstraints = critical, CA:true
21+
subjectKeyIdentifier = hash
22+
subjectAltName = @alt_names
23+
24+
[ alt_names ]
25+
DNS.1 = localhost
26+
DNS.2 = *
27+
IP.1 = 127.0.0.1
28+
IP.2 = ::1

resources/scripts/ssl/tls.cert

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIB8TCCAZagAwIBAgIUJDsR6mmY+TaO9pCfjtotlbOkzJMwCgYIKoZIzj0EAwIw
3+
MjEfMB0GA1UECgwWbG5kIGF1dG9nZW5lcmF0ZWQgY2VydDEPMA0GA1UEAwwGd2Fy
4+
bmV0MB4XDTI0MTExMTE2NTM1MFoXDTM0MTEwOTE2NTM1MFowMjEfMB0GA1UECgwW
5+
bG5kIGF1dG9nZW5lcmF0ZWQgY2VydDEPMA0GA1UEAwwGd2FybmV0MFkwEwYHKoZI
6+
zj0CAQYIKoZIzj0DAQcDQgAEBVltIvaTlAQI/3FFatTqVflZuZdRJ0SmRMSJrFLP
7+
tp0fxE7hmteSt6gjQriy90fP8j9OJXBNAjt915kLY4zVvqOBiTCBhjAOBgNVHQ8B
8+
Af8EBAMCAqQwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB/zAd
9+
BgNVHQ4EFgQU5d8QMrwhLgTkDjWA+eXZGz+dybUwLwYDVR0RBCgwJoIJbG9jYWxo
10+
b3N0ggEqhwR/AAABhxAAAAAAAAAAAAAAAAAAAAABMAoGCCqGSM49BAMCA0kAMEYC
11+
IQDPofN0fEl5gTwCYhk3nZbjMqJhZ8BsSJ6K8XRhxr7zbwIhAPsgQCFOqUWg632O
12+
NEO53OQ6CIqnpxSskjsFNH4ZBQOE
13+
-----END CERTIFICATE-----

resources/scripts/ssl/tls.key

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
-----BEGIN EC PRIVATE KEY-----
2+
MHcCAQEEIIcFtWTLQv5JaRRxdkPKkO98OrvgeztbZ7h8Ev/4UbE4oAoGCCqGSM49
3+
AwEHoUQDQgAEBVltIvaTlAQI/3FFatTqVflZuZdRJ0SmRMSJrFLPtp0fxE7hmteS
4+
t6gjQriy90fP8j9OJXBNAjt915kLY4zVvg==
5+
-----END EC PRIVATE KEY-----

0 commit comments

Comments
 (0)