Skip to content

Commit e6fd39e

Browse files
committed
fix config path
1 parent 7088bad commit e6fd39e

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

resources/plugins/simln/charts/simln/files/sim.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
{
44
"id": "tank-0000-ln",
55
"address": "https://tank-0000-ln:10009",
6-
"macaroon": "/decoded/admin.macaroon",
6+
"macaroon": "/config/admin.macaroon",
77
"cert": "/config/tls.cert"
88
},
99
{
1010
"id": "tank-0001-ln",
1111
"address": "https://tank-0001-ln:10009",
12-
"macaroon": "/decoded/admin.macaroon",
12+
"macaroon": "/config/admin.macaroon",
1313
"cert": "/config/tls.cert"
1414
}
1515
]

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

+8-7
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ spec:
1212
command: ["sh", "-c"]
1313
args:
1414
- |
15-
cat /config/admin.macaroon.hex | xxd -r -p > /decoded/admin.macaroon
15+
cp /configmap/* /config
16+
cat /config/admin.macaroon.hex | xxd -r -p > /config/admin.macaroon
1617
volumeMounts:
17-
- name: macaroon-volume
18-
mountPath: /decoded
1918
- name: config-volume
2019
mountPath: /config
20+
- name: configmap-volume
21+
mountPath: /configmap
2122
containers:
2223
- name: {{ .Values.name }}
2324
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
@@ -27,11 +28,11 @@ spec:
2728
volumeMounts:
2829
- name: config-volume
2930
mountPath: /config
30-
- name: macaroon-volume
31-
mountPath: /decoded
31+
- name: configmap-volume
32+
mountPath: /configmap
3233
volumes:
33-
- name: config-volume
34+
- name: configmap-volume
3435
configMap:
3536
name: {{ include "mychart.fullname" . }}-data
36-
- name: macaroon-volume
37+
- name: config-volume
3738
emptyDir: {}

src/warnet/main.py

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
from .dashboard import dashboard
77
from .deploy import deploy
88
from .graph import create, graph, import_network
9-
from .graph import create, graph
109
from .hooks import plugin
1110
from .image import image
1211
from .ln import ln

0 commit comments

Comments
 (0)